Print info on how to extend the expiration date of the beta if it has expired

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 i686

4 files changed, 155 insertions, 2 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index bee6004e9a88..3700ed5f0ea6 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/povray
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.81 2008/11/08 20:55:53 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.82 2008/11/08 21:45:38 lavajoe Exp $
+
+*povray-3.7.0_beta29-r1 (08 Nov 2008)
+
+  08 Nov 2008; Joe Peterson <lavajoe@gentoo.org>
+  +files/povray-3.7.0-print-extend-expiration-info.patch,
+  +povray-3.7.0_beta29-r1.ebuild:
+  Print info on how to extend the expiration date of the beta if it has
+  expired. Without this, users can get the impression that the program
+  cannot be run.
 
   08 Nov 2008; Joe Peterson <lavajoe@gentoo.org> povray-3.6.1-r4.ebuild:
   Remove dependency on libpng version
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index bcce82705f61..022571190690 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,11 +1,13 @@
 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-use-system-libpng.patch 1922 RMD160 dd5481f9ff81f06c596dc0a19386e5ca01f4ad57 SHA1 98333f7701ffd1803adc9b04d5d09beff2f34c27 SHA256 efb0d8345d8409d6c92d024b0b1621bea88f460d73ad9d00b4b670e1ae6b127f
+AUX povray-3.7.0-print-extend-expiration-info.patch 1179 RMD160 8dad1af951d062c06a14ffe3b68fc17f1fda4fa7 SHA1 c2d8ca630a3f0b479c7f85728549455059e05ff3 SHA256 3f787d0d96b1d193c70d6a6684f84b31618e25b768dccb0fb114b832da023df9
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-src-3.7.0.beta.29.tar.bz2 6202387 RMD160 5073463b1068fc95a31f77da6458286888eccff8 SHA1 4c7a4c22472d3b9a2d88e660a6df6c3b3d497efb SHA256 88655167a4ae0ba97a7e1e19c261d592692bbbdc7f77d287c0b3d084334b45b3
 EBUILD povray-3.6.1-r2.ebuild 1507 RMD160 a19e644cee988e4fd08a9899488f724bb914f7fa SHA1 c0047a1dbb33e7ced8ba72db84e4ba0cc98eba62 SHA256 18b7040548f990c7df80da07deb14b58413c643b6e42d58425dc9ec70ce6de83
 EBUILD povray-3.6.1-r3.ebuild 2395 RMD160 d61d6901e0a3ee3578ef3afe5f12ed5318c7b30b SHA1 8fa30c990537ab0245eaf28d2c2cffd8e3e0ead7 SHA256 1d1b97bb3d3e9ad101303c02a4ef3f3caabff2a2d9e70847022a4260c689f16f
 EBUILD povray-3.6.1-r4.ebuild 2745 RMD160 366b56f4c4a0e197a6ce93962daaa64459aeb3e5 SHA1 dbace71c75d1a491ecf91deac4b332b096c3a518 SHA256 e752019cac2a5e96869b420802cb38abe85a3ac43890721509f201ab158de782
+EBUILD povray-3.7.0_beta29-r1.ebuild 3731 RMD160 dabcc8b2901b75415fe33c3fd9ef22d5732d870f SHA1 2e6f43f6eefe28e6fdff836ebdb75c306afec83c SHA256 9ffccdf14b88bf59f86fa2bedbbfb9d677fa0d8c5cedb21422725e0d9aece415
 EBUILD povray-3.7.0_beta29.ebuild 3589 RMD160 7bcf89efcedee868b8c0aec786e241ce5e8b01f7 SHA1 149351df2461d2f1e368a0c9c28ed02805f32b08 SHA256 c43502815e3a31b1cd89678c7600cdceff05206cb34b49150ee4dc947a48f0f4
-MISC ChangeLog 12022 RMD160 fea65e363529d487a5bd000319a8bdfaf9a3a32d SHA1 3dac7476be6a55c9d10f72baeb3ded636c1547d2 SHA256 74eec23744003f15a429fe9ec666ad879ce39383f66a14ec5dff7726f1e15bec
+MISC ChangeLog 12363 RMD160 15d271ec03a796a69013c46ca34d48e8414777a7 SHA1 98dcd35ec7838a79583ea98ba0cd20a9d16db5d4 SHA256 8d82dda42c92f5d72b258efad2a896b6173c4f9ca079367484ee16be18b7bfe0
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/files/povray-3.7.0-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0-print-extend-expiration-info.patch
new file mode 100644
index 000000000000..80a382ad672c
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0-print-extend-expiration-info.patch
@@ -0,0 +1,28 @@
+--- vfe/unix/unixconsole.cpp~	2008-10-07 17:06:27.000000000 -0600
++++ vfe/unix/unixconsole.cpp	2008-11-08 14:11:58.000000000 -0700
+@@ -281,10 +281,21 @@
+ 
+ 		if (user_code != current_code)
+ 		{
+-			fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
+-				PACKAGE,
+-				current_week < 52 ? "has expired" : "is over twelve months old and is no longer usable"
+-			);
++                        if (current_week < 52)
++                        {
++				fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
++					PACKAGE,
++					"has expired"
++				);
++                                fprintf(stderr, "\nTo extend the license period (a week at a time), you can do\nsomething like the following (adjust syntax for your shell):\n\n    export POVRAY_BETA=`povray --betacode 2>&1`\n\n");
++                        }
++                        else
++                        {
++				fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
++					PACKAGE,
++					"is over twelve months old and is no longer usable"
++				);
++                        }
+ 			exit(RETURN_ERROR);
+ 		}
+ 		current_time = EXPIRE_AT + (current_week+1)*spw - current_time;
diff --git a/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild
new file mode 100644
index 000000000000..2da131f8b7ce
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 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_beta29-r1.ebuild,v 1.1 2008/11/08 21:45:38 lavajoe Exp $
+
+inherit eutils autotools flag-o-matic versionator
+
+MAJOR_VER=$(get_version_component_range 1-3)
+MINOR_VER=$(get_version_component_range 4)
+if [ -n "$MINOR_VER" ]; then
+	MINOR_VER=${MINOR_VER/beta/beta.}
+	MY_PV="${MAJOR_VER}.${MINOR_VER}"
+else
+	MY_PV=${MAJOR_VER}
+fi
+
+DESCRIPTION="The Persistence of Vision Raytracer"
+HOMEPAGE="http://www.povray.org/"
+SRC_URI="http://www.povray.org/beta/source/${PN}-src-${MY_PV}.tar.bz2"
+
+LICENSE="povlegal-3.6"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="svga tiff X"
+
+DEPEND="media-libs/libpng
+	tiff? ( >=media-libs/tiff-3.6.1 )
+	media-libs/jpeg
+	sys-libs/zlib
+	X? ( x11-libs/libXaw )
+	svga? ( media-libs/svgalib )
+	>=dev-libs/boost-1.33"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Print info on how to extend the expiration date of the beta
+	# if it has expired.
+	epatch "${FILESDIR}"/${PN}-${MAJOR_VER}-print-extend-expiration-info.patch
+
+	# Change some destination directories that cannot be adjusted via configure
+	cp configure.ac configure.ac.orig
+	sed -i -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' configure.ac
+	sed -i -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' configure.ac
+	sed -i -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' configure.ac
+
+	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
+
+	eautoreconf
+}
+
+src_compile() {
+	# 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=\\\"${ROOT}usr/share/${PN}\\\"
+	append-flags -DPOVCONFDIR=\\\"${ROOT}etc/${PN}\\\"
+
+	econf \
+		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
+		$(use_with svga) \
+		$(use_with tiff) \
+		$(use_with X) \
+		--disable-strip \
+		|| die
+
+	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
+}
+
+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."
+}