1 |
ulm 10/02/06 15:47:56 |
2 |
|
3 |
Modified: ChangeLog openmotif-2.3.2.ebuild |
4 |
Added: openmotif-2.3.2-r1.ebuild |
5 |
Removed: openmotif-2.3.1.1.ebuild |
6 |
Log: |
7 |
Prepare for prefix support. Change EAPI to 3. |
8 |
Move PDF documentation into separate package. Remove old. |
9 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
10 |
|
11 |
Revision Changes Path |
12 |
1.226 x11-libs/openmotif/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.226&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.226&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.225&r2=1.226 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v |
21 |
retrieving revision 1.225 |
22 |
retrieving revision 1.226 |
23 |
diff -u -r1.225 -r1.226 |
24 |
--- ChangeLog 15 Dec 2009 09:22:29 -0000 1.225 |
25 |
+++ ChangeLog 6 Feb 2010 15:47:55 -0000 1.226 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for x11-libs/openmotif |
28 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.225 2009/12/15 09:22:29 ulm Exp $ |
30 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
31 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.226 2010/02/06 15:47:55 ulm Exp $ |
32 |
+ |
33 |
+*openmotif-2.3.2-r1 (06 Feb 2010) |
34 |
+ |
35 |
+ 06 Feb 2010; Ulrich Mueller <ulm@g.o> -openmotif-2.3.1.1.ebuild, |
36 |
+ +openmotif-2.3.2-r1.ebuild, +files/openmotif-2.3.2-sanitise-paths.patch: |
37 |
+ Prepare for prefix support. Change EAPI to 3. Move PDF documentation into |
38 |
+ separate package. Remove old. |
39 |
|
40 |
15 Dec 2009; Ulrich Mueller <ulm@g.o> openmotif-2.3.1.1.ebuild, |
41 |
openmotif-2.3.2.ebuild: |
42 |
|
43 |
|
44 |
|
45 |
1.13 x11-libs/openmotif/openmotif-2.3.2.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild?rev=1.13&view=markup |
48 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild?rev=1.13&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild?r1=1.12&r2=1.13 |
50 |
|
51 |
Index: openmotif-2.3.2.ebuild |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild,v |
54 |
retrieving revision 1.12 |
55 |
retrieving revision 1.13 |
56 |
diff -u -r1.12 -r1.13 |
57 |
--- openmotif-2.3.2.ebuild 15 Dec 2009 09:22:29 -0000 1.12 |
58 |
+++ openmotif-2.3.2.ebuild 6 Feb 2010 15:47:55 -0000 1.13 |
59 |
@@ -1,12 +1,12 @@ |
60 |
-# Copyright 1999-2009 Gentoo Foundation |
61 |
+# Copyright 1999-2010 Gentoo Foundation |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild,v 1.12 2009/12/15 09:22:29 ulm Exp $ |
64 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2.ebuild,v 1.13 2010/02/06 15:47:55 ulm Exp $ |
65 |
|
66 |
inherit autotools eutils flag-o-matic multilib |
67 |
|
68 |
DOC_P=${PN}-2.3.0 |
69 |
DESCRIPTION="Open Motif" |
70 |
-HOMEPAGE="http://www.motifzone.org/" |
71 |
+HOMEPAGE="http://www.motifzone.net/" |
72 |
SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz |
73 |
doc? ( http://www.motifzone.net/files/documents/${DOC_P}-manual.pdf.tgz )" |
74 |
|
75 |
|
76 |
|
77 |
|
78 |
1.1 x11-libs/openmotif/openmotif-2.3.2-r1.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r1.ebuild?rev=1.1&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r1.ebuild?rev=1.1&content-type=text/plain |
82 |
|
83 |
Index: openmotif-2.3.2-r1.ebuild |
84 |
=================================================================== |
85 |
# Copyright 1999-2010 Gentoo Foundation |
86 |
# Distributed under the terms of the GNU General Public License v2 |
87 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r1.ebuild,v 1.1 2010/02/06 15:47:55 ulm Exp $ |
88 |
|
89 |
EAPI=3 |
90 |
|
91 |
inherit autotools eutils flag-o-matic multilib |
92 |
|
93 |
DOC_P=${PN}-2.3.0 |
94 |
DESCRIPTION="Open Motif" |
95 |
HOMEPAGE="http://www.motifzone.net/" |
96 |
SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz" |
97 |
|
98 |
LICENSE="MOTIF MIT" |
99 |
SLOT="0" |
100 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
101 |
IUSE="doc examples jpeg png unicode xft" |
102 |
# License allows usage only on "open source operating systems" |
103 |
RESTRICT="!kernel_linuxx? ( |
104 |
!kernel_FreeBSD? ( |
105 |
!kernel_Darwin? ( |
106 |
!kernel_SunOS? ( |
107 |
fetch bindist |
108 |
) ) ) )" |
109 |
|
110 |
# make people unmerge motif-config and all previous slots |
111 |
# since the slotting is finally gone now |
112 |
RDEPEND="!x11-libs/motif-config |
113 |
!x11-libs/lesstif |
114 |
!<=x11-libs/openmotif-2.3.0 |
115 |
x11-libs/libXmu |
116 |
x11-libs/libXp |
117 |
doc? ( app-doc/openmotif-manual ) |
118 |
unicode? ( virtual/libiconv ) |
119 |
xft? ( x11-libs/libXft ) |
120 |
jpeg? ( media-libs/jpeg ) |
121 |
png? ( media-libs/libpng )" |
122 |
|
123 |
DEPEND="${RDEPEND} |
124 |
sys-devel/flex |
125 |
x11-misc/xbitmaps" |
126 |
|
127 |
pkg_nofetch() { |
128 |
local line |
129 |
while read line; do einfo "${line}"; done <<-EOF |
130 |
From the Open Motif license: "This software is subject to an open |
131 |
license. It may only be used on, with or for operating systems which |
132 |
are themselves open source systems. You must contact The Open Group |
133 |
for a license allowing distribution and sublicensing of this software |
134 |
on, with, or for operating systems which are not open source programs." |
135 |
|
136 |
If you have got such a license, you may download the file: |
137 |
${SRC_URI} |
138 |
and place it in ${DISTDIR}. |
139 |
EOF |
140 |
} |
141 |
|
142 |
pkg_setup() { |
143 |
# clean up orphaned cruft left over by motif-config |
144 |
local i l count=0 |
145 |
for i in "${EROOT}"/usr/bin/{mwm,uil,xmbind} \ |
146 |
"${EROOT}"/usr/include/{Xm,uil,Mrm} \ |
147 |
"${EROOT}"/usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do |
148 |
[[ -L "${i}" ]] || continue |
149 |
l=$(readlink "${i}") |
150 |
if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then |
151 |
einfo "Cleaning up orphaned ${i} symlink ..." |
152 |
rm -f "${i}" |
153 |
fi |
154 |
done |
155 |
|
156 |
cd "${EROOT}"/usr/share/man |
157 |
for i in $(find . -type l); do |
158 |
l=$(readlink "${i}") |
159 |
if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then |
160 |
(( count++ )) |
161 |
rm -f "${i}" |
162 |
fi |
163 |
done |
164 |
[[ ${count} -ne 0 ]] && \ |
165 |
einfo "Cleaned up ${count} orphaned symlinks in ${EROOT}/usr/share/man" |
166 |
} |
167 |
|
168 |
src_prepare() { |
169 |
epatch "${FILESDIR}/${PN}-2.3.1-multilist-stipple.patch" #215984 |
170 |
epatch "${FILESDIR}/${PN}-2.3.1-ac-editres.patch" #82081 |
171 |
epatch "${FILESDIR}/${P}-ldflags.patch" #293573 |
172 |
epatch "${FILESDIR}/${P}-sanitise-paths.patch" |
173 |
|
174 |
# disable compilation of demo binaries |
175 |
sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am |
176 |
|
177 |
# add X.Org vendor string to aliases for virtual bindings |
178 |
echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias |
179 |
|
180 |
AT_M4DIR=. eautoreconf |
181 |
} |
182 |
|
183 |
src_configure() { |
184 |
# get around some LANG problems in make (#15119) |
185 |
unset LANG |
186 |
|
187 |
# bug #80421 |
188 |
filter-flags -ftracer |
189 |
|
190 |
# multilib includes don't work right in this package... |
191 |
has_multilib_profile && append-flags "-I$(get_ml_incdir)" |
192 |
|
193 |
# feel free to fix properly if you care |
194 |
append-flags -fno-strict-aliasing |
195 |
|
196 |
if use !elibc_glibc && use !elibc_uclibc && use unicode; then |
197 |
# libiconv detection in configure script doesn't always work |
198 |
# http://bugs.motifzone.net/show_bug.cgi?id=1423 |
199 |
export LIBS="${LIBS} -liconv" |
200 |
fi |
201 |
|
202 |
econf --with-x \ |
203 |
$(use_enable unicode utf8) \ |
204 |
$(use_enable xft) \ |
205 |
$(use_enable jpeg) \ |
206 |
$(use_enable png) |
207 |
} |
208 |
|
209 |
src_compile() { |
210 |
emake -j1 || die "emake failed" |
211 |
} |
212 |
|
213 |
src_install() { |
214 |
emake -j1 DESTDIR="${D}" install || die "emake install failed" |
215 |
|
216 |
# mwm default configs |
217 |
insinto /usr/share/X11/app-defaults |
218 |
newins "${FILESDIR}"/Mwm.defaults Mwm |
219 |
|
220 |
dodir /etc/X11/mwm |
221 |
mv -f "${ED}"/usr/$(get_libdir)/X11/system.mwmrc "${ED}"/etc/X11/mwm |
222 |
dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/ |
223 |
|
224 |
if use examples; then |
225 |
emake -j1 -C demos DESTDIR="${D}" install-data \ |
226 |
|| die "installation of demos failed" |
227 |
dodir /usr/share/doc/${PF}/demos |
228 |
mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos |
229 |
fi |
230 |
rm -rf "${ED}"/usr/share/Xm |
231 |
|
232 |
dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO |
233 |
} |
234 |
|
235 |
pkg_postinst() { |
236 |
local line |
237 |
while read line; do elog "${line}"; done <<-EOF |
238 |
From the Open Motif 2.3.0 (upstream) release notes: |
239 |
"Open Motif 2.3 is an updated version of 2.2. Any applications |
240 |
built against a previous 2.x release of Open Motif will be binary |
241 |
compatible with this release." |
242 |
|
243 |
If you have binary-only applications requiring libXm.so.3, you may |
244 |
therefore create a symlink from libXm.so.3 to libXm.so.4. |
245 |
Please note, however, that there will be no Gentoo support for this. |
246 |
Alternatively, you may install x11-libs/openmotif-compat-2.2* for |
247 |
the Open Motif 2.2 libraries. |
248 |
EOF |
249 |
} |