diff options
author | 2008-11-27 16:30:59 +0000 | |
---|---|---|
committer | 2008-11-27 16:30:59 +0000 | |
commit | 5a5c8317e5e5d17dfe2b5db352e615f108e04a2f (patch) | |
tree | 6b86b179563c4b206ac5190e2aa78940bdff04a0 /media-gfx/povray | |
parent | Change versioning to match upstream conventions (diff) | |
download | gentoo-2-5a5c8317e5e5d17dfe2b5db352e615f108e04a2f.tar.gz gentoo-2-5a5c8317e5e5d17dfe2b5db352e615f108e04a2f.tar.bz2 gentoo-2-5a5c8317e5e5d17dfe2b5db352e615f108e04a2f.zip |
Fix up versioning code in beta (no rev bump)
(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 i686)
Diffstat (limited to 'media-gfx/povray')
-rw-r--r-- | media-gfx/povray/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch (renamed from media-gfx/povray/files/povray-3.7.0-print-extend-expiration-info.patch) | 0 | ||||
-rw-r--r-- | media-gfx/povray/povray-3.7.0_beta29-r1.ebuild | 16 |
3 files changed, 15 insertions, 9 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index 4af11d56ac9a..b4b429e35c35 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,12 @@ # 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.95 2008/11/15 19:11:27 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.96 2008/11/27 16:30:59 lavajoe Exp $ + + 27 Nov 2008; Joe Peterson <lavajoe@gentoo.org> + -files/povray-3.7.0-print-extend-expiration-info.patch, + +files/povray-3.7.0_beta29-print-extend-expiration-info.patch, + povray-3.7.0_beta29-r1.ebuild: + Fix up versioning code in beta (no rev bump) 15 Nov 2008; Joe Peterson <lavajoe@gentoo.org> -povray-3.6.1-r3.ebuild: Remove old 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_beta29-print-extend-expiration-info.patch index 80a382ad672c..80a382ad672c 100644 --- a/media-gfx/povray/files/povray-3.7.0-print-extend-expiration-info.patch +++ b/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch diff --git a/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild index 04b3d736e20f..7df16da78768 100644 --- a/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild +++ b/media-gfx/povray/povray-3.7.0_beta29-r1.ebuild @@ -1,16 +1,16 @@ # 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.2 2008/11/14 16:01:18 lavajoe Exp $ +# $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 -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}" +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=${MAJOR_VER} + MY_PV=${POVRAY_MAJOR_VER} fi DESCRIPTION="The Persistence of Vision Raytracer" @@ -38,7 +38,7 @@ src_unpack() { # 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 + epatch "${FILESDIR}"/${P}-print-extend-expiration-info.patch # Change some destination directories that cannot be adjusted via configure cp configure.ac configure.ac.orig |