Require older libjpeg-6b for older povray-3.6.1 and use included static lib if not available (bug #382459); revert use of EROOT, etc., in povray-3.6.1 ebuild (not EAPI 3)

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

4 files changed, 48 insertions, 25 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 0d3f3fdc4e0e..848d4175864b 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/povray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.112 2011/03/24 15:57:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.113 2011/09/28 17:43:12 lavajoe Exp $
+
+*povray-3.6.1-r5 (28 Sep 2011)
+
+  28 Sep 2011; Joe Peterson <lavajoe@gentoo.org> -povray-3.6.1-r4.ebuild,
+  +povray-3.6.1-r5.ebuild, +files/povray-3.6.1-only-libjpeg-6b.patch:
+  Require older libjpeg-6b for older povray-3.6.1 and use included static lib
+  if not available (bug #382459); revert use of EROOT, etc., in povray-3.6.1
+  ebuild (not EAPI 3)
 
   24 Mar 2011; Justin Lecher <jlec@gentoo.org>
   +files/3.7.0_rc3-user-conf.patch, povray-3.7.0_rc3.ebuild:
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 9efd379e8e34..509d7428eb32 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,26 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.7.0_rc3-user-conf.patch 1491 RMD160 db514d462e952abc3ace3c8574169cc6d68806d5 SHA1 fba21b345eaeb21e66b87c2209fae5c1d955d131 SHA256 95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0
 AUX povray-3.6.1-configure.patch 1081 RMD160 92dd3995691d567f6ae24b38bea1f31b9803b5b3 SHA1 c4c9fe03b8e24b8c03ed93abd484cfff3abd8dfc SHA256 a3278c6e43c30daa5a2edb7de3726e57f732f9c387b2d838cb41f3c7f14f773b
 AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4af2dbe2 SHA1 19537ff628130a4d2b048529e5a4f9bbfe79840c SHA256 1f56d1223954c1d0ed160b034badcf0878813b0bf984221c8eadce5d7666a46e
 AUX povray-3.6.1-libpng14.patch 776 RMD160 df044db215116ab40a3d957068eaf5a9aecce420 SHA1 619bed7be90e347fa3113299795a2b4efd4ee869 SHA256 30d508b14a68b3eff1b2dbaf180c5b9494629fb0720ae6e1ccb17b04efab93fb
+AUX povray-3.6.1-only-libjpeg-6b.patch 792 RMD160 a44b226e9f7f96f73a7917eed41168bf01d9029e SHA1 da3862fe592cda1c4301e6843e4a736043af8555 SHA256 81f7fe41f0fb79e45e2fec4e9f524fada33fc356b4cefe1987e9566b47af1290
 AUX povray-3.6.1-use-system-libpng.patch 1922 RMD160 dd5481f9ff81f06c596dc0a19386e5ca01f4ad57 SHA1 98333f7701ffd1803adc9b04d5d09beff2f34c27 SHA256 efb0d8345d8409d6c92d024b0b1621bea88f460d73ad9d00b4b670e1ae6b127f
 AUX povray-3.7.0_beta38-print-extend-expiration-info.patch 680 RMD160 6fcdbfbd0e183e22661cfcd7d5989f93fa6f5120 SHA1 9a144c9db4785298a1f05712ef46e8379ca934d5 SHA256 8cb6125164b886e567fab1b0672ae406edf74a5193667d0642967d00e0b1b2bd
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-3.7.0.RC3.tar.bz2 11226551 RMD160 b1ceeef850fa5876230a7fbfb8e14254802ef7d0 SHA1 778765eaea22270bacd2938a33b0ca3778932065 SHA256 246affb3be8ebbd3b0a192da7ee9684295d707143d192d4831e78210c6dbbdcb
 DIST povray-3.7.0.beta.40.tar.bz2 6537405 RMD160 fe7e0a45841da63e50cdc1af80d489c3eae40ccc SHA1 1dd67b290c6a2c2583eab5d1d253e93344bbf9aa SHA256 ddd8af6089312d0dae8b0c51891e1a89e1f8877ce9ddabac374b1b6abf85deb6
-EBUILD povray-3.6.1-r4.ebuild 2848 RMD160 3685e7108619a587eb40d2c9a2324cf175e933f1 SHA1 a632517d5fb04466846e419b6fdd595dd0b40339 SHA256 aaa938cdaeea947f6acc7ea5ce45becbfc7813fe0b09acaad89ef24cf7671cfb
+EBUILD povray-3.6.1-r5.ebuild 3122 RMD160 7749c88b7e959afed3716fc61670056195c636ab SHA1 ba008db267dbd1ad503473418d81ffb841048688 SHA256 4d52bb8c92ef785a8949891bb4f694c99df4bf04a1d2d845bed80a243a45b792
 EBUILD povray-3.7.0_beta40.ebuild 4565 RMD160 da47c98a9df0281de7ffebfd8972aa13a1b81f37 SHA1 d9a921cdb5d737323bc595a272576c64c92370c7 SHA256 6adef09064fda79fcd367cfc6e4c042339bfb0bd4396fe772c6e5ccd62c8005d
 EBUILD povray-3.7.0_rc3.ebuild 3887 RMD160 d0d6c23ab1528129ba1c7d56dd19465cb576ea2c SHA1 3e9031b3b178f99d088ac8e14bb3704ee8915c4f SHA256 ed83606cd0d0ae60c9cbe3df5056b709b67ba7e6d8524c37daff26c2c0ac9bd6
-MISC ChangeLog 17116 RMD160 c8ed7c96ae306e4ea2d99e2f0b69a850d0a56d57 SHA1 4e995833bd751b47bf9a9149b67d49f7b2398b11 SHA256 959b13736de740f16ca32a73e44d6bcf817c34b2953cef74d5cd4627a0ff7908
+MISC ChangeLog 17473 RMD160 79ca8588e2579056bea640eadbd20a9cd0cca7d6 SHA1 2db3d79e08753cb357f6f5ae24bdeeab05a5160c SHA256 f7948773b32c54d7d30b0deab8acf2c6d0a9eed903173257839cb707e50cfc6c
 MISC metadata.xml 308 RMD160 d08b61ccd3d1cae104067bbcb17e469eb6423e93 SHA1 55e0b28ec41eb401a55228d23fcb85ecd5bc892b SHA256 b4065642735e0016ff85663e8429d2d0953b975ffc1edebfa489444e3b0c8c7b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59ovoACgkQfXuS5UK5QB3uhwP/ZronfZCscSxdhzmj9gytvj0O
-WJO/QmMretUZUeIpic7oimYy7m281wiiBesA4UZyPs4ACDksAcGePdPdGQFKnGT3
-AMhX5Vd+P9ri6vJQy6YAqmVZJP9JQW5HBI6ld/sP0HHqg6+Zyzg89uxmMEM+Himv
-GQ5sBSbUzGedqmPxWO8=
-=nfUC
------END PGP SIGNATURE-----
diff --git a/media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch b/media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch
new file mode 100644
index 000000000000..7e84b39209dd
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch
@@ -0,0 +1,20 @@
+--- povray-3.6.1/acinclude.m4~       2011-09-28 10:53:30.000000000 -0600
++++ povray-3.6.1/acinclude.m4        2011-09-28 10:54:17.000000000 -0600
+@@ -494,7 +494,7 @@ AC_DEFUN([POV_CHECK_LIBJPEG],
+         [jpeglib.h],
+         [
+           # check library version, update LIBS
+-          AC_MSG_CHECKING([for libjpeg version >= $1])
++          AC_MSG_CHECKING([for libjpeg version == $1])
+           AC_RUN_IFELSE(
+             [
+               AC_LANG_SOURCE(
+@@ -507,7 +507,7 @@ int main (void)
+   sprintf (ver_string, "%d", JPEG_LIB_VERSION);
+   ver_string[[1]] = (ver_string[[1]] > '0') ? ver_string[[1]] + 48 : '\0';
+   fprintf (stderr, "%s\n", ver_string);
+-  return ! (strcmp (ver_string, "$1") >= 0);
++  return ! (strcmp (ver_string, "$1") == 0);
+ }]
+               )
+             ],
diff --git a/media-gfx/povray/povray-3.6.1-r4.ebuild b/media-gfx/povray/povray-3.6.1-r5.ebuild
index bf04a1aed469..98c90f0a3358 100644
--- a/media-gfx/povray/povray-3.6.1-r4.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r4.ebuild,v 1.14 2011/04/15 17:34:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r5.ebuild,v 1.1 2011/09/28 17:43:12 lavajoe Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.povray.org/"
 
 LICENSE="povlegal-3.6"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="svga tiff X"
 
 DEPEND=">=media-libs/libpng-1.4
@@ -29,6 +29,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-configure.patch
 	epatch "${FILESDIR}"/${P}-find-egrep.patch
 
+	# Check for an exact match to libjpeg-6b,
+	# since newer versions do not work (bug #382459).
+	epatch "${FILESDIR}"/${P}-only-libjpeg-6b.patch
+
 	# Change some destination directories that cannot be adjusted via configure
 	cp Makefile.am Makefile.am.orig
 	sed -i -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" Makefile.am
@@ -46,9 +50,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-use-system-libpng.patch
 
 	# Also, to make sure no bundled static libs can be used, remove them
-	rm -r libraries/jpeg
+	# (but keep jpeg and tiff, since we need to use these old static versions
+	# if libjpeg-6b is not found on system (bug #382459)).
+	#rm -r libraries/jpeg
 	rm -r libraries/png
-	rm -r libraries/tiff
+	#rm -r libraries/tiff
 	rm -r libraries/zlib
 
 	AT_NO_RECURSIVE="yes" eautoreconf
@@ -77,12 +83,12 @@ pkg_preinst() {
 	# Copy the old config files if they are in the old location
 	# but do not yet exist in the new location.
 	# This way, they can be treated by CONFIG_PROTECT as normal.
-	for conf_file in $(ls "${ED}/etc/${PN}"); do
-		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
-				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}"
-					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
+	for conf_file in $(ls "${D}/etc/${PN}"); do
+		if [ ! -e "${ROOT}etc/${PN}/${conf_file}" ]; then
+			for version_dir in $(ls "${ROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
+				if [ -e "${ROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
+					mv "${ROOT}etc/${PN}/${version_dir}/${conf_file}" "${ROOT}etc/${PN}"
+					elog "Note: ${conf_file} moved from ${ROOT}etc/povray/${version_dir}/ to ${ROOT}etc/povray/"
 					break
 				fi
 			done