Gentoo Archives: gentoo-commits

From: "Joe Peterson (lavajoe)" <lavajoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/povray: povray-3.6.1-r6.ebuild ChangeLog
Date: Sat, 01 Oct 2011 00:44:12
Message-Id: 20111001004401.93C5A20036@flycatcher.gentoo.org
1 lavajoe 11/10/01 00:44:01
2
3 Modified: ChangeLog
4 Added: povray-3.6.1-r6.ebuild
5 Log:
6 Disable optimzations on 3.6.1 to match 3.7.0 and to fix misalignment with libjpeg on 32-bit systems (bug #382459)
7
8 (Portage version: 2.1.10.20/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.115 media-gfx/povray/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.115&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.115&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?r1=1.114&r2=1.115
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
20 retrieving revision 1.114
21 retrieving revision 1.115
22 diff -u -r1.114 -r1.115
23 --- ChangeLog 28 Sep 2011 19:33:31 -0000 1.114
24 +++ ChangeLog 1 Oct 2011 00:44:01 -0000 1.115
25 @@ -1,6 +1,12 @@
26 # ChangeLog for media-gfx/povray
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.114 2011/09/28 19:33:31 lavajoe Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.115 2011/10/01 00:44:01 lavajoe Exp $
30 +
31 +*povray-3.6.1-r6 (01 Oct 2011)
32 +
33 + 01 Oct 2011; Joe Peterson <lavajoe@g.o> +povray-3.6.1-r6.ebuild:
34 + Disable optimzations on 3.6.1 to match 3.7.0 and to fix misalignment with
35 + libjpeg on 32-bit systems (bug #382459)
36
37 28 Sep 2011; Joe Peterson <lavajoe@g.o> +povray-3.6.1-r4.ebuild,
38 -povray-3.6.1-r5.ebuild, -files/povray-3.6.1-only-libjpeg-6b.patch:
39
40
41
42 1.1 media-gfx/povray/povray-3.6.1-r6.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/povray-3.6.1-r6.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/povray-3.6.1-r6.ebuild?rev=1.1&content-type=text/plain
46
47 Index: povray-3.6.1-r6.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $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 $
52
53 inherit flag-o-matic eutils autotools
54
55 DESCRIPTION="The Persistence Of Vision Ray Tracer"
56 SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/${P}.tar.bz2"
57 HOMEPAGE="http://www.povray.org/"
58
59 LICENSE="povlegal-3.6"
60 SLOT="0"
61 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
62 IUSE="svga tiff X"
63
64 DEPEND=">=media-libs/libpng-1.4
65 tiff? ( >=media-libs/tiff-3.6.1 )
66 virtual/jpeg
67 sys-libs/zlib
68 X? ( x11-libs/libXaw )
69 svga? ( media-libs/svgalib )"
70 RDEPEND="${DEPEND}"
71
72 src_unpack() {
73 unpack ${A}
74 cd "${S}"
75
76 epatch "${FILESDIR}"/${P}-libpng14.patch
77 epatch "${FILESDIR}"/${P}-configure.patch
78 epatch "${FILESDIR}"/${P}-find-egrep.patch
79
80 # Change some destination directories that cannot be adjusted via configure
81 cp Makefile.am Makefile.am.orig
82 sed -i -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" Makefile.am
83 sed -i -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" Makefile.am
84 sed -i -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" Makefile.am
85
86 cd unix
87 cp Makefile.am Makefile.am.orig
88 sed -i -e 's:^ -DPOVLIBDIR=.*: -DPOVLIBDIR=\\"@datadir@/'"${PN}"'\\" \\:' Makefile.am
89 sed -i -e 's:^ -DPOVCONFDIR=.*: -DPOVCONFDIR=\\"@sysconfdir@/'"${PN}"'\\" \\:' Makefile.am
90 cd ..
91
92 # Patch code that compares system lib versions to properly detect
93 # newer versions. Also fix reference to old png call. (Bug #153538)
94 epatch "${FILESDIR}"/${P}-use-system-libpng.patch
95
96 # Also, to make sure no bundled static libs can be used, remove them
97 rm -r libraries/jpeg
98 rm -r libraries/png
99 rm -r libraries/tiff
100 rm -r libraries/zlib
101
102 AT_NO_RECURSIVE="yes" eautoreconf
103 }
104
105 src_compile() {
106 # Fixes bug 71255
107 if [[ $(get-flag march) == k6-2 ]]; then
108 filter-flags -fomit-frame-pointer
109 fi
110
111 econf \
112 COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
113 $(use_with svga) \
114 $(use_with tiff) \
115 $(use_with X) \
116 --disable-optimiz
117
118 emake || die
119 }
120
121 src_install() {
122 emake DESTDIR="${D}" install || die
123 }
124
125 pkg_preinst() {
126 # Copy the old config files if they are in the old location
127 # but do not yet exist in the new location.
128 # This way, they can be treated by CONFIG_PROTECT as normal.
129 for conf_file in $(ls "${D}/etc/${PN}"); do
130 if [ ! -e "${ROOT}etc/${PN}/${conf_file}" ]; then
131 for version_dir in $(ls "${ROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
132 if [ -e "${ROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
133 mv "${ROOT}etc/${PN}/${version_dir}/${conf_file}" "${ROOT}etc/${PN}"
134 elog "Note: ${conf_file} moved from ${ROOT}etc/povray/${version_dir}/ to ${ROOT}etc/povray/"
135 break
136 fi
137 done
138 fi
139 done
140 }