old

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

10 files changed, 24 insertions, 493 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index e31eb33dce7d..8d67ae6576b8 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,21 @@
 # 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.121 2011/10/29 19:49:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.122 2011/10/29 19:50:41 ssuominen Exp $
+
+  29 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -povray-3.7.0_beta40.ebuild, -povray-3.6.1-r4.ebuild, -povray-3.6.1-r6.ebuild,
+  -files/povray-3.6.1-libpng14.patch, -files/povray-3.6.1-find-egrep.patch,
+  -files/povray-3.6.1-configure.patch,
+  -files/povray-3.7.0_beta38-print-extend-expiration-info.patch,
+  -files/povray-3.6.1-use-system-libpng.patch:
+  old
+
+  29 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -povray-3.6.1-r4.ebuild,
+  -povray-3.6.1-r6.ebuild, -files/povray-3.6.1-configure.patch,
+  -files/povray-3.6.1-find-egrep.patch, -files/povray-3.6.1-libpng14.patch,
+  -files/povray-3.6.1-use-system-libpng.patch, -povray-3.7.0_beta40.ebuild,
+  -files/povray-3.7.0_beta38-print-extend-expiration-info.patch:
+  old
 
   29 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> povray-3.7.0_rc3.ebuild:
   ppc/ppc64 stable wrt #384823
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index a71da25f0eb3..d8979b6d913d 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -2,29 +2,19 @@
 Hash: SHA1
 
 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-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 2838 RMD160 9b0068283d41384f0c80301fd459a139326c476d SHA1 67f7511292d3bc5eac2fe648b7ab5765dc32f17b SHA256 d7df0977d7bad8ae35fa3bcc18c61eeee8cacd77ca0c5a1851765433995c7d2d
-EBUILD povray-3.6.1-r6.ebuild 2867 RMD160 ab807be92381ce9c8e6cf7fc6ab9d48d82bd29d3 SHA1 16af311291fdcda48c8c92c005472bf5dd665253 SHA256 e0a94f160bddf812f5a88117696de91c1ff5e93ded63c720ad69dcd04f453b9b
-EBUILD povray-3.7.0_beta40.ebuild 4565 RMD160 da47c98a9df0281de7ffebfd8972aa13a1b81f37 SHA1 d9a921cdb5d737323bc595a272576c64c92370c7 SHA256 6adef09064fda79fcd367cfc6e4c042339bfb0bd4396fe772c6e5ccd62c8005d
 EBUILD povray-3.7.0_rc3-r1.ebuild 3895 RMD160 74e171153561ec25c8c557abb25e0b7d2951bb4e SHA1 a6645687c801b799ba1b5cc051d0915179c286b4 SHA256 c6dcbca2cb6e73d647e210c73d088fc19315e92f6278466eb53c4508dc0686b2
 EBUILD povray-3.7.0_rc3.ebuild 3851 RMD160 7a5431ae57e137eeccc02598a685729781b7e991 SHA1 14e8fe6c4f7d17d254287bd7a4eb080ddf32c863 SHA256 db4323727fd00b9d262ffe8db76b135c1854e2a17a2418a268f8b1995e1072ce
-MISC ChangeLog 18690 RMD160 654206e5b4cac2daa07a385a28d3ffa4592766dd SHA1 3558192ec0f7755855d6947488179d76df6c8793 SHA256 162488698188c620c72c8054540ed14cc95eab289633339e94c5ce5180029396
+MISC ChangeLog 19426 RMD160 40a484d7ac6fe7a3f653a0ece33cd50ff5be4b7f SHA1 718a9304b858b0e7a52d9dadf864e5bf86eac918 SHA256 c9cbbeb1ea6c8294bbd22c99aad16992c500dfa2f97462f00f9f1901d9dd6f4c
 MISC metadata.xml 308 RMD160 d08b61ccd3d1cae104067bbcb17e469eb6423e93 SHA1 55e0b28ec41eb401a55228d23fcb85ecd5bc892b SHA256 b4065642735e0016ff85663e8429d2d0953b975ffc1edebfa489444e3b0c8c7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrFhjAAoJEEdUh39IaPFN2WkH/0sq2BQwg+JOODQPARETMwaF
-0XqxtvUF/gMt0SuKBakJGSpDlHnoYP1784aq9nJjNCx7PdbSB7vC4Svtp3knH138
-322qTFR++50FehqjtoIxLNxQwTD5xplI2lzkahp796n8liY8Atvm+yhs+KD5+I7O
-VtzmAmtsWlCUaRMXVpsDmpKClesbZP0SB5bJsHh4p0zBSGjS40af/hpk2hraDz+L
-gTlxMu4xXu5zNfqd1lG33BqMRkjz7JIPk0iRnIwAaJOUrHjPTTE7xQUUvobYacgu
-YolWw2dhUHkqMRa4PtdwX5HGLXvwRJMRDCqehpvXbPSfvUaB8jBkupY0GbkaaE4=
-=7mjP
+iQEcBAEBAgAGBQJOrFjFAAoJEEdUh39IaPFNYxMH/R03H8F7zxKLrhMMBGrAYaZh
+7MVPHBX+4kkD6KmPAVICoTUwVeRk/4l2QoIUVGCDWaH9swxfCTw6PxPg/Hgv33tA
+LoKDNvd5+cr1QTGq6+MZAFHuIV32WcMnLorFE0LevCz3d32cSwhDCExbr8lSCU1o
+4tr6Dz48rBglyjB7807eCEwpCqHGoIWpKNgxWbAv/edrtyqLPup6vxCFtxpmFN8N
+Yb79A7JJk4tg1fT8AS8uhpiPAv/2lrptDzFk65E0YICcJhWVChPN1KFZMbjws7Uv
+H7nLR5t/MLOPLIKoZhtqYBI8z7IKTzwKb8HzFmELMVpzc6Q6OcahjaRVtRKIWNA=
+=1wUo
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/povray/files/povray-3.6.1-configure.patch b/media-gfx/povray/files/povray-3.6.1-configure.patch
deleted file mode 100644
index 6cc0afa28902..000000000000
--- a/media-gfx/povray/files/povray-3.6.1-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- povray-3.6.1/configure.ac	2006-01-15 20:11:41.000000000 +0000
-+++ povray-3.6.1/configure.ac	2006-01-15 20:11:19.000000000 +0000
-@@ -1051,11 +1051,19 @@
-       # PPC 7400 (aka G4).  To be precise, the vector instructions are new
-       # in the four digit model number PowerPC processors (aka G4), but gcc
-       # cannot (as of February 2003) use them automatically anyway! [trf]
--      for pov_flags in "-mpowerpc" "-mcpu=750 -mtune=7450" "-mmultiple" "-mstring" "-mfused-madd"; do
-+      if "$host" != powerpc64* ; then
-+          for pov_flags in "-mpowerpc" "-mcpu=750 -mtune=7450"; do
-+            POV_PROG_CXX_FLAGS([$pov_flags],
-+              [if test "$subdirs"; then { POV_PROG_CC_FLAGS([$pov_flags]) }; fi]
-+            )
-+          done
-+      fi
-+      for pov_flags in "-mmultiple" "-mstring" "-mfused-madd"; do
-         POV_PROG_CXX_FLAGS([$pov_flags],
--          [if test "$subdirs"; then { POV_PROG_CC_FLAGS([$pov_flags]) }; fi]
-+            [if test "$subdirs"; then { POV_PROG_CC_FLAGS([$pov_flags]) }; fi]
-         )
-       done
-+
-       ;;
- 
-     sparc-*)
diff --git a/media-gfx/povray/files/povray-3.6.1-find-egrep.patch b/media-gfx/povray/files/povray-3.6.1-find-egrep.patch
deleted file mode 100644
index 290beb6d965e..000000000000
--- a/media-gfx/povray/files/povray-3.6.1-find-egrep.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- acinclude.m4	2006-11-15 15:44:46.000000000 +0000
-+++ acinclude.m4	2006-11-15 16:01:14.000000000 +0000
-@@ -95,12 +95,12 @@
- 
-   # check for -dumpversion
-   AC_TRY_COMMAND([$CXX -dumpversion < /dev/null 2> /dev/null > conftest.out])
--  pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep '[[0-9]]'`
-+  pov_prog_cxx_version=`cat conftest.out | $EGREP '[[0-9]]'`
- 
-   # check for -v
-   if test -z "$pov_prog_cxx_version"; then
-     AC_TRY_COMMAND([$CXX -v < /dev/null 2>&1 | tr A-Z a-z > conftest.out])
--    pov_prog_cxx_version=`cat conftest.out | $ac_cv_prog_egrep "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,'`
-+    pov_prog_cxx_version=`cat conftest.out | $EGREP "version" | sed 's,\(.*version[[[:space:]]]*\)\(.*\),\2,'`
-   fi
- 
-   # final compiler version string
-@@ -155,10 +155,10 @@
-       AC_TRY_COMMAND([$CXX -c conftest.$ac_ext > /dev/null 2> conftest.err0])
-       AC_TRY_COMMAND([$CXX -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
-       AC_TRY_COMMAND([cat conftest.err >&5])
--      AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
-+      AC_TRY_COMMAND([$EGREP \"$pov_prog_cxx_flags_regexp\" conftest.err 2>&1 > /dev/null])
-       # the command above seems to not always return the correct status, so
-       # for safety I rerun it here; I keep the other one for logging purpose.
--      pov_prog_cxx_flags_err=`$ac_cv_prog_egrep "$pov_prog_cxx_flags_regexp" conftest.err`
-+      pov_prog_cxx_flags_err=`$EGREP "$pov_prog_cxx_flags_regexp" conftest.err`
-       AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
-       if test -z "$pov_prog_cxx_flags_err" \
-       || test -z "`diff conftest.err0 conftest.err`"; then
-@@ -204,8 +204,8 @@
-       AC_TRY_COMMAND([$CC -c conftest.$ac_ext > /dev/null 2> conftest.err0])
-       AC_TRY_COMMAND([$CC -c $1 conftest.$ac_ext > /dev/null 2> conftest.err])
-       AC_TRY_COMMAND([cat conftest.err >&5])
--      AC_TRY_COMMAND([$ac_cv_prog_egrep \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
--      pov_prog_cc_flags_err=`$ac_cv_prog_egrep "$pov_prog_cc_flags_regexp" conftest.err`
-+      AC_TRY_COMMAND([$EGREP \"$pov_prog_cc_flags_regexp\" conftest.err 2>&1 > /dev/null])
-+      pov_prog_cc_flags_err=`$EGREP "$pov_prog_cc_flags_regexp" conftest.err`
-       AC_TRY_COMMAND([diff conftest.err0 conftest.err >&5])
-       if test -z "$pov_prog_cc_flags_err" \
-       || test -z "`diff conftest.err0 conftest.err`"; then
diff --git a/media-gfx/povray/files/povray-3.6.1-libpng14.patch b/media-gfx/povray/files/povray-3.6.1-libpng14.patch
deleted file mode 100644
index 250927f183eb..000000000000
--- a/media-gfx/povray/files/povray-3.6.1-libpng14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- source/png_pov.cpp
-+++ source/png_pov.cpp
-@@ -1428,7 +1428,7 @@
- 		if(r_info_ptr->valid & PNG_INFO_tRNS)
- 		{
- 			for (index = 0; index < r_info_ptr->num_trans; index++)
--				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- 		}
- 
- 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
-@@ -1461,7 +1461,7 @@
- 		if(r_info_ptr->valid & PNG_INFO_tRNS)
- 		{
- 			for (index = 0; index < r_info_ptr->num_trans; index++)
--				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
-+				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
- 		}
- 
- 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
diff --git a/media-gfx/povray/files/povray-3.6.1-use-system-libpng.patch b/media-gfx/povray/files/povray-3.6.1-use-system-libpng.patch
deleted file mode 100644
index 365ee370f0d0..000000000000
--- a/media-gfx/povray/files/povray-3.6.1-use-system-libpng.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- povray-3.6.1/acinclude.m4~	2004-08-03 00:16:14.000000000 +0100
-+++ povray-3.6.1/acinclude.m4	2006-11-15 15:29:33.000000000 +0000
-@@ -353,13 +353,36 @@
-             [
-               AC_LANG_SOURCE(
- [#include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include "$5"
- int main (void)
- {
-   const char *version = $6;
-+  char wanted[[]] = "$2";
-+  char *version_tok, *wanted_tok = wanted;
-+  char *version_tmp, *wanted_tmp;
-   fprintf (stderr, "%s\n", version);
--  return ! (strcmp (version ? version : "", "$2") >= 0);
-+  if (!version) return EXIT_FAILURE;
-+  version_tok = strdup(version);
-+  for (version_tok = strtok_r(version_tok, ".", &version_tmp),
-+       wanted_tok  = strtok_r(wanted_tok,  ".", &wanted_tmp);
-+       version_tok != NULL && wanted_tok != NULL;
-+       version_tok = strtok_r(NULL, ".", &version_tmp),
-+       wanted_tok  = strtok_r(NULL, ".", &wanted_tmp)) {
-+    char *version_endptr, *wanted_endptr;
-+    unsigned long version_bit = strtoul(version_tok, &version_endptr, 10);
-+    unsigned long wanted_bit  = strtoul(wanted_tok,  &wanted_endptr,  10);
-+    if (version_bit < wanted_bit)
-+      return EXIT_FAILURE;
-+    if (version_bit > wanted_bit)
-+      return EXIT_SUCCESS;
-+    if (strcmp(version_endptr, wanted_endptr) > 0)
-+      return EXIT_SUCCESS;
-+    if (strcmp(version_endptr, wanted_endptr) < 0)
-+      return EXIT_FAILURE;
-+  }
-+  return wanted_tok == NULL ? EXIT_SUCCESS : EXIT_FAILURE;
- }]
-               )
-             ],
---- povray-3.6.1/source/png_pov.cpp~	2004-08-03 00:11:37.000000000 +0100
-+++ povray-3.6.1/source/png_pov.cpp	2006-11-15 16:48:33.000000000 +0000
-@@ -782,7 +782,7 @@
-       {
-          // finished prematurely - trick into thinking done
-          png_ptr->num_rows = png_ptr->row_number;
--         png_write_finish_row(png_ptr);
-+         png_write_row(png_ptr, row_ptr);
-       }
- 
- #ifdef POV_COMMENTS // temporarily skip comment writing code 
diff --git a/media-gfx/povray/files/povray-3.7.0_beta38-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta38-print-extend-expiration-info.patch
deleted file mode 100644
index 022e7a50602c..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta38-print-extend-expiration-info.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/vfe/unix/unixconsole.cpp b/vfe/unix/unixconsole.cpp
-index e2dffb0..94da68f 100644
---- a/vfe/unix/unixconsole.cpp
-+++ b/vfe/unix/unixconsole.cpp
-@@ -259,6 +259,7 @@ void PrintBeta(int argc, char **argv)
- 	if (current_time > HARD_EXPIRY)
- 	{
- 		fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix expired on 1 January 2011\n", PACKAGE);
-+		fprintf(stderr, "\nTo extend the license period, you can do something like the following\n(adjust syntax for your shell):\n\n    export POVRAY_BETA=`povray --betacode 2>&1`\n\n");
- 		exit(RETURN_ERROR);
- 	}
- 	fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix expires on 1 January 2011\n", PACKAGE);
diff --git a/media-gfx/povray/povray-3.6.1-r4.ebuild b/media-gfx/povray/povray-3.6.1-r4.ebuild
deleted file mode 100644
index 2eb12f0f2847..000000000000
--- a/media-gfx/povray/povray-3.6.1-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.16 2011/09/28 19:33:31 lavajoe Exp $
-
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="The Persistence Of Vision Ray Tracer"
-SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/${P}.tar.bz2"
-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"
-IUSE="svga tiff X"
-
-DEPEND=">=media-libs/libpng-1.4
-	tiff? ( >=media-libs/tiff-3.6.1 )
-	virtual/jpeg
-	sys-libs/zlib
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-find-egrep.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
-	sed -i -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" Makefile.am
-	sed -i -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" Makefile.am
-
-	cd unix
-	cp Makefile.am Makefile.am.orig
-	sed -i -e 's:^  -DPOVLIBDIR=.*:  -DPOVLIBDIR=\\"@datadir@/'"${PN}"'\\" \\:' Makefile.am
-	sed -i -e 's:^  -DPOVCONFDIR=.*:  -DPOVCONFDIR=\\"@sysconfdir@/'"${PN}"'\\" \\:' Makefile.am
-	cd ..
-
-	# Patch code that compares system lib versions to properly detect
-	# newer versions.  Also fix reference to old png call.  (Bug #153538)
-	epatch "${FILESDIR}"/${P}-use-system-libpng.patch
-
-	# Also, to make sure no bundled static libs can be used, remove them
-	rm -r libraries/jpeg
-	rm -r libraries/png
-	rm -r libraries/tiff
-	rm -r libraries/zlib
-
-	AT_NO_RECURSIVE="yes" eautoreconf
-}
-
-src_compile() {
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	econf \
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
-		$(use_with svga) \
-		$(use_with tiff) \
-		$(use_with X)
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-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 "${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
-		fi
-	done
-}
diff --git a/media-gfx/povray/povray-3.6.1-r6.ebuild b/media-gfx/povray/povray-3.6.1-r6.ebuild
deleted file mode 100644
index 26767835d410..000000000000
--- a/media-gfx/povray/povray-3.6.1-r6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-r6.ebuild,v 1.1 2011/10/01 00:44:01 lavajoe Exp $
-
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="The Persistence Of Vision Ray Tracer"
-SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/${P}.tar.bz2"
-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"
-IUSE="svga tiff X"
-
-DEPEND=">=media-libs/libpng-1.4
-	tiff? ( >=media-libs/tiff-3.6.1 )
-	virtual/jpeg
-	sys-libs/zlib
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-find-egrep.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
-	sed -i -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" Makefile.am
-	sed -i -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" Makefile.am
-
-	cd unix
-	cp Makefile.am Makefile.am.orig
-	sed -i -e 's:^  -DPOVLIBDIR=.*:  -DPOVLIBDIR=\\"@datadir@/'"${PN}"'\\" \\:' Makefile.am
-	sed -i -e 's:^  -DPOVCONFDIR=.*:  -DPOVCONFDIR=\\"@sysconfdir@/'"${PN}"'\\" \\:' Makefile.am
-	cd ..
-
-	# Patch code that compares system lib versions to properly detect
-	# newer versions.  Also fix reference to old png call.  (Bug #153538)
-	epatch "${FILESDIR}"/${P}-use-system-libpng.patch
-
-	# Also, to make sure no bundled static libs can be used, remove them
-	rm -r libraries/jpeg
-	rm -r libraries/png
-	rm -r libraries/tiff
-	rm -r libraries/zlib
-
-	AT_NO_RECURSIVE="yes" eautoreconf
-}
-
-src_compile() {
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	econf \
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
-		$(use_with svga) \
-		$(use_with tiff) \
-		$(use_with X) \
-		--disable-optimiz
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-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 "${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
-		fi
-	done
-}
diff --git a/media-gfx/povray/povray-3.7.0_beta40.ebuild b/media-gfx/povray/povray-3.7.0_beta40.ebuild
deleted file mode 100644
index 2c77ec07e266..000000000000
--- a/media-gfx/povray/povray-3.7.0_beta40.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.7.0_beta40.ebuild,v 1.2 2011/02/26 18:23:12 signals Exp $
-
-EAPI="3"
-
-inherit autotools eutils flag-o-matic versionator
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/beta/beta.}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-SRC_URI="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.bz2"
-
-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"
-IUSE="debug mkl openexr tiff X"
-
-DEPEND="
-	>=dev-libs/boost-1.41
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr )
-	mkl? ( sci-libs/mkl )
-	tiff? ( >=media-libs/tiff-3.6.1 )
-	X? ( media-libs/libsdl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# Print info on how to extend the expiration date of the beta
-	# if it has expired.
-	epatch "${FILESDIR}"/${PN}-3.7.0_beta38-print-extend-expiration-info.patch
-
-	# Change some destination directories that cannot be adjusted via configure
-	cp configure.ac configure.ac.orig
-	sed \
-		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
-		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
-		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
-		-i configure.ac || die
-
-	cp Makefile.am Makefile.am.orig
-	sed \
-		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
-		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
-		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
-		-i Makefile.am || die
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local non_redist_conf
-
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# but the code compiles using incorrect [default] paths
-	# (based on /usr/local...), so povray will not find the system
-	# config files without the following fix:
-	append-flags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\"
-	append-flags -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
-
-	if ! use tiff ; then
-		non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
-	else
-		non_redist_conf=""
-	fi
-
-	econf \
-		${non_redist_conf} \
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
-		$(use_enable debug) \
-		$(use_with openexr) \
-		$(use_with mkl libmkl) \
-		$(use_with tiff libtiff) \
-		$(use_with X libsdl) \
-		$(use_with X x) \
-		--disable-strip \
-		--disable-optimiz \
-		--disable-optimiz-arch \
-		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-	# For the beta releases, we generate a license extension in case needed
-	POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-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/"
-					break
-				fi
-			done
-		fi
-	done
-}
-
-pkg_postinst() {
-	ewarn "POV-Ray betas have expiration dates, but these can be extended for up to"
-	ewarn "a year.  If expired, you will get the following error when running povray:"
-	ewarn
-	ewarn "    povray: this pre-release version of POV-Ray for Unix has expired"
-	ewarn
-	ewarn "To extend the license period (a week at a time), you can do"
-	ewarn "something like the following (adjust syntax for your shell):"
-	ewarn
-	ewarn "    export POVRAY_BETA=\`povray --betacode 2>&1\`"
-	ewarn
-	ewarn "You will need to repeat this each time it expires."
-}