New doc use flag for doxygen api documentation. Including a patch from Miloslav Trmac <mitr@redhat.com> from Fedora beecrypt rpm: fix b64encode() for data starting with NUL. Removed obsolete ebuild. Waiting mips stabilization for removing latest 3.x series ebuild.

Package-Manager: portage-2.1.2-r2

7 files changed, 123 insertions, 67 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 843a6de06655..d72531b1de61 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.51 2007/01/12 20:46:38 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.52 2007/01/22 20:12:17 sanchan Exp $
+
+*beecrypt-4.1.2-r2 (22 Jan 2007)
+
+  22 Jan 2007; Sandro Bonazzola <sanchan@gentoo.org>
+  +files/beecrypt-4.1.2-base64.patch, -beecrypt-3.1.0-r1.ebuild,
+  +beecrypt-4.1.2-r2.ebuild:
+  New doc use flag for doxygen api documentation. Including a patch from
+  Miloslav Trmac <mitr@redhat.com> from Fedora beecrypt rpm: fix b64encode()
+  for data starting with NUL.
+  Removed obsolete ebuild. Waiting mips stabilization for removing latest 3.x
+  series ebuild.
 
   12 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> beecrypt-4.1.2-r1.ebuild:
   Remove WANT_AUTO*
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 5dee5ddd7858..2bec3fe5d924 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -17,6 +17,10 @@ AUX beecrypt-4.1.2-athlon.patch 700 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e
 MD5 1790137c0aa51e5978f813f06f74f9f5 files/beecrypt-4.1.2-athlon.patch 700
 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e103 files/beecrypt-4.1.2-athlon.patch 700
 SHA256 cc3eacd51054126b101c43592f75ed755161b680bdf5ab0c1b7ffef8f076534f files/beecrypt-4.1.2-athlon.patch 700
+AUX beecrypt-4.1.2-base64.patch 414 RMD160 8990c65079b5623a1995b524beacd028a516f5f8 SHA1 095b6e17b972e00512c627ba9fd473e4acc7e546 SHA256 ba378900e17872ff3efb55e71a68e371b0f027c8b162b9e02a742fc4acd2fc3a
+MD5 01444edbffee71c2d8818fa66a3a8555 files/beecrypt-4.1.2-base64.patch 414
+RMD160 8990c65079b5623a1995b524beacd028a516f5f8 files/beecrypt-4.1.2-base64.patch 414
+SHA256 ba378900e17872ff3efb55e71a68e371b0f027c8b162b9e02a742fc4acd2fc3a files/beecrypt-4.1.2-base64.patch 414
 AUX beecrypt-4.1.2-build.patch 5255 RMD160 3f66e4bcb8b86672f7479d3ea4fbb5cad3213bf6 SHA1 dba7a9e5fe0fbd9bc2c62579c63353d013db059f SHA256 b148f400ab405a0d33511220bf38f3ed0ea6f1f054af9227bae0504b1cbbbd93
 MD5 48f61b4e2ce0f6e8bfe2bef6f86bdb38 files/beecrypt-4.1.2-build.patch 5255
 RMD160 3f66e4bcb8b86672f7479d3ea4fbb5cad3213bf6 files/beecrypt-4.1.2-build.patch 5255
@@ -43,10 +47,6 @@ RMD160 96b4dc0ebd5bc28228e063987987f3db2817621a files/beecrypt-4.1.2-threads.pat
 SHA256 c8bdc84848ec24330fd3973fb84cef2eaaa1d8e845039dc5a0d0f6bc4c4345da files/beecrypt-4.1.2-threads.patch 2142
 DIST beecrypt-3.1.0.tar.gz 452555 RMD160 da5f1ad11f8724ee75c2860252a881d1591ccb43 SHA1 1dd2bde0c5551248750ad4cdc8214cc1364e874b SHA256 50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f
 DIST beecrypt-4.1.2.tar.gz 774280 RMD160 fe26e5429738450fa2ef00b37e9725eec29bda08 SHA1 71cebd3329bb2561ffba24a2004dfac50b143f59 SHA256 f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd
-EBUILD beecrypt-3.1.0-r1.ebuild 1402 RMD160 03c6b77ac915087f4dcd6116a1dc59cd08c532fd SHA1 9d9da4870adf0533a0e14bd6ab929d121916fd33 SHA256 1970672ee4db318921e4c5a959481015087bc3dc4eb524e6aeb66c6813b1a030
-MD5 e25a6186d73f6bd67537537dd40f2287 beecrypt-3.1.0-r1.ebuild 1402
-RMD160 03c6b77ac915087f4dcd6116a1dc59cd08c532fd beecrypt-3.1.0-r1.ebuild 1402
-SHA256 1970672ee4db318921e4c5a959481015087bc3dc4eb524e6aeb66c6813b1a030 beecrypt-3.1.0-r1.ebuild 1402
 EBUILD beecrypt-3.1.0-r2.ebuild 1723 RMD160 8d23c514408cb5447401b94a65b8834c87922187 SHA1 2d444385462090a8fdaf8cd1a655d8663fe8ae25 SHA256 ce7a18ed0154803578ba50d9964add3573367af04c1e55905ed43815aa417dc8
 MD5 b6c457c06f2f7babce8779dc33405e21 beecrypt-3.1.0-r2.ebuild 1723
 RMD160 8d23c514408cb5447401b94a65b8834c87922187 beecrypt-3.1.0-r2.ebuild 1723
@@ -55,27 +55,31 @@ EBUILD beecrypt-4.1.2-r1.ebuild 2103 RMD160 b86f272b8c1e6951a3c48abb2146d0fd0ee1
 MD5 700aa5bf97b133ea9e4eb09a5fefc056 beecrypt-4.1.2-r1.ebuild 2103
 RMD160 b86f272b8c1e6951a3c48abb2146d0fd0ee14c03 beecrypt-4.1.2-r1.ebuild 2103
 SHA256 653530b18c1027133259d298222f62f0a75b3e17a00c42dbd8fd224e95ce506e beecrypt-4.1.2-r1.ebuild 2103
-MISC ChangeLog 8074 RMD160 c447d0ee979ddb2f0f38a339ae475c675c832d9c SHA1 7683d26b812eb7c3c5468b4986ccf60fac8c3535 SHA256 8f5ccad6494de9c1e96779003c777acbc9b018894a872ba80053587f446ac99d
-MD5 80d57304e8ec072d3194a46b1f688bfb ChangeLog 8074
-RMD160 c447d0ee979ddb2f0f38a339ae475c675c832d9c ChangeLog 8074
-SHA256 8f5ccad6494de9c1e96779003c777acbc9b018894a872ba80053587f446ac99d ChangeLog 8074
+EBUILD beecrypt-4.1.2-r2.ebuild 2383 RMD160 884472208a930437b2a4e4ac56be7bfa23fd88a1 SHA1 1411009ea87f8027cc545eb61e31ff8ad1dcf29c SHA256 9f1c7e25cea40592e048065e3d0099a052f52711b2dcbfc0a0b4fcd124b6cea1
+MD5 ade4ed90b5b86022df0f5b80a5e779b8 beecrypt-4.1.2-r2.ebuild 2383
+RMD160 884472208a930437b2a4e4ac56be7bfa23fd88a1 beecrypt-4.1.2-r2.ebuild 2383
+SHA256 9f1c7e25cea40592e048065e3d0099a052f52711b2dcbfc0a0b4fcd124b6cea1 beecrypt-4.1.2-r2.ebuild 2383
+MISC ChangeLog 8532 RMD160 febcd04e620172eb3759623fc66d0103eba6977d SHA1 3553afbeb5bdfa9e35cfa04e737d5fb7c842161e SHA256 6103fb276683d59b3ae64621d77af67615f2b55466e2de6f4636a78a90b6f048
+MD5 d87623e1d22be07e0152b6bc6bbe621a ChangeLog 8532
+RMD160 febcd04e620172eb3759623fc66d0103eba6977d ChangeLog 8532
+SHA256 6103fb276683d59b3ae64621d77af67615f2b55466e2de6f4636a78a90b6f048 ChangeLog 8532
 MISC metadata.xml 222 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 SHA1 d288b0b582fd0342346e3ab74032b0579badbbf8 SHA256 479499bbcdd1d4d681904e4e4819e56e5e0436fdb23c1c938dcf23ea267988ec
 MD5 4841cdc9416cad66d46c6837e2d8a706 metadata.xml 222
 RMD160 7390d9ee64fc735357d7e6004a05d6319ccb72a4 metadata.xml 222
 SHA256 479499bbcdd1d4d681904e4e4819e56e5e0436fdb23c1c938dcf23ea267988ec metadata.xml 222
-MD5 5e89c22f1c896c7f858a106c0d0db568 files/digest-beecrypt-3.1.0-r1 244
-RMD160 ae96333d9000d0e124f19917912ffd08e8515ca3 files/digest-beecrypt-3.1.0-r1 244
-SHA256 c5e9f555fa1274112afc634fdef81cf428a9889c1a74a9a1a754b5de7373cb20 files/digest-beecrypt-3.1.0-r1 244
 MD5 5e89c22f1c896c7f858a106c0d0db568 files/digest-beecrypt-3.1.0-r2 244
 RMD160 ae96333d9000d0e124f19917912ffd08e8515ca3 files/digest-beecrypt-3.1.0-r2 244
 SHA256 c5e9f555fa1274112afc634fdef81cf428a9889c1a74a9a1a754b5de7373cb20 files/digest-beecrypt-3.1.0-r2 244
 MD5 f036930b8f9b568a6d4f0be92dfd660a files/digest-beecrypt-4.1.2-r1 244
 RMD160 95f2cc2b7b670f7e7ebfcdb7b320386305e49ab7 files/digest-beecrypt-4.1.2-r1 244
 SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/digest-beecrypt-4.1.2-r1 244
+MD5 f036930b8f9b568a6d4f0be92dfd660a files/digest-beecrypt-4.1.2-r2 244
+RMD160 95f2cc2b7b670f7e7ebfcdb7b320386305e49ab7 files/digest-beecrypt-4.1.2-r2 244
+SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/digest-beecrypt-4.1.2-r2 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFqWgX8bi6rjpTunYRAh++AJ9Ze9JsAdvqhfVovEGCkC50H+ukKwCgjRFy
-luSf/wA22eoT0rjYwwEw7IU=
-=FWYR
+iD8DBQFFtRldwmS/YhfgUiURAkOqAKCronB8j6dhHh7mWB5O2H3n0HsdBgCfc8s/
+R9/9y3Yq2ugpLmpOI6hiopU=
+=XJli
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
deleted file mode 100644
index f0aa06e844f5..000000000000
--- a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.16 2006/06/15 19:55:07 sanchan Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Beecrypt is a general-purpose cryptography library."
-HOMEPAGE="http://sourceforge.net/projects/beecrypt"
-SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64"
-IUSE="python"
-
-DEPEND="python? ( >=dev-lang/python-2.2 )
-	!<app-arch/rpm-4.2.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use alpha; then
-		# Prevent usage of lib64 on alpha where it isn't appropriate.
-		# We only have one execution model, so all libraries install
-		# in /usr/lib.  Note: This patch modifies configure, not
-		# configure.ac, because this package's Makefile is too smart
-		# and screws up mpopt.s when configure.ac is modified.
-		# (11 Nov 2003 agriffis)
-		epatch ${FILESDIR}/beecrypt-3.1.0-alpha.patch
-	fi
-	# fix for python paths (#39282)
-	epatch ${FILESDIR}/beecrypt-3.1.0-python2.3.patch
-}
-
-src_compile() {
-	econf \
-		`use_with python` \
-		--enable-shared \
-		--enable-static || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	# Not needed
-	rm -f ${D}/usr/lib/python*/site-packages/_bc.*a
-	dodoc BUGS README BENCHMARKS NEWS
-}
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild
new file mode 100644
index 000000000000..061ca2256792
--- /dev/null
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild,v 1.1 2007/01/22 20:12:17 sanchan Exp $
+
+inherit flag-o-matic eutils multilib autotools java-pkg-opt-2
+
+DESCRIPTION="general-purpose cryptography library"
+HOMEPAGE="http://sourceforge.net/projects/beecrypt"
+SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="java nocxx python threads doc"
+
+COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
+	!<app-arch/rpm-4.2.1"
+
+DEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	doc? ( app-doc/doxygen
+		virtual/tetex )"
+
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Set correct python libdir on multilib systems
+	sed -i -e 's:get_python_lib():get_python_lib(1,0):' \
+		configure.ac || die "sed failed"
+
+	# upstream patches from CVS
+	epatch "${FILESDIR}/${P}-python-Makefile-am.patch"
+	epatch "${FILESDIR}/${P}-python-debug-py-c.patch"
+	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-threads.patch"
+	#Patch from Fedora rpm, Miloslav Trmac <mitr@redhat.com>
+	epatch "${FILESDIR}/${P}-base64.patch"
+	eautoreconf
+}
+
+src_compile() {
+	local myarch=$(get-flag march)
+	[[ -z ${myarch} ]] && myarch=${CHOST%%-*}
+	[[ ${myarch} == "athlon64" || ${myarch} == "k8" || ${myarch} == "opteron" || ${myarch} == "athlon-fx" ]] && \
+		[[ ${CHOST%%-*} != "x86_64" ]] && myarch=${CHOST%%-*}
+	econf \
+		$(use_enable threads) \
+		$(use_with !nocxx cplusplus) \
+		$(use_with java) \
+		$(use_with python) \
+		--with-arch=${myarch} \
+		--libdir=/usr/$(get_libdir) \
+		|| die
+	emake || die "emake failed"
+	use doc && doxygen
+}
+
+src_test() {
+	export BEECRYPT_CONF_FILE=${T}/beecrypt-test.conf
+	echo provider.1=${S}/c++/provider/.libs/base.so > ${BEECRYPT_CONF_FILE}
+	make check || die "self test failed"
+	make bench || die "self benchmark test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	# Not needed
+	rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
+	dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
+	use doc && dohtml -r docs/html/. || die "dohtml failed"
+}
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-base64.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-base64.patch
new file mode 100644
index 000000000000..c6c370bd0788
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-base64.patch
@@ -0,0 +1,11 @@
+Fix b64encode() for data starting with NUL from Miloslav Trmac <mitr@redhat.com>
+--- beecrypt-4.1.2/base64.c.b64	2005-04-26 21:46:27.000000000 +0200
++++ beecrypt-4.1.2/base64.c	2005-04-26 21:47:48.000000000 +0200
+@@ -253,7 +253,6 @@
+     unsigned c;
+
+     if (s == NULL)	return NULL;
+-    if (*s == '\0')	return calloc(1, sizeof(*t));
+
+     if (ns == 0) ns = strlen((const char*) s);
+     nt = ((ns + 2) / 3) * 4;
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1 b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1
deleted file mode 100644
index 89b4d6802bff..000000000000
--- a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1472cada46e2ab9f532f984de9740386 beecrypt-3.1.0.tar.gz 452555
-RMD160 da5f1ad11f8724ee75c2860252a881d1591ccb43 beecrypt-3.1.0.tar.gz 452555
-SHA256 50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f beecrypt-3.1.0.tar.gz 452555
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r2 b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r2
new file mode 100644
index 000000000000..776005bb16fb
--- /dev/null
+++ b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r2
@@ -0,0 +1,3 @@
+MD5 820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz 774280
+RMD160 fe26e5429738450fa2ef00b37e9725eec29bda08 beecrypt-4.1.2.tar.gz 774280
+SHA256 f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd beecrypt-4.1.2.tar.gz 774280