From 389e960d6cac9e7c5a3a0b846014dec0955ac4b0 Mon Sep 17 00:00:00 2001 From: Joe Peterson Date: Fri, 16 Jan 2009 21:09:50 +0000 Subject: Fix expiration date issue (bug #255176) Package-Manager: portage-2.1.6.6/cvs/Linux 2.6.29-rc1-git6 i686 --- media-gfx/povray/ChangeLog | 11 +- media-gfx/povray/Manifest | 5 +- .../povray-3.7.0_beta29-fix-expiration-bug.patch | 15 +++ media-gfx/povray/povray-3.7.0_beta29-r1.ebuild | 123 -------------------- media-gfx/povray/povray-3.7.0_beta29-r2.ebuild | 124 +++++++++++++++++++++ 5 files changed, 151 insertions(+), 127 deletions(-) create mode 100644 media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch delete mode 100644 media-gfx/povray/povray-3.7.0_beta29-r1.ebuild create mode 100644 media-gfx/povray/povray-3.7.0_beta29-r2.ebuild (limited to 'media-gfx/povray') diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index b4b429e35c35..1f57f88eb8cb 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,13 @@ # 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.96 2008/11/27 16:30:59 lavajoe Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.97 2009/01/16 21:09:50 lavajoe Exp $ + +*povray-3.7.0_beta29-r2 (16 Jan 2009) + + 16 Jan 2009; Joe Peterson + +files/povray-3.7.0_beta29-fix-expiration-bug.patch, + -povray-3.7.0_beta29-r1.ebuild, +povray-3.7.0_beta29-r2.ebuild: + Fix expiration date issue (bug #255176) 27 Nov 2008; Joe Peterson -files/povray-3.7.0-print-extend-expiration-info.patch, diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest index 81d132cb67a3..ccdbfa4784f4 100644 --- a/media-gfx/povray/Manifest +++ b/media-gfx/povray/Manifest @@ -1,10 +1,11 @@ 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_beta29-fix-expiration-bug.patch 633 RMD160 e3eba65af69299584659c1a4e3c69b64ebc65f54 SHA1 924d572c6ab51474edf3a0e213b1863a3b927ebf SHA256 1b52f9d992744fcc257567ef4ef0ec9d612997bcf786574ed46ba66f8c69afc1 AUX povray-3.7.0_beta29-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-r4.ebuild 2740 RMD160 49947c21b48379364d98711f032a9c949c9e603b SHA1 2e90864be295876c14646c08b79f158956e52e49 SHA256 96176df1d8fcd2fbebe5dc6c9cf22cb4c7e1a848f8142dae20fdd0a8f6352d00 -EBUILD povray-3.7.0_beta29-r1.ebuild 4117 RMD160 2f3551b2db501c041605b523b93745f496175b39 SHA1 51847ddc47593624018d8325bef92d6eceee3cb1 SHA256 a4062fe012f7b9bced1afcc6e204b264a9f312d7a29ce3320b395ca959a27c18 -MISC ChangeLog 14043 RMD160 9ab18c0a6d4dbb3d8778aac49d744d15f72cb6d6 SHA1 af30472bccec08dc9a6e2472af9211010f79dcca SHA256 fbb98614aa285516eb3492fd35841a018a02f6136fbcd7bb61878d67d4a053ae +EBUILD povray-3.7.0_beta29-r2.ebuild 4169 RMD160 0284ef9eea9908d6e6855d2ee02c5148219e5c06 SHA1 67e181824a60a1e16d659daaddb2e2072b931b98 SHA256 2ee618c0ae7dd420df1fcc7254f8332d68bbf99b0c416c71d7454d356c856331 +MISC ChangeLog 14295 RMD160 559aae31d1d67ab2095004f9f4e80da660ee03e8 SHA1 2e7ce2fd6001a7e791ac4d987ee12a6a3f79e678 SHA256 1cdb1132041f8106484b126a93ab8d4e91cad9a62341db32ecd1f429530c100b MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055 diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch b/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch new file mode 100644 index 000000000000..2da0056750b5 --- /dev/null +++ b/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch @@ -0,0 +1,15 @@ +--- vfe/vfe.cpp 2008-09-06 00:14:57.000000000 +0200 ++++ vfe/vfe.cpp 2009-01-16 12:48:13.646808534 +0100 +@@ -747,9 +747,9 @@ + + // this code may not be removed or modified unless the compilation is for personal + // use and the binary is not distributed to anyone else. +- xtime_get(&t, TIME_UTC); +- if (t.sec > 1230760800) +- throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application."); ++ // xtime_get(&t, TIME_UTC); ++ // if (t.sec > 1230760800) ++ // throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application."); + + state = kStarting; + diff --git a/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild deleted file mode 100644 index 7df16da78768..000000000000 --- a/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# 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.3 2008/11/27 16:30:59 lavajoe Exp $ - -inherit eutils autotools 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/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}"/${P}-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 - - # 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 - - 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_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 "${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." -} diff --git a/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild b/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild new file mode 100644 index 000000000000..cfe5f1162917 --- /dev/null +++ b/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/01/16 21:09:50 lavajoe Exp $ + +inherit eutils autotools 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/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}"/${P}-print-extend-expiration-info.patch + epatch "${FILESDIR}"/${P}-fix-expiration-bug.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 + + # 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 + + 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_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 "${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." +} -- cgit v1.2.3-65-gdbad