Revbump for Prefix/OSX fixes. I changed the ebuild in such a way that needs less sedding/fixing afterwards basically because I had to to get a correct install_name on Darwin. Also support case-insensitive filesystems for the docs installation. Marked ~ppc-macos, fixes bug #299620.

Package-Manager: portage-2.2.00.15200-prefix/cvs/Darwin powerpc

4 files changed, 120 insertions, 13 deletions

diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog
index c1a223b0b8cb..d705943c7270 100644
--- a/dev-libs/botan/ChangeLog
+++ b/dev-libs/botan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/botan
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.54 2009/12/28 21:18:01 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.55 2010/01/23 15:18:58 grobian Exp $
+
+*botan-1.8.8-r1 (23 Jan 2010)
+
+  23 Jan 2010; Fabian Groffen <grobian@gentoo.org> +botan-1.8.8-r1.ebuild,
+  +files/botan-1.8.8-darwin-install_name-fix.patch:
+  Revbump for Prefix/OSX fixes. I changed the ebuild in such a way that
+  needs less sedding/fixing afterwards basically because I had to to get a
+  correct install_name on Darwin. Also support case-insensitive filesystems
+  for the docs installation. Marked ~ppc-macos, fixes bug #299620.
 
   28 Dec 2009; Markus Meier <maekke@gentoo.org> botan-1.8.8.ebuild:
   x86 stable, bug #295701
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 098c7cae8e60..1e894f48cb0e 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX botan-1.8.8-darwin-install_name-fix.patch 511 RMD160 40f5e7361f991de21ca0599b2e51954b6b10f573 SHA1 ad7afc7d13cdd90d72437e160a94568f8cedf48b SHA256 fca8d469d78ae2ec7e26dbef9732e4a73223173565135e48678d0d3f81785e17
 AUX botan-1.8.8-use_negative_lea_displacement.patch 884 RMD160 c259f4d51f3c25df93d2cf99f9f29d6f2f92ea5d SHA1 d5b3deec6fadaea2b2fc41e3b62ca38c8c007f16 SHA256 b88d8a5af5a849e7a0ecbce70d63f5348cb15fd156440080e6f8e6d569084784
 DIST Botan-1.8.7.tgz 3464535 RMD160 73a6417f1445282e4b2fbf45557f2644b2996563 SHA1 69d985f66aa024f0d53c2d5597a4f1a0b9735959 SHA256 a4087fa008aa6b84a6780c9eedbe63319fba2f27bb5f182a1b0f349eba02ea24
 DIST Botan-1.8.8.tgz 2844588 RMD160 f8ac1842ddba312903442038d32da57f25f9bc1b SHA1 699df8f0c5e8d48fa8c65a873bb2e9975d4d66c5 SHA256 60a31bd9ed18ac85293d7f44c7fbb9bd0206eb7df5b42dff8517dd01b446ba84
 EBUILD botan-1.8.7.ebuild 2130 RMD160 d0bae6da21cd7f1bbc3a46007ffcc992318b1665 SHA1 4372bfe08a12cafc35f037b8edbb2815fafef0a9 SHA256 e7e25b0e0f5ea5e1a6bdc5a819587d472b825bb58f2d4989c95c795ad61dcfc9
+EBUILD botan-1.8.8-r1.ebuild 2542 RMD160 0b15a592d92fe4e0eb27233568798a39ad48d0bd SHA1 e96dd709912ea3a2aad3f8c7e163c1f1d536754c SHA256 8abd89f673cd41212e97d133dea86f7bfdb3aef79e94d40806caaea3039442fa
 EBUILD botan-1.8.8.ebuild 2210 RMD160 6de1aafa53e2de2013c1e4b8abc9cd4d2014fe71 SHA1 77b9cbe251c4eebbed54c3232d7208d8577dcb54 SHA256 e5170c82c44f18f616b27c7f5ebd8c685e5c333b803757203ee86db5706e7d16
-MISC ChangeLog 8373 RMD160 14690c643712d77c0a2ef4e2c1644294f2b2b0a7 SHA1 2f31d315ffd939ca3b2aa52753cb2ae38e723ed4 SHA256 c99a249a136b9e62b13eeedc16a004d5646b410405eae4c6c27616002e673158
+MISC ChangeLog 8823 RMD160 1ce99707b8279475b435f9ed05d9e567524da2a4 SHA1 50a6ae19ecb5b5a2acca8d349e414c27c5a85a9f SHA256 e509f162c76bb8f7638dada65772ec0516229009bad76478c2637976f7304ced
 MISC metadata.xml 319 RMD160 084032a656409b8d666fa6e9c0b0f89e3ef955e7 SHA1 77d4f800c80c56a3191d488ef2d6444ab165cee3 SHA256 c0597f70f00af70ca6f77bf906babe3059717b8c1e91a74c61904008e0c14054
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks5IHsACgkQkKaRLQcq0GKrlACgqiQ4Gx1bunW9ZXZoU9nNp/fA
-QP8Anj2jCIMxzRyjxrRxEjbN1DmjuyQO
-=eQXL
------END PGP SIGNATURE-----
diff --git a/dev-libs/botan/botan-1.8.8-r1.ebuild b/dev-libs/botan/botan-1.8.8-r1.ebuild
new file mode 100644
index 000000000000..dd8c9b2f43aa
--- /dev/null
+++ b/dev-libs/botan/botan-1.8.8-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v 1.1 2010/01/23 15:18:58 grobian Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="http://botan.randombit.net/"
+SRC_URI="http://files.randombit.net/botan/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~ppc-macos"
+SLOT="0"
+LICENSE="BSD"
+IUSE="bzip2 gmp ssl threads zlib"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	gmp? ( >=dev-libs/gmp-4.2.2 )
+	ssl? ( >=dev-libs/openssl-0.9.8g )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/python-2.4"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-use_negative_lea_displacement.patch"
+	epatch "${FILESDIR}"/${P}-darwin-install_name-fix.patch
+}
+
+src_configure() {
+	local disable_modules="proc_walk,unix_procs,cpu_counter"
+
+	if ! useq threads; then
+		disable_modules="${disable_modules},pthreads"
+	fi
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	cd "${S}"
+	elog "Disabling modules: ${disable_modules}"
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	# foobared buildsystem, --prefix translates into DESTDIR, see also make
+	# install in src_install, we need the correct live-system prefix here on
+	# Darwin for a shared lib with correct install_name
+	./configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--with-tr1=system \
+		$(use_with bzip2) \
+		$(use_with gmp gnump) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		--disable-modules=${disable_modules} \
+		|| die "configure.py failed"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" || die "emake failed"
+}
+
+src_test() {
+	chmod -R ugo+rX "${S}"
+	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check || die "emake check failed"
+	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}${EPREFIX}/usr" install || die "emake install failed"
+	# do the move as a two-stage operation for case-INsensitive filesystems
+	mv "${D%/}${EPREFIX}"/usr/share/doc/{Botan-${PV},tbm} || die
+	mv "${D%/}${EPREFIX}"/usr/share/doc/{tbm,${PF}} || die
+}
diff --git a/dev-libs/botan/files/botan-1.8.8-darwin-install_name-fix.patch b/dev-libs/botan/files/botan-1.8.8-darwin-install_name-fix.patch
new file mode 100644
index 000000000000..d749ea08e5d2
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.8.8-darwin-install_name-fix.patch
@@ -0,0 +1,13 @@
+install_names (sonames) on Darwin are absolute
+
+--- src/build-data/cc/gcc.txt
++++ src/build-data/cc/gcc.txt
+@@ -31,7 +31,7 @@
+ # AIX doesn't seem to have soname support (weird...)
+ aix     -> "$(CXX) -shared -fPIC"
+ 
+-darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(SONAME)"
++darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
+ hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
+ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
+ # Gotta use ld directly on BeOS, their GCC is busted