Changeset - fcdd6581fb87
[Not reviewed]
default
0 1 3
Nathan Brink (binki) - 16 years ago 2008-12-08 23:07:33
ohnobinki@ohnopublishing.net
bump to media-gfx/povray-3.7.0_beta29
also added ChangeLog for POVRay
4 files changed with 144 insertions and 1 deletions:
0 comments (0 inline, 0 general)
media-gfx/povray/ChangeLog
Show inline comments
 
new file 100644
 
# ChangeLog for media-gfx/povray
 
# Copyright 1999-2008 Nathan Brink; Distributed under the GPL v2
 
# $Header: $
 

	
 

	
 
	
 
*povray-3.7.0_beta29 (08 December 2008)
 

	
 
  08 Dec 2008; Nathan Phillip Brink <ohnobinki@ohnopublishing.net> +files/povray-3.7.0_beta29-remove-expiration.patch, +povray-3.7.0_beta29.ebuild
 
  Bumped to povray-3.7.0_beta29 from povray-3.7.0_beta28
 
	
 
  08 Dec 2008; Nathan Phillip Brink <ohnobinki@ohnopublishing.net> :
 
  Sunc/synced the povray-3.7.0_beta28.ebuild ebuild with the official Gentoo povray-3.7.0_beta29.ebuild, excluding stuff regarding the expiration and extension code because my patch disables POVRay's expiration code.
media-gfx/povray/Manifest
Show inline comments
 
AUX povray-3.7.0_beta28-remove-expiration.patch 821 RMD160 8e3e38dd79ee145b6ff819c6aaedbd199fd0adf9 SHA1 2bfd0d6e73a04cd716cf84a1830effe62fbf1650 SHA256 1bfea3cafda7444184c2843308e78e2204b76d2267af5a4e6f71f655b3146f8c
 
AUX povray-3.7.0_beta29-remove-expiration.patch 821 RMD160 28326696588e87f051b47cf4da957c9edfb7abcb SHA1 929692d8a7ac915f97a8d31d827977e1d6dc1163 SHA256 d6d0150b273327e9c86c3a703463221fb3f88cce64a3d725684e08c514110e0f
 
AUX povray-3.7.0_beta29-remove-expiration.patch~ 821 RMD160 8e3e38dd79ee145b6ff819c6aaedbd199fd0adf9 SHA1 2bfd0d6e73a04cd716cf84a1830effe62fbf1650 SHA256 1bfea3cafda7444184c2843308e78e2204b76d2267af5a4e6f71f655b3146f8c
 
DIST povray-src-3.7.0.beta.28.tar.bz2 6892500 RMD160 0d332fba6adfa9e1875d95da266f94646f2898c7 SHA1 4a4933f239157180eb19de6076bfc137f14d934f SHA256 b0483cf01685871020a0b7aa764831aa63aa0caffbc7839014f4468e698974fd
 
DIST povray-src-3.7.0.beta.29.tar.bz2 6202387 RMD160 5073463b1068fc95a31f77da6458286888eccff8 SHA1 4c7a4c22472d3b9a2d88e660a6df6c3b3d497efb SHA256 88655167a4ae0ba97a7e1e19c261d592692bbbdc7f77d287c0b3d084334b45b3
 
EBUILD povray-3.7.0_beta28.ebuild 3380 RMD160 4eef1f857b0a6e5088e3404772e9f7db4f7db2ac SHA1 0e064b5d548f863a618ce731153e198e282dcd59 SHA256 bc51ed58b122a2a4a1f76e36928f38c3cf95c99b4f54b3c5516c009cc8c55ab7
 
MISC ChangeLog 442 RMD160 6caacc783ae4c8bab68c237e99f604319d843cde SHA1 d16304abc45fa4d1db15df227dec3d51b31aa491 SHA256 180d7532f49d46ccc98f2d3ac35c94a5b4a743dd696b2df45c67ec672137dd11
 
EBUILD povray-3.7.0_beta29.ebuild 3380 RMD160 4eef1f857b0a6e5088e3404772e9f7db4f7db2ac SHA1 0e064b5d548f863a618ce731153e198e282dcd59 SHA256 bc51ed58b122a2a4a1f76e36928f38c3cf95c99b4f54b3c5516c009cc8c55ab7
 
MISC ChangeLog 648 RMD160 8b98b76f7bb7226bd28863c8f121c7471e1dda0e SHA1 ea8b88707f0929a093d075cf79b826c8c06b537d SHA256 2d9b8854b9c97d487205d596b1da2c6271e350c2a0791617a94afdc784077281
media-gfx/povray/files/povray-3.7.0_beta29-remove-expiration.patch
Show inline comments
 
new file 100644
 
This code allows POV-Ray to complain about "beta out of date", but stops it from exit(int)'ing
 
--- povray-3.7.0.beta.29/vfe/unix/unixconsole.cpp	2008-08-04 12:52:56.000000000 -0400
 
+++ /tmp/buffer-content-10089Ugl	2008-09-26 22:03:58.000000000 -0400
 
@@ -272,7 +272,7 @@
 
 				if (argv[i] != NULL && strcmp(argv[i], "--betacode") == 0)
 
 				{
 
 					fprintf(stderr, "%d\n", current_code);
 
-					exit(RETURN_OK);
 
+					//exit(RETURN_OK);
 
 				}
 
 			const char *beta_code = getenv("POVRAY_BETA");
 
 			if (beta_code != NULL)
 
@@ -285,7 +285,7 @@
 
 				PACKAGE,
 
 				current_week < 52 ? "has expired" : "is over twelve months old and is no longer usable"
 
 			);
 
-			exit(RETURN_ERROR);
 
+			//exit(RETURN_ERROR);
 
 		}
 
 		current_time = EXPIRE_AT + (current_week+1)*spw - current_time;
 
 	}
 

	
 
Diff finished.  Fri Sep 26 22:03:58 2008
media-gfx/povray/povray-3.7.0_beta29.ebuild
Show inline comments
 
new file 100644
 
# 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_beta25-r1.ebuild,v 1.3 2008/09/12 05:17: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}"
 

	
 
	# Remove POVRay's code that pointlessly aborts if the beta has ``expired''
 
	epatch "${FILESDIR}"/${P}-remove-expiration.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_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
 
}
0 comments (0 inline, 0 general)