Reverting static lib change (security issue, and requesting more info from bug submitter of bug #382459) - note that stable keywords added back are same as before

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 12 insertions, 34 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 848d4175864b..84799a8dc8a0 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,11 @@
 # 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.113 2011/09/28 17:43:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.114 2011/09/28 19:33:31 lavajoe Exp $
+
+  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:
+  Reverting static lib change (security issue, and requesting more info from
+  bug submitter of bug #382459)
 
 *povray-3.6.1-r5 (28 Sep 2011)
 
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 509d7428eb32..aa724db61d2f 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -2,14 +2,13 @@ AUX 3.7.0_rc3-user-conf.patch 1491 RMD160 db514d462e952abc3ace3c8574169cc6d68806
 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-r5.ebuild 3122 RMD160 7749c88b7e959afed3716fc61670056195c636ab SHA1 ba008db267dbd1ad503473418d81ffb841048688 SHA256 4d52bb8c92ef785a8949891bb4f694c99df4bf04a1d2d845bed80a243a45b792
+EBUILD povray-3.6.1-r4.ebuild 2838 RMD160 9b0068283d41384f0c80301fd459a139326c476d SHA1 67f7511292d3bc5eac2fe648b7ab5765dc32f17b SHA256 d7df0977d7bad8ae35fa3bcc18c61eeee8cacd77ca0c5a1851765433995c7d2d
 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 17473 RMD160 79ca8588e2579056bea640eadbd20a9cd0cca7d6 SHA1 2db3d79e08753cb357f6f5ae24bdeeab05a5160c SHA256 f7948773b32c54d7d30b0deab8acf2c6d0a9eed903173257839cb707e50cfc6c
+MISC ChangeLog 17727 RMD160 9e6d0991086276d1eca124a8c7c41071ade9c465 SHA1 631a34e2f840404e006c4bfa3516bb6bceea6588 SHA256 077a618d4a58bd7e967363348a249d1ec51c84df44286b0ea95d465ebe3be109
 MISC metadata.xml 308 RMD160 d08b61ccd3d1cae104067bbcb17e469eb6423e93 SHA1 55e0b28ec41eb401a55228d23fcb85ecd5bc892b SHA256 b4065642735e0016ff85663e8429d2d0953b975ffc1edebfa489444e3b0c8c7b
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
deleted file mode 100644
index 7e84b39209dd..000000000000
--- a/media-gfx/povray/files/povray-3.6.1-only-libjpeg-6b.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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-r5.ebuild b/media-gfx/povray/povray-3.6.1-r4.ebuild
index 98c90f0a3358..2eb12f0f2847 100644
--- a/media-gfx/povray/povray-3.6.1-r5.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r4.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-r5.ebuild,v 1.1 2011/09/28 17:43:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r4.ebuild,v 1.16 2011/09/28 19:33:31 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,10 +29,6 @@ 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
@@ -50,11 +46,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-use-system-libpng.patch
 
 	# Also, to make sure no bundled static libs can be used, remove them
-	# (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/jpeg
 	rm -r libraries/png
-	#rm -r libraries/tiff
+	rm -r libraries/tiff
 	rm -r libraries/zlib
 
 	AT_NO_RECURSIVE="yes" eautoreconf