Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/povray: ChangeLog povray-3.7.0_rc6.ebuild
Date: Fri, 30 Nov 2012 10:00:30
Message-Id: 20121130100013.AF9B120C65@flycatcher.gentoo.org
1 jlec 12/11/30 10:00:13
2
3 Modified: ChangeLog
4 Added: povray-3.7.0_rc6.ebuild
5 Log:
6 media-gfx/povray: Version Bump
7
8 (Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
9
10 Revision Changes Path
11 1.138 media-gfx/povray/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.138&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.138&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?r1=1.137&r2=1.138
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
20 retrieving revision 1.137
21 retrieving revision 1.138
22 diff -u -r1.137 -r1.138
23 --- ChangeLog 30 Nov 2012 09:42:18 -0000 1.137
24 +++ ChangeLog 30 Nov 2012 10:00:13 -0000 1.138
25 @@ -1,6 +1,11 @@
26 # ChangeLog for media-gfx/povray
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.137 2012/11/30 09:42:18 jlec Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.138 2012/11/30 10:00:13 jlec Exp $
30 +
31 +*povray-3.7.0_rc6 (30 Nov 2012)
32 +
33 + 30 Nov 2012; Justin Lecher <jlec@g.o> +povray-3.7.0_rc6.ebuild:
34 + Version Bump
35
36 30 Nov 2012; Justin Lecher <jlec@g.o> -povray-3.7.0_rc3-r1.ebuild,
37 -povray-3.7.0_rc5.ebuild:
38
39
40
41 1.1 media-gfx/povray/povray-3.7.0_rc6.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/povray-3.7.0_rc6.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/povray-3.7.0_rc6.ebuild?rev=1.1&content-type=text/plain
45
46 Index: povray-3.7.0_rc6.ebuild
47 ===================================================================
48 # Copyright 1999-2012 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc6.ebuild,v 1.1 2012/11/30 10:00:13 jlec Exp $
51
52 EAPI=4
53
54 inherit autotools eutils flag-o-matic versionator multilib
55
56 POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
57 POVRAY_MINOR_VER=$(get_version_component_range 4)
58 if [ -n "$POVRAY_MINOR_VER" ]; then
59 POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
60 MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
61 else
62 MY_PV=${POVRAY_MAJOR_VER}
63 fi
64
65 DESCRIPTION="The Persistence of Vision Raytracer"
66 HOMEPAGE="http://www.povray.org/"
67 SRC_URI="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.gz"
68
69 LICENSE="povlegal-3.6"
70 SLOT="0"
71 KEYWORDS="~amd64 ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
72 IUSE="debug mkl openexr tiff X"
73
74 DEPEND="
75 >=dev-libs/boost-1.50.0[threads(+)]
76 media-libs/libpng:0
77 sys-libs/zlib
78 virtual/jpeg
79 mkl? ( sci-libs/mkl )
80 openexr? (
81 media-libs/ilmbase
82 media-libs/openexr )
83 tiff? ( media-libs/tiff:0 )
84 X? ( media-libs/libsdl )"
85 RDEPEND="${DEPEND}"
86 DEPEND="${DEPEND}
87 sys-devel/boost-m4"
88
89 S=${WORKDIR}/${PN}-${MY_PV}
90
91 src_prepare() {
92 epatch \
93 "${FILESDIR}"/3.7.0_rc3-user-conf.patch \
94 "${FILESDIR}"/${PN}-3.7.0_rc5+boost-1.50.patch \
95 "${FILESDIR}"/${PN}-3.7.0_rc5-automagic.patch
96
97 # Change some destination directories that cannot be adjusted via configure
98 sed \
99 -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
100 -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
101 -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
102 -i configure.ac || die
103
104 sed \
105 -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
106 -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
107 -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
108 -e 's:mkdir_p:MKDIR_P:g' \
109 -i Makefile.am || die
110
111 # The "+p" option on the test command line causes a pause and
112 # prompts the user to interact, so remove it.
113 sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
114
115 eautoreconf
116 }
117
118 src_configure() {
119 local non_redist_conf
120
121 # Fixes bug 71255
122 if [[ $(get-flag march) == k6-2 ]]; then
123 filter-flags -fomit-frame-pointer
124 fi
125
126 # The config files are installed correctly (e.g. povray.conf),
127 # but the code compiles using incorrect [default] paths
128 # (based on /usr/local...), so povray will not find the system
129 # config files without the following fix:
130 append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
131
132 if ! use tiff ; then
133 non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
134 else
135 non_redist_conf=""
136 fi
137
138 econf \
139 ${non_redist_conf} \
140 COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
141 $(use_enable debug) \
142 $(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)") \
143 $(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)") \
144 $(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
145 $(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
146 $(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
147 --disable-strip \
148 --disable-optimiz \
149 --disable-optimiz-arch
150 }
151
152 src_test() {
153 # For the beta releases, we generate a license extension in case needed
154 POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check
155 }
156
157 pkg_preinst() {
158 # Copy the old config files if they are in the old location
159 # but do not yet exist in the new location.
160 # This way, they can be treated by CONFIG_PROTECT as normal.
161 for conf_file in $(ls "${ED}/etc/${PN}"); do
162 if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
163 for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
164 if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
165 mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}"
166 elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
167 break
168 fi
169 done
170 fi
171 done
172 }