Migrate to distutils-r1.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 156 insertions, 16 deletions

diff --git a/dev-libs/cryptlib/ChangeLog b/dev-libs/cryptlib/ChangeLog
index f70ce524407e..4cf4d15256c4 100644
--- a/dev-libs/cryptlib/ChangeLog
+++ b/dev-libs/cryptlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cryptlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.33 2012/11/25 19:28:39 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/ChangeLog,v 1.34 2013/02/07 13:29:52 mgorny Exp $
+
+*cryptlib-3.4.0-r1 (07 Feb 2013)
+
+  07 Feb 2013; Michał Górny <mgorny@gentoo.org> +cryptlib-3.4.0-r1.ebuild:
+  Migrate to distutils-r1.
 
   25 Nov 2012; Ulrich Müller <ulm@gentoo.org> cryptlib-3.4.0.ebuild:
   Update LICENSE: DB and OracleDB are identical, except for the different
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
index e6c9615c533f..10110a7ca3fe 100644
--- a/dev-libs/cryptlib/Manifest
+++ b/dev-libs/cryptlib/Manifest
@@ -7,23 +7,16 @@ AUX cryptlib-3.4.0-external-zlib.patch 1194 SHA256 18cc9f193de28e7cfbf322d0ee475
 AUX cryptlib-3.4.0-python.patch 1888 SHA256 1a857ff90e833e5f32a927f6568d63d616f82e3339691041562d89ea6692370f SHA512 dbc2899b954a5e40bfef2194a738a5f9b6faf2ce77bfbdaa54ac4d392df1bd31700d77060c7e11465e8b6e8b1b1d89e8dfa853d219d2c221a94c99ea6deafa40 WHIRLPOOL 63df441372b9e300714542943654821a43bf184b4b672a844530b26ae8cd2dd79b654717a31dfa81defb532864da627c2086d6bcbf6a10b1b74877e7daf3ff16
 DIST cl340.zip 5514751 SHA256 fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5 SHA512 b9091ee4ce589f95ce479a0de25c5456db18d955350cc245637addf31f3c03cfe87c971f5a7bff274d17451059d319723cd337cb25a672e0823e29b98b4b87f8 WHIRLPOOL 8965d0c6b0e0bd38d0bbf674a75ac43ea7ea482218c6592d51d0baa7a6ff8673a27c8095084dc7d7cbca39c29bc9acdb6351d6a1f64f6cdc6c1bf906b2579cff
 DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8 SHA512 dbf9914a110a686dc23fedd23c16cefbae12cc67e378db67ac292f8f782b3b615a5819013f2b9c4861086c7ddfab690db9d68a911346102def323255cf48069b WHIRLPOOL 8cc64ab7ffe8a97714e793dd3dfe36708e7e2c7ec583479c593d767de22b860be5bcf0a70427f6f2e7e1d9732ec4ba2d2b3f1617f97bb649c0298924e4a93fb6
+EBUILD cryptlib-3.4.0-r1.ebuild 3808 SHA256 5ff93931b4ce445b0ffc7382da43524d3f409dc5c3a2465c72c7e437c331e5c8 SHA512 0f643b146993eb1a98c92885d06dd94ec6da2fa9033a0a34c6ad568a6710f5559e84515f310d111d29982f5960504ad8cf5d3bf6925fc5c9a542d1eb324ebbbc WHIRLPOOL 791725ecaa3e78abfd75076fb475f08181030e99b9bb7820f9759204614a5fb0e05bf3fb80a1d098b7c99869959e2c3696b185438e0bd8546bf43c69bbeae352
 EBUILD cryptlib-3.4.0.ebuild 3674 SHA256 7cf0c40cd793cbdd759163a28e61a557f3e60c49c22dff6c9a6293eaa5cd5da1 SHA512 70b371cf604386796455a9f45a526b23f5b58b163b5f3fb120776e2db5700b9bb0ec84dfafb65e6bbff9883bc384837bf7cfc836cf10eaa0f75a4bf619ae4c2d WHIRLPOOL b1783b01b40d3fcb0577a068504e87cbd529b063182b95f809c7682855a97a373187843468bd13ca31311f0f55f46916f3f2062065e09a8af9945c28225a4189
-MISC ChangeLog 6449 SHA256 95ec8682e5d2702f3ba2e63ee4785457a22c5b74f23ccfb77ff765affa73310d SHA512 9e359d75711e67a9031e68481ad76008f0feff004dba82657334834e8e78ca872515669c86e5f4e58d77ba49391ae3cd5e8b07f5cbcf9adb2f79d32ca3a2c873 WHIRLPOOL 4bddd35ece1edacb363df89e513adc0bc67f2bfff238d885708032dd7923662a06077d2275ce0035c4a785841ab553ef3560b62fdf221ff708e5ea73d790d5f4
+MISC ChangeLog 6591 SHA256 cea16f521fc460830638af1c1acf268cdf8275ebf56847d359d568911bdcfb43 SHA512 66a5c2177e9549c9d42c0cda8f1e3c9f89018ca0c678c3c2605f685f6922c1d410a8ebfcacd449e25abc45e3ac32d51b1bc6200d4f20f42988fe1eafea6f1448 WHIRLPOOL cde4e479e6893a68b2d8e49f72607e2a85b7bd5fff4a93135e9c7abd7e8487ee67053b122dfdea9ba930a6e0be989e84f4fe927c8bdc389b0164b0070349eb05
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQsnGvAAoJEDxpGckxwJCBMgUQAI5Vlzr5YQyGLzMq8fxKtM+r
-njmy3yEdsW1rBGw0vmB4urYFeRGwhVZSZUCfqo1joz/OPTXfok/F63HuQW8aGTVO
-s+BRE7Qo6YfdXEHYVqrFw7ds6JTW+3XxDzTLwtB7OF2kNYb14HAvncfGzv6cwk6E
-QwaEF5d/VyyVToEb0BFzkZ0U6oBt9vKqeqhHa2XEpGwlUULAgjA+Dft+TNu9BQsk
-hdrCFvl7GXF6hCtSvk2Vsi39AgnWEBhEwlzCmXqn836xV9BYlkIkEeX9WCcO/brJ
-f63ugb+CCFExDyDmMIMrRQ54tkdow+8g6mcmVDYtKj/SaAPlOfFe0zSPHQ/K604C
-FhEj2eWeVrsPu7VAzks78LscM6R+A2ChF5eHlsdktWyhNtz/hsF2UTI2KhifzzXA
-ZoYay/Fe21Hm/R2AuzD3xhk80zTAY64J/+SrwVsHbPPBMkp/HrIjxSh0gZobrGo/
-aTZU9K34ufZijoaD7WAUTUOZICjMkeMuSWKzC5NEXHENwQ5aAgEFoJAm6Va9fzcJ
-aUmEq72ZeSHaN54guCLEDPMphQPcDOe7b9AtSUUb5oVG/SZXsGxo+FZVvTjK9I75
-y6V0rHW5l4QCWDkJqlR6iFAQ7cAfqvzE0cv84bxbn//3nmnaAS/I/3uTJovp+q5f
-ZRctiaMLR0QBM0cp2keX
-=eMYF
+iJwEAQEIAAYFAlETrFcACgkQfXuS5UK5QB1MbwP+O+NgUJgYy7095cffi0AhKNEm
+9ng7LxRWZlVL52ZYooIgvu1nAQJXFVw7mN1qvUWiiCdvIUME+2mnDP5xC38C7SO6
+UIQ9fSaNCd4ypwTtKoNRfTPPLM4GarmHRv/ytjUC9v401apjt6rmtaIby7H2C8z+
+K90VC0Y/036gV+ThsJI=
+=eZhH
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..8ef268dfc6e8
--- /dev/null
+++ b/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cryptlib/cryptlib-3.4.0-r1.ebuild,v 1.1 2013/02/07 13:29:52 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 eutils flag-o-matic multilib toolchain-funcs
+
+MY_PV="${PV//.}"
+
+DESCRIPTION="Powerful security toolkit for adding encryption to software"
+HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/"
+DOC_PREFIX="${PN}-${PV}"
+SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
+	doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
+
+LICENSE="Sleepycat"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc ldap odbc python"
+
+S="${WORKDIR}"
+
+RDEPEND="sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	odbc? ( dev-db/unixODBC )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_unpack() {
+	# we need the -a option, so we can not use 'unpack'
+	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip"
+	use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
+}
+
+wrap_python() {
+	if use python; then
+		# cd bindings || die
+
+		distutils-r1_${1}
+	fi
+}
+
+src_prepare() {
+	rm -fr zlib
+
+	# we want our own CFLAGS ;-)
+	sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
+		-e "s:-O3::g" -e "s:-O4::g"	makefile || die "sed makefile failed"
+	sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e "s/-mcpu=[[:alnum:]\.=-]*//g" \
+		-e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed tools/ccopts.sh failed"
+
+	# change 'make' to '$(MAKE)'
+	sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
+
+	# NOTICE:
+	# Because of stack execution
+	# assembly parts are disabled.
+	sed -i -e 's:i\[3,4,5,6\]86:___:g' makefile || die "sed makefile failed"
+
+	# Fix version number of shared library.
+	sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed"
+
+	# Respect LDFLAGS and fix soname and strip issues.
+	epatch "${FILESDIR}/${PN}-3.3.2-ld.patch"
+
+	# Use external zlib.
+	epatch "${FILESDIR}/${PN}-3.4.0-external-zlib.patch"
+
+	# Fix setup.py
+	epatch "${FILESDIR}"/${P}-python.patch
+
+	# For some reason, setup.py is half-designed to be run from proper dir,
+	# and half-designed to be run from root. Since the patch fixes it to
+	# be completely from root, move it.
+	#
+	# When bumping the package, please update the patch to make setup.py work
+	# properly when executed from 'bindings' subdirectory.
+	mv bindings/setup.py . || die
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	local libname="libcl.so.${PV}"
+
+	# At least -O2 is needed.
+	replace-flags -O  -O2
+	replace-flags -O0 -O2
+	replace-flags -O1 -O2
+	replace-flags -Os -O2
+	is-flagq -O* || append-flags -O2
+
+	append-flags "-D__UNIX__ -DOSVERSION=2 -DNDEBUG -I."
+
+	if [ -f /usr/include/pthread.h -a \
+	`grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h` -ge 0 ] ; then
+		append-flags "-DHAS_RECURSIVE_MUTEX"
+	fi
+	if [ -f /usr/include/pthread.h -a \
+	`grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h` -ge 0 ] ; then
+		append-flags "-DHAS_ROBUST_MUTEX"
+	fi
+
+	use ldap && append-flags -DHAS_LDAP
+	use odbc && append-flags -DHAS_ODBC
+
+	emake directories || die
+	emake toolscripts || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -c" Linux || die "emake static failed"
+
+	emake TARGET=${libname} OBJPATH="./shared-obj/" CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -fPIC -c" Linux
+
+	if use python; then
+		ln -s libcl.so.${PV} libcl.so || die
+
+		# Python bindings don't work with -O2 and higher.
+		replace-flags -O* -O1
+
+		wrap_python ${FUNCNAME}
+	fi
+}
+
+src_install() {
+	dolib.so "libcl.so.${PV}"
+	dosym "libcl.so.${PV}" "/usr/$(get_libdir)/libcl.so"
+	dolib.a "libcl.a"
+
+	doheader cryptlib.h
+
+	dodoc README
+	if use doc; then
+		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
+	fi
+
+	wrap_python ${FUNCNAME}
+}