1 |
ulm 08/06/27 11:17:38 |
2 |
|
3 |
Modified: ChangeLog openmotif-2.3.0-r3.ebuild |
4 |
Added: openmotif-2.3.1.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.188 x11-libs/openmotif/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.188&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.188&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.187&r2=1.188 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v |
19 |
retrieving revision 1.187 |
20 |
retrieving revision 1.188 |
21 |
diff -u -r1.187 -r1.188 |
22 |
--- ChangeLog 2 Jun 2008 22:09:46 -0000 1.187 |
23 |
+++ ChangeLog 27 Jun 2008 11:17:37 -0000 1.188 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-libs/openmotif |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.187 2008/06/02 22:09:46 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.188 2008/06/27 11:17:37 ulm Exp $ |
29 |
+ |
30 |
+*openmotif-2.3.1 (27 Jun 2008) |
31 |
+ |
32 |
+ 27 Jun 2008; Ulrich Mueller <ulm@g.o> +openmotif-2.3.1.ebuild: |
33 |
+ Version bump. |
34 |
|
35 |
02 Jun 2008; Ulrich Mueller <ulm@g.o> openmotif-2.3.0-r1.ebuild, |
36 |
openmotif-2.3.0-r3.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.9 x11-libs/openmotif/openmotif-2.3.0-r3.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild?rev=1.9&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild?rev=1.9&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild?r1=1.8&r2=1.9 |
45 |
|
46 |
Index: openmotif-2.3.0-r3.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v |
49 |
retrieving revision 1.8 |
50 |
retrieving revision 1.9 |
51 |
diff -u -r1.8 -r1.9 |
52 |
--- openmotif-2.3.0-r3.ebuild 2 Jun 2008 22:09:46 -0000 1.8 |
53 |
+++ openmotif-2.3.0-r3.ebuild 27 Jun 2008 11:17:37 -0000 1.9 |
54 |
@@ -1,12 +1,12 @@ |
55 |
# Copyright 1999-2008 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.8 2008/06/02 22:09:46 ulm Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.9 2008/06/27 11:17:37 ulm Exp $ |
59 |
|
60 |
inherit eutils flag-o-matic multilib autotools |
61 |
|
62 |
DESCRIPTION="Open Motif" |
63 |
HOMEPAGE="http://www.motifzone.org/" |
64 |
-SRC_URI="ftp://ftp.ics.com/openmotif/2.3/${PV}/${P}.tar.gz |
65 |
+SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz |
66 |
doc? ( http://www.motifzone.net/files/documents/${P}-manual.pdf.tgz )" |
67 |
|
68 |
LICENSE="MOTIF libXpm doc? ( OPL )" |
69 |
|
70 |
|
71 |
|
72 |
1.1 x11-libs/openmotif/openmotif-2.3.1.ebuild |
73 |
|
74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.ebuild?rev=1.1&view=markup |
75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.ebuild?rev=1.1&content-type=text/plain |
76 |
|
77 |
Index: openmotif-2.3.1.ebuild |
78 |
=================================================================== |
79 |
# Copyright 1999-2008 Gentoo Foundation |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1.ebuild,v 1.1 2008/06/27 11:17:37 ulm Exp $ |
82 |
|
83 |
inherit eutils flag-o-matic multilib autotools |
84 |
|
85 |
DOC_P=${PN}-2.3.0 |
86 |
DESCRIPTION="Open Motif" |
87 |
HOMEPAGE="http://www.motifzone.org/" |
88 |
SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz |
89 |
doc? ( http://www.motifzone.net/files/documents/${DOC_P}-manual.pdf.tgz )" |
90 |
|
91 |
LICENSE="MOTIF libXpm doc? ( OPL )" |
92 |
SLOT="0" |
93 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
94 |
IUSE="doc examples jpeg png xft" |
95 |
|
96 |
# make people unmerge motif-config and all previous slots |
97 |
# since the slotting is finally gone now |
98 |
RDEPEND="!x11-libs/motif-config |
99 |
!x11-libs/lesstif |
100 |
!<=x11-libs/openmotif-2.3.0 |
101 |
x11-libs/libXmu |
102 |
x11-libs/libXp |
103 |
virtual/libiconv |
104 |
xft? ( x11-libs/libXft ) |
105 |
jpeg? ( media-libs/jpeg ) |
106 |
png? ( media-libs/libpng )" |
107 |
|
108 |
DEPEND="${RDEPEND} |
109 |
sys-devel/flex |
110 |
x11-misc/xbitmaps" |
111 |
|
112 |
pkg_setup() { |
113 |
# clean up orphaned cruft left over by motif-config |
114 |
local i l count=0 |
115 |
for i in "${ROOT}"usr/bin/{mwm,uil,xmbind} \ |
116 |
"${ROOT}"usr/include/{Xm,uil,Mrm} \ |
117 |
"${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do |
118 |
[[ -L "${i}" ]] || continue |
119 |
l=$(readlink "${i}") |
120 |
if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then |
121 |
einfo "Cleaning up orphaned ${i} symlink ..." |
122 |
rm -f "${i}" |
123 |
fi |
124 |
done |
125 |
|
126 |
cd "${ROOT}"usr/share/man |
127 |
for i in $(find . -type l); do |
128 |
l=$(readlink "${i}") |
129 |
if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then |
130 |
(( count++ )) |
131 |
rm -f "${i}" |
132 |
fi |
133 |
done |
134 |
[[ ${count} -ne 0 ]] && \ |
135 |
einfo "Cleaned up ${count} orphaned symlinks in ${ROOT}usr/share/man" |
136 |
} |
137 |
|
138 |
src_unpack() { |
139 |
unpack ${A} |
140 |
cd "${S}" |
141 |
epatch "${FILESDIR}/${PN}-2.3.0-freebsd-libiconv.patch" |
142 |
|
143 |
# disable compilation of demo binaries |
144 |
sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am |
145 |
|
146 |
# fix libtool-2.2 breakage, bug 220599 |
147 |
sed -i -e 's/LT_HAVE/FINDXFT_HAVE/g' ac_find_xft.m4 |
148 |
|
149 |
# add X.Org vendor string to aliases for virtual bindings |
150 |
echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias |
151 |
|
152 |
AT_M4DIR=. eautoreconf |
153 |
} |
154 |
|
155 |
src_compile() { |
156 |
# get around some LANG problems in make (#15119) |
157 |
unset LANG |
158 |
|
159 |
# bug #80421 |
160 |
filter-flags -ftracer |
161 |
|
162 |
# multilib includes don't work right in this package... |
163 |
has_multilib_profile && append-flags "-I$(get_ml_incdir)" |
164 |
|
165 |
# feel free to fix properly if you care |
166 |
append-flags -fno-strict-aliasing |
167 |
|
168 |
econf --with-x \ |
169 |
$(use_enable xft) \ |
170 |
$(use_enable jpeg) \ |
171 |
$(use_enable png) |
172 |
|
173 |
emake -j1 || die "emake failed" |
174 |
} |
175 |
|
176 |
src_install() { |
177 |
emake -j1 DESTDIR="${D}" install || die "emake install failed" |
178 |
|
179 |
# mwm default configs |
180 |
insinto /usr/share/X11/app-defaults |
181 |
newins "${FILESDIR}"/Mwm.defaults Mwm |
182 |
|
183 |
dodir /etc/X11/mwm |
184 |
mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm |
185 |
dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/ |
186 |
|
187 |
if use examples; then |
188 |
emake -j1 -C demos DESTDIR="${D}" install-data \ |
189 |
|| die "installation of demos failed" |
190 |
dodir /usr/share/doc/${PF}/demos |
191 |
mv "${D}"/usr/share/Xm/* "${D}"/usr/share/doc/${PF}/demos |
192 |
fi |
193 |
rm -rf "${D}"/usr/share/Xm |
194 |
|
195 |
dodoc README RELEASE RELNOTES BUGREPORT TODO |
196 |
use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF} |
197 |
} |
198 |
|
199 |
pkg_postinst() { |
200 |
local line |
201 |
while read line; do elog "${line}"; done <<-EOF |
202 |
Gentoo is no longer providing slotted Open Motif libraries. |
203 |
See bug 204249 and its dependencies for the reasons. |
204 |
|
205 |
From the Open Motif 2.3.0 (upstream) release notes: |
206 |
"Open Motif 2.3 is an updated version of 2.2. Any applications |
207 |
built against a previous 2.x release of Open Motif will be binary |
208 |
compatible with this release." |
209 |
|
210 |
If you have binary-only applications requiring libXm.so.3, you may |
211 |
therefore create a symlink from libXm.so.3 to libXm.so.4. |
212 |
Please note, however, that there will be no Gentoo support for this. |
213 |
Alternatively, you may install x11-libs/openmotif-compat-2.2* for |
214 |
the Open Motif 2.2 libraries. |
215 |
EOF |
216 |
} |
217 |
|
218 |
|
219 |
|
220 |
-- |
221 |
gentoo-commits@l.g.o mailing list |