public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/povray: ChangeLog povray-3.7.0_beta25-r1.ebuild
@ 2008-05-09 13:06 Joe Peterson (lavajoe)
  0 siblings, 0 replies; 2+ messages in thread
From: Joe Peterson (lavajoe) @ 2008-05-09 13:06 UTC (permalink / raw
  To: gentoo-commits

lavajoe     08/05/09 13:06:08

  Modified:             ChangeLog
  Added:                povray-3.7.0_beta25-r1.ebuild
  Log:
  Adjust locations of /usr/share files, docs, and config files
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.72                 media-gfx/povray/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?r1=1.71&r2=1.72

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog	4 Apr 2008 05:03:16 -0000	1.71
+++ ChangeLog	9 May 2008 13:06:07 -0000	1.72
@@ -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.71 2008/04/04 05:03:16 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.72 2008/05/09 13:06:07 lavajoe Exp $
+
+*povray-3.7.0_beta25-r1 (09 May 2008)
+
+  09 May 2008; Joe Peterson <lavajoe@gentoo.org>
+  +povray-3.7.0_beta25-r1.ebuild:
+  Adjust locations of /usr/share files, docs, and config files
 
 *povray-3.7.0_beta25 (04 Apr 2008)
 



1.1                  media-gfx/povray/povray-3.7.0_beta25-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?rev=1.1&content-type=text/plain

Index: povray-3.7.0_beta25-r1.ebuild
===================================================================
# 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.1 2008/05/09 13:06:07 lavajoe Exp $

inherit eutils autotools flag-o-matic versionator

MY_PV=$(get_version_component_range 1-3)
MY_MINOR_VER=$(get_version_component_range 4)
if [ -n "$MY_MINOR_VER" ]; then
	MY_MINOR_VER=${MY_MINOR_VER/beta/beta.}
	MY_PV="${MY_PV}.${MY_MINOR_VER}b"
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_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:
	MY_MAIN_VER=$(get_version_component_range 1-2)
	append-flags -DPOVLIBDIR=\\\"${ROOT}usr/share/${PN}\\\"
	append-flags -DPOVCONFDIR=\\\"${ROOT}etc/${PN}\\\"

	# 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

	autoreconf

	econf \
		COMPILED_BY="${USER} <${USER}@`uname -n`>" \
		$(use_with svga) \
		$(use_with tiff) \
		$(use_with X) \
		|| 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
}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-gfx/povray: ChangeLog povray-3.7.0_beta25-r1.ebuild
@ 2008-09-12  5:17 Joe Peterson (lavajoe)
  0 siblings, 0 replies; 2+ messages in thread
From: Joe Peterson (lavajoe) @ 2008-09-12  5:17 UTC (permalink / raw
  To: gentoo-commits

lavajoe     08/09/12 05:17:50

  Modified:             ChangeLog povray-3.7.0_beta25-r1.ebuild
  Log:
  Fix 3.7.0 beta 25 to work with gcc-4.3 (bug #216684)
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)

Revision  Changes    Path
1.76                 media-gfx/povray/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	29 May 2008 01:40:07 -0000	1.75
+++ ChangeLog	12 Sep 2008 05:17:50 -0000	1.76
@@ -1,6 +1,10 @@
 # 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.75 2008/05/29 01:40:07 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.76 2008/09/12 05:17:50 lavajoe Exp $
+
+  12 Sep 2008; Joe Peterson <lavajoe@gentoo.org>
+  +files/povray-3.7.0_beta25-gcc43.patch, povray-3.7.0_beta25-r1.ebuild:
+  Fix 3.7.0 beta 25 to work with gcc-4.3 (bug #216684)
 
   29 May 2008; Joe Peterson <lavajoe@gentoo.org> povray-3.6.1-r3.ebuild:
   Use eautoreconf with AT_NO_RECURSIVE set



1.3                  media-gfx/povray/povray-3.7.0_beta25-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?r1=1.2&r2=1.3

Index: povray-3.7.0_beta25-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- povray-3.7.0_beta25-r1.ebuild	28 May 2008 21:52:46 -0000	1.2
+++ povray-3.7.0_beta25-r1.ebuild	12 Sep 2008 05:17:50 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2008/05/28 21:52:46 lavajoe Exp $
+# $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
 
@@ -34,6 +34,8 @@
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc43.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






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-09-12  5:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-09 13:06 [gentoo-commits] gentoo-x86 commit in media-gfx/povray: ChangeLog povray-3.7.0_beta25-r1.ebuild Joe Peterson (lavajoe)
  -- strict thread matches above, loose matches on Subject: below --
2008-09-12  5:17 Joe Peterson (lavajoe)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox