Disable optimzations on 3.6.1 to match 3.7.0 and to fix misalignment with libjpeg...

Package-Manager: portage-2.1.10.20/cvs/Linux x86_64

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 84799a8dc8a0a7e99aa91e4454af5ad872fa0e67..d696658c93cb71e1f17d04bf98eee8a9f543d5a2 100644 (file)
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/povray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.114 2011/09/28 19:33:31 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.115 2011/10/01 00:44:01 lavajoe Exp $
+
+*povray-3.6.1-r6 (01 Oct 2011)
+
+  01 Oct 2011; Joe Peterson <lavajoe@gentoo.org> +povray-3.6.1-r6.ebuild:
+  Disable optimzations on 3.6.1 to match 3.7.0 and to fix misalignment with
+  libjpeg on 32-bit systems (bug #382459)
 
   28 Sep 2011; Joe Peterson <lavajoe@gentoo.org> +povray-3.6.1-r4.ebuild,
   -povray-3.6.1-r5.ebuild, -files/povray-3.6.1-only-libjpeg-6b.patch:

diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index aa724db61d2f2c6e489da23e4a8356fdcfa6eb41..89f774ae2251e5d919baddae68797b35516ea533 100644 (file)
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -8,7 +8,8 @@ DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a
 DIST povray-3.7.0.RC3.tar.bz2 11226551 RMD160 b1ceeef850fa5876230a7fbfb8e14254802ef7d0 SHA1 778765eaea22270bacd2938a33b0ca3778932065 SHA256 246affb3be8ebbd3b0a192da7ee9684295d707143d192d4831e78210c6dbbdcb
 DIST povray-3.7.0.beta.40.tar.bz2 6537405 RMD160 fe7e0a45841da63e50cdc1af80d489c3eae40ccc SHA1 1dd67b290c6a2c2583eab5d1d253e93344bbf9aa SHA256 ddd8af6089312d0dae8b0c51891e1a89e1f8877ce9ddabac374b1b6abf85deb6
 EBUILD povray-3.6.1-r4.ebuild 2838 RMD160 9b0068283d41384f0c80301fd459a139326c476d SHA1 67f7511292d3bc5eac2fe648b7ab5765dc32f17b SHA256 d7df0977d7bad8ae35fa3bcc18c61eeee8cacd77ca0c5a1851765433995c7d2d
+EBUILD povray-3.6.1-r6.ebuild 2867 RMD160 ab807be92381ce9c8e6cf7fc6ab9d48d82bd29d3 SHA1 16af311291fdcda48c8c92c005472bf5dd665253 SHA256 e0a94f160bddf812f5a88117696de91c1ff5e93ded63c720ad69dcd04f453b9b
 EBUILD povray-3.7.0_beta40.ebuild 4565 RMD160 da47c98a9df0281de7ffebfd8972aa13a1b81f37 SHA1 d9a921cdb5d737323bc595a272576c64c92370c7 SHA256 6adef09064fda79fcd367cfc6e4c042339bfb0bd4396fe772c6e5ccd62c8005d
 EBUILD povray-3.7.0_rc3.ebuild 3887 RMD160 d0d6c23ab1528129ba1c7d56dd19465cb576ea2c SHA1 3e9031b3b178f99d088ac8e14bb3704ee8915c4f SHA256 ed83606cd0d0ae60c9cbe3df5056b709b67ba7e6d8524c37daff26c2c0ac9bd6
-MISC ChangeLog 17727 RMD160 9e6d0991086276d1eca124a8c7c41071ade9c465 SHA1 631a34e2f840404e006c4bfa3516bb6bceea6588 SHA256 077a618d4a58bd7e967363348a249d1ec51c84df44286b0ea95d465ebe3be109
+MISC ChangeLog 17952 RMD160 cdfe60aadd69ac05d0b1605605ceb83ca0b82033 SHA1 48838b93b064c454fb89c8e267966ff73a420d4d SHA256 89ae19bc88cb08dcdc8bb61758687666deaa53370a159dea0b8a28d8e70eb323
 MISC metadata.xml 308 RMD160 d08b61ccd3d1cae104067bbcb17e469eb6423e93 SHA1 55e0b28ec41eb401a55228d23fcb85ecd5bc892b SHA256 b4065642735e0016ff85663e8429d2d0953b975ffc1edebfa489444e3b0c8c7b

diff --git a/media-gfx/povray/povray-3.6.1-r6.ebuild b/media-gfx/povray/povray-3.6.1-r6.ebuild
new file mode 100644 (file)
index 0000000..2676783
--- /dev/null
+++ b/media-gfx/povray/povray-3.6.1-r6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r6.ebuild,v 1.1 2011/10/01 00:44:01 lavajoe Exp $
+
+inherit flag-o-matic eutils autotools
+
+DESCRIPTION="The Persistence Of Vision Ray Tracer"
+SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/${P}.tar.bz2"
+HOMEPAGE="http://www.povray.org/"
+
+LICENSE="povlegal-3.6"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="svga tiff X"
+
+DEPEND=">=media-libs/libpng-1.4
+       tiff? ( >=media-libs/tiff-3.6.1 )
+       virtual/jpeg
+       sys-libs/zlib
+       X? ( x11-libs/libXaw )
+       svga? ( media-libs/svgalib )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-libpng14.patch
+       epatch "${FILESDIR}"/${P}-configure.patch
+       epatch "${FILESDIR}"/${P}-find-egrep.patch
+
+       # Change some destination directories that cannot be adjusted via configure
+       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
+
+       cd unix
+       cp Makefile.am Makefile.am.orig
+       sed -i -e 's:^  -DPOVLIBDIR=.*:  -DPOVLIBDIR=\\"@datadir@/'"${PN}"'\\" \\:' Makefile.am
+       sed -i -e 's:^  -DPOVCONFDIR=.*:  -DPOVCONFDIR=\\"@sysconfdir@/'"${PN}"'\\" \\:' Makefile.am
+       cd ..
+
+       # Patch code that compares system lib versions to properly detect
+       # newer versions.  Also fix reference to old png call.  (Bug #153538)
+       epatch "${FILESDIR}"/${P}-use-system-libpng.patch
+
+       # Also, to make sure no bundled static libs can be used, remove them
+       rm -r libraries/jpeg
+       rm -r libraries/png
+       rm -r libraries/tiff
+       rm -r libraries/zlib
+
+       AT_NO_RECURSIVE="yes" eautoreconf
+}
+
+src_compile() {
+       # Fixes bug 71255
+       if [[ $(get-flag march) == k6-2 ]]; then
+               filter-flags -fomit-frame-pointer
+       fi
+
+       econf \
+               COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
+               $(use_with svga) \
+               $(use_with tiff) \
+               $(use_with X) \
+               --disable-optimiz
+
+       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
+}