Migrate to python-single-r1 (fixes bug #413753), remove old.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 34 insertions, 47 deletions

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index f5c268a16f10..d3adc1e7684c 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.107 2013/08/12 23:53:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.108 2013/08/13 05:52:57 radhermit Exp $
+
+*libcaca-0.99_beta18-r1 (13 Aug 2013)
+
+  13 Aug 2013; Tim Harder <radhermit@gentoo.org> -libcaca-0.99_beta18.ebuild,
+  +libcaca-0.99_beta18-r1.ebuild:
+  Migrate to python-single-r1 (fixes bug #413753), remove old.
 
   12 Aug 2013; Alexis Ballier <aballier@gentoo.org> libcaca-0.99_beta17.ebuild:
   depend on xcolor in beta17 too for doc useflag, bug #365977
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index aefed9d2e12f..ff64c5f2bdfd 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -4,13 +4,17 @@ Hash: SHA256
 DIST libcaca-0.99.beta17.tar.gz 1110516 SHA256 6355ae9e3961e983ef66057a232d25f1fba2e7fa615d7591aba011d78764f1d6 SHA512 1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19 WHIRLPOOL bb241f90a36e2b73e2b50dcf15260153385ac2521bbe43a120c55ce5f2560ab9078ca40cf90a799646e6736461a876e33203abdd39f4ab794e6b509f8622b2d4
 DIST libcaca-0.99.beta18.tar.gz 1168552 SHA256 77ea06633f4a6022dccd4f76c1823e167a40cb05308fc1c7ea0fa1f80f6c33a1 SHA512 b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5 WHIRLPOOL 3e6404f0d16ca5718022a919c1568b0e8afaa40d58ca4a1e3271c437bebd3cde40ac63f45c6bbfea00a4936a673c24bdd21ecc0070f4814464d787dab33c183b
 EBUILD libcaca-0.99_beta17.ebuild 2650 SHA256 b2874ad822ccab2f25af40b987f18bbf88b16685025afa92923848ca242b87dd SHA512 1f1cf2887ab542cbf9590b7e2f869fbf4f5c8b7723e2c357b8c29c77be385a2553d02f4417608885f1b840bb2c1845a0158a46863fe3698105e5f37fe6daefde WHIRLPOOL 64f7b9fda46b5e8f4c1e425aa4e357557b50a359d1f169fe024cf8315c9eea93d2e31636fdbf8330ac35b72fae42202e59af4cc6527f68935d7218889e1ccf3e
-EBUILD libcaca-0.99_beta18.ebuild 3215 SHA256 f9319eb932bea0ab5b6242a975cf7dbfdd50637634841fdbd3cdceda95a4ad44 SHA512 01f400431b68f1db70313f20f9872ee14c44ad973aa31b981bf75316b0d31cbb8b1261a8f78ac57e7c09481992fa70c1362eaf282cdec01b35df51a54fe787a4 WHIRLPOOL 8637b1db8d4396b486c77514f95df4f0acb0bf82431f929418c1b803cc40e57a4b328f1b41a9699314ff433d0eff2d8b85d4c638c3b8266d7582e737a27c1d62
-MISC ChangeLog 15581 SHA256 73095495459ce98670a8050b2cf1609df2d2e13a2e5452edb70c7e39ff8fe223 SHA512 5faace03dc000c08ed9b760bc5f60dbab4b96cd7af31bf851ff51ed936d38e393d77878d5ca38ef13133143eb713c1eee77aa11efe3e57634fd4bc88766e1851 WHIRLPOOL aab1d9291e99306f6e41b8cad9e23839dda9a6c45c8496398daf2466d1e24c333999d5b02cf9757cd9feeb7f31b1ac98b323c802864eaa751c32e903ef2ab801
+EBUILD libcaca-0.99_beta18-r1.ebuild 3021 SHA256 d7c40a322af02971d598cb7a5e19100d842170020c46ec20df717bcd02cb9512 SHA512 0e426128fa66dff763fc355614345708f8978ad7a2e66b198a4c03b125d4c5e6c4f15a8fa01da43639124486d4f289ff2b2e0a8cb0bc5826e5b6b49797930d3e WHIRLPOOL 5c60d7d96c009cfb2527e5c0c450205332d1185cc4b9f6c8191316ca754ea7ee70124d50c5dd9073aba8866514cf8ec6d91e00259646a995ce57c34e6697a893
+MISC ChangeLog 15797 SHA256 1ff9b8a219dd58ff6b5f4c038e48694f29ced5d10c9a8cd123d963a2bab4eb6d SHA512 92afeea37a682436236ddc5ef0f027d3859ce0e91607147f97d30fac4529158430f70633560a10815bad3c7759fe541dfc4c0db87bed307a1fbc6113378d3072 WHIRLPOOL 71d069c8a01174ec31e2c2f759c8d523dd53dab8dd4fe0b7faa10a0b9b038ca61ce8ec9d66dea89c6070b21224b18834a588bfd6f693fbd3ff6175fea22253fb
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIJdXIACgkQvFcC4BYPU0om2wCdHnQ55mBzbm9xJhvkApNf8dTp
-apgAniULJPiC7BS4p9ZlwqDAAdNL/LvJ
-=GkEf
+iQEcBAEBCAAGBQJSCcm9AAoJEEqz6FtPBkyjuWAH/18U62d7HD65K3GlTnalHue4
+E7q+KxsxJAJ5mUMEh9DVY0vzk0wKsHUCzl3RDYXhZHcc0EN6Vpb/IolB3m0pbNXM
+stUj0OaxGm9VGSsoC32bVTg9doujYGAfMrv4qB4PfgHGKzDSHR2Hq5HtVAcNYsz8
+CmwP3qpGaOmAba7Z44gQEUWMtehp6w5qP956kLHJhS5uJdZCWD5OIKGhUSdni+np
+YeTSZ1HkQlfWVaoYldTnRTqptFurzt+wEvg8CzLLh+c7Qsxobz35+6FT5AaOAUta
+bwSWZiRBB0NlV/brqYMPRFmUyg3JsKXKN8s3YV0WQQT+62lWK4W3dQZPBw1mFmc=
+=lWOX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/libcaca-0.99_beta18.ebuild b/media-libs/libcaca/libcaca-0.99_beta18-r1.ebuild
index d4734a6f83e6..b29c306da58e 100644
--- a/media-libs/libcaca/libcaca-0.99_beta18.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta18-r1.ebuild
@@ -1,18 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18.ebuild,v 1.8 2012/09/09 22:15:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r1.ebuild,v 1.1 2013/08/13 05:52:57 radhermit Exp $
 
-EAPI=4
-PYTHON_DEPEND="python? 2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-PYTHON_MODNAME="caca"
-DISTUTILS_SETUP_FILES=("python|setup.py")
-
-inherit autotools flag-o-matic mono multilib java-pkg-opt-2 distutils
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit autotools eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1
 
 MY_P=${P/_/.}
-
 DESCRIPTION="A library that creates colored ASCII-art graphics"
 HOMEPAGE="http://libcaca.zoy.org/"
 SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
@@ -20,7 +14,8 @@ SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs truetype X"
+IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="imlib? ( media-libs/imlib2 )
 	mono? ( dev-lang/mono )
@@ -31,6 +26,7 @@ COMMON_DEPEND="imlib? ( media-libs/imlib2 )
 		media-libs/freeglut
 		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
 	)
+	python? ( ${PYTHON_DEPS} )
 	ruby? ( =dev-lang/ruby-1.8* )
 	slang? ( >=sys-libs/slang-2 )
 	X? ( x11-libs/libX11 x11-libs/libXt )"
@@ -45,16 +41,15 @@ DEPEND="${COMMON_DEPEND}
 		dev-texlive/texlive-latexextra
 		dev-tex/xcolor
 	)
-	java? ( >=virtual/jdk-1.5 )"
+	java? ( >=virtual/jdk-1.5 )
+	test? ( dev-util/cppunit )"
 
 S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
 
 pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -62,6 +57,7 @@ src_prepare() {
 
 	sed -i \
 		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
 		configure.ac || die
 
 	sed -i \
@@ -91,9 +87,7 @@ src_configure() {
 	use mono && export CSC="$(type -P gmcs)" #329651
 	export VARTEXFONTS="${T}/fonts" #44128
 
-	# python bindings are built via distutils
 	econf \
-		--disable-python \
 		$(use_enable static-libs static) \
 		$(use_enable slang) \
 		$(use_enable ncurses) \
@@ -102,42 +96,25 @@ src_configure() {
 		$(use_enable mono csharp) \
 		$(use_enable java) \
 		$(use_enable cxx) \
+		$(use_enable python) \
 		$(use_enable ruby) \
 		$(use_enable imlib imlib2) \
-		$(use_enable doc)
+		$(use_enable doc) \
+		$(use_enable test cppunit)
 }
 
-src_compile() {
-	default
-
-	if use python; then
-		distutils_src_compile
-	fi
+src_test() {
+	emake -j1 check
 }
 
 src_install() {
 	default
 
-	if use python; then
-		distutils_src_install
-	fi
-
 	if use java; then
 		java-pkg_newjar java/libjava.jar
 	fi
 
 	rm -rf "${D}"/usr/share/java
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	if use python; then
-		distutils_pkg_postinst
-	fi
-}
 
-pkg_postrm() {
-	if use python; then
-		distutils_pkg_postrm
-	fi
+	prune_libtool_files --modules
 }