convert to multilib-minimal instead and fix bug #508564

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

3 files changed, 54 insertions, 39 deletions

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 76f1de8c78c7..583f378cd047 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcaca
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.113 2014/04/19 07:32:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.114 2014/04/24 18:52:35 hasufell Exp $
+
+  24 Apr 2014; Julian Ospald <hasufell@gentoo.org>
+  libcaca-0.99_beta18-r2.ebuild:
+  convert to multilib-minimal instead and fix bug #508564
 
   19 Apr 2014; Patrick Lauer <patrick@gentoo.org> libcaca-0.99_beta18-r2.ebuild:
   Whitespace
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 55d7dd698dd7..cff5283325c5 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libcaca-0.99_beta18-fix-tests.patch 2222 SHA256 7bc472675e640633ff83cd104ede5caada5307064c021e692686f6b0d296df06 SHA512 bd007e9cdc73aec6cd0df3d66fea60cfe63f51a274ecabea52d7658114f8155fc5d0b2888896e39813ff856423064265fa50733312ce3988add5f096866bd60a WHIRLPOOL 380d486ec4ecd5a96195e28f0c418ccb363f6cfebc580c3937f9e2b179f9f2401ced8f9ab6cfa771262a7f0719f3a690b4dbbbcc1f4c33acd9616cb95cfd234d
 AUX libcaca-0.99_beta18-latex_hacks.patch 720 SHA256 1320f0a27bd6338882e36b18b024022464488b20a802680aa7150880ca24818a SHA512 1b9a475926c966c4cc64b76ae38550ccdddc1001fbbf722bbd32e450c88ec6be9e1fbe88818f71d8d0a1ea3c213d487ec3b26d0e52760bad54f3cccca3160f0b WHIRLPOOL 916ed33a2ce7b7bac3a9b32dc2d138a0ca6464d00242eba1484671b807e4124f7aad19c6ac169ad0be9a42906b75347a818a284486814b083562744966102ae1
 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-r1.ebuild 3238 SHA256 ab62162f3ee1f5ac083804a5711eb50849c928b09759d554c0b2af4ed5377784 SHA512 9591b98eea13391e3654c7e986f405ecaf39230e33761f0ca3efe4d953adda651f0aedaaa24a1e246d2945495912ad0f91d99a9323ca25a5a91b42d61987dd3a WHIRLPOOL 1ff3d383d9d91fa0e5f1b3d8d3a1ca40ec5f173fa2f7cf82278a2cdb8415e07f1c162556a971b019ec5bb2c258473a6d06e9b5e71f580b0f291699c1dbe34a74
-EBUILD libcaca-0.99_beta18-r2.ebuild 3757 SHA256 b73ab61971d6c24ea0b96051f3ccde207199a508e499476d8418bde3431064bd SHA512 7dbc84d1b42c0cd94df55d1351a5ce28337dc394b462b92b8bea3ead8d6b4932a39a5a8f220fca5f8656a58d7935ab47f1616b5e1fa9ac55fb9097e5692f6d44 WHIRLPOOL 40921174825417b29c09077d27e7a2e0ff7956c180b4d85f845896a3be93c97cd44fe274eb5601d1d8f6f521ae9168a775f7277f6636da0e6fde5688e96324d3
-MISC ChangeLog 16730 SHA256 4bb9ad8dd8a8e8f7cefd8e604714f19dd0b431186e9c53aee43257b852bfdb24 SHA512 c3ed4bba724e400d6493e73870692a30de48157e184bbaf38502468b70b823e878a3b4250c379d1087d5a57b9ee83bdbf6c4baa65b5294f6806d669b97b5acfb WHIRLPOOL b97e5df800b58b768aa9d442fcea1c6cd911ba931f3b829fee6da28f98e9a136728d171499aa5fe42b94933dcf93f854e3df28da350729739134ab8559d1ace1
+EBUILD libcaca-0.99_beta18-r2.ebuild 3775 SHA256 934b3e5d8cdb9edd9ac4ab88707a5df95be25a647a972bc31be737e861e7dc58 SHA512 3114f396312d066179a899d8ceabaf97eb11114a67dde96b74405006923cd5f47a348179e590d56eb93045d8a6ecc1ee80ea9cbf3030d481d95d3875ca4dfa7a WHIRLPOOL 7253625ff705da4607ee799a8d1f77181d8584ab6d61230495006dfbc42c7729250e2f97e3d82e40cea8e996f8954f0a812830e10d4a1deabee0da550b171192
+MISC ChangeLog 16874 SHA256 3f9db5099bfe3010ae75e4e65940bc5a16a3b84f1822852189b67139393dcc29 SHA512 e19eb55bbd75c7b773800370b7b3a09c12daceb7d4e33128a4709e42b3837cb643dad06258e6780e9f025c0fbbe30188892fa01c8707caa96887c1c147799d6c WHIRLPOOL 6587e37d759c88e683b105f48f882fe6fcd6dd5e6e4d129f777f74d4442ef97cb91239e434cdcd6876a5b9e7a6eba7a390db81088f333e9567b0b0a4b012c6d4
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQJ8BAEBCABmBQJTWV12XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgYXsQAPVUImRigIyiEuNsIq+HvZUv
+w5wqKa/HXVtCpR+KgUV0q1hE4ygGGgalk5fLZzKoD8scOW+Jy+gWgna/TeBxfFiW
+cfymTfwwHzalF0JuGHiHHhu4BpWT0M5Rb2REsw5QxsM/Yp+lEDQ6IQLQULFz7M8u
+z+M/Fl4I0lENbXCjnCZaBQWSDMOtvkJkdrKuvAamKTzBRQ7PuYIoGelcdDcLQA4N
+HggHGDHJyLqCjIqvfCvODctYiVxw+DH/eYYmQ9EUyWIRQS+r09gpIwtFYq5wRKcX
+gEVxR31gGsxOKew36hnIE+BHhDfUJS767MtvIKQ1fOt4/Uj5ezBpKb2XrudNpamd
+PtoIX28oD54WSPd7Hwqf5DLiC6Zz8a4/GuQAJykCwzdKXTkPZ4Acnd/R7V+pbQKt
+52+IpFP1KPtJj48nQlL8PjLq9izxZJ4IUoo0wFDgS/XgOATDjyCsvroaxevCJ0O0
+wCrNaUsbc/RXqJc6ulNAlmbaFm0nYugmLZc0wH7YZNZcitX9lF5ZDG3VBy7ljMOq
+ff1683qIQ5AmgAz5wRtqyd8XyYi3IqlgN2GeaDK6ZKFj7gNFlaPozRXEG4sEyPPR
+XcWRSIR8Nl8oiN5rk96QGNtuwD5I8+supL/xpT4u99FcoaurMfRllD0c1PFFRTNh
+tKeH9rHBqQwdferOwmlz
+=VqSg
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
index 2ac51d8fd94c..809cf798e0c6 100644
--- a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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-r2.ebuild,v 1.2 2014/04/19 07:32:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.3 2014/04/24 18:52:35 hasufell Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools-multilib eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1
+inherit autotools eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1 multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -84,17 +84,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir)
-		$(use_enable opengl gl)
-		$(use_enable cxx)
-		$(use_enable imlib imlib2)
-		$(use_enable test cppunit)
-	)
-
 	if multilib_build_binaries; then
 		if use java; then
 			export JAVACFLAGS="$(java-pkg_javac-args)"
@@ -103,45 +92,45 @@ multilib_src_configure() {
 
 		use mono && export CSC="$(type -P gmcs)" #329651
 		export VARTEXFONTS="${T}/fonts" #44128
-
-		myeconfargs+=(
-			$(use_enable java)
-			$(use_enable ruby)
-			$(use_enable python)
-			$(use_enable mono csharp)
-			$(use_enable doc)
-		)
-	else
-		myeconfargs+=(
-			--disable-java
-			--disable-ruby
-			--disable-python
-			--disable-csharp
-			--disable-doc
-		)
 	fi
 
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" \
+		econf \
+			$(use_enable static-libs static) \
+			$(use_enable slang) \
+			$(use_enable ncurses) \
+			$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir) \
+			$(use_enable opengl gl) \
+			$(use_enable cxx) \
+			$(use_enable imlib imlib2) \
+			$(use_enable test cppunit) \
+			$(multilib_native_use_enable java) \
+			$(multilib_native_use_enable ruby) \
+			$(multilib_native_use_enable python) \
+			$(multilib_native_use_enable mono csharp) \
+			$(multilib_native_use_enable doc)
 }
 
-src_compile() {
+multilib_src_compile() {
 	local _java_makeopts
 	use java && _java_makeopts="-j1" #480864
-	autotools-multilib_src_compile ${_java_makeopts}
+	emake ${_java_makeopts}
 }
 
 multilib_src_test() {
 	emake -j1 check
 }
 
-src_install() {
-	autotools-multilib_src_install
+multilib_src_install() {
+	emake DESTDIR="${D}" install
 
-	if use java; then
+	if multilib_build_binaries && use java; then
 		java-pkg_newjar java/libjava.jar
 	fi
+}
 
+multilib_src_install_all() {
+	einstalldocs
 	rm -rf "${D}"/usr/share/java
-
 	prune_libtool_files --modules
 }