| 1 |
grobian 10/06/03 11:10:27 |
| 2 |
|
| 3 |
Modified: ChangeLog gtk+-2.18.9.ebuild |
| 4 |
Log: |
| 5 |
Tidy up ebuild by using EAPI=3 |
| 6 |
(Portage version: 2.2.00.15842-prefix/cvs/SunOS i386) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.456 x11-libs/gtk+/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.456&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.456&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.455&r2=1.456 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v |
| 18 |
retrieving revision 1.455 |
| 19 |
retrieving revision 1.456 |
| 20 |
diff -u -r1.455 -r1.456 |
| 21 |
--- ChangeLog 11 May 2010 19:46:10 -0000 1.455 |
| 22 |
+++ ChangeLog 3 Jun 2010 11:10:27 -0000 1.456 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for x11-libs/gtk+ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.455 2010/05/11 19:46:10 ranger Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.456 2010/06/03 11:10:27 grobian Exp $ |
| 28 |
+ |
| 29 |
+ 03 Jun 2010; Fabian Groffen <grobian@g.o> gtk+-2.18.9.ebuild: |
| 30 |
+ Tidy up ebuild by using EAPI=3 |
| 31 |
|
| 32 |
11 May 2010; Brent Baude <ranger@g.o> gtk+-2.18.6.ebuild: |
| 33 |
Marking gtk+-2.18.6 ppc64 for bug 304777 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.4 x11-libs/gtk+/gtk+-2.18.9.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild?rev=1.4&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild?rev=1.4&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild?r1=1.3&r2=1.4 |
| 42 |
|
| 43 |
Index: gtk+-2.18.9.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild,v |
| 46 |
retrieving revision 1.3 |
| 47 |
retrieving revision 1.4 |
| 48 |
diff -u -r1.3 -r1.4 |
| 49 |
--- gtk+-2.18.9.ebuild 12 May 2010 09:50:21 -0000 1.3 |
| 50 |
+++ gtk+-2.18.9.ebuild 3 Jun 2010 11:10:27 -0000 1.4 |
| 51 |
@@ -1,8 +1,8 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild,v 1.3 2010/05/12 09:50:21 ssuominen Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.9.ebuild,v 1.4 2010/06/03 11:10:27 grobian Exp $ |
| 56 |
|
| 57 |
-EAPI="2" |
| 58 |
+EAPI="3" |
| 59 |
|
| 60 |
inherit gnome.org flag-o-matic eutils libtool virtualx |
| 61 |
|
| 62 |
@@ -71,10 +71,6 @@ |
| 63 |
GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} |
| 64 |
} |
| 65 |
|
| 66 |
-pkg_setup() { |
| 67 |
- use prefix || EPREFIX= |
| 68 |
-} |
| 69 |
- |
| 70 |
src_prepare() { |
| 71 |
# use an arch-specific config directory so that 32bit and 64bit versions |
| 72 |
# dont clash on multilib systems |
| 73 |
@@ -159,31 +155,31 @@ |
| 74 |
|
| 75 |
# This has to be removed, because it's multilib specific; generated in |
| 76 |
# postinst |
| 77 |
- rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules" |
| 78 |
+ rm "${ED%/}/etc/gtk-2.0/gtk.immodules" |
| 79 |
|
| 80 |
# add -framework Carbon to the .pc files |
| 81 |
use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do |
| 82 |
- sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed" |
| 83 |
+ sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed" |
| 84 |
done |
| 85 |
} |
| 86 |
|
| 87 |
pkg_postinst() { |
| 88 |
set_gtk2_confdir |
| 89 |
|
| 90 |
- if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then |
| 91 |
- gtk-query-immodules-2.0 > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" |
| 92 |
- gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders" |
| 93 |
+ if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then |
| 94 |
+ gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" |
| 95 |
+ gdk-pixbuf-query-loaders > "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" |
| 96 |
else |
| 97 |
- ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;" |
| 98 |
+ ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;" |
| 99 |
ewarn "to complete the installation of GTK+, please create the" |
| 100 |
ewarn "directory and then manually run:" |
| 101 |
- ewarn " cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" |
| 102 |
+ ewarn " cd ${EROOT%/}${GTK2_CONFDIR}" |
| 103 |
ewarn " gtk-query-immodules-2.0 > gtk.immodules" |
| 104 |
ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" |
| 105 |
fi |
| 106 |
|
| 107 |
- if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then |
| 108 |
- elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* |
| 109 |
+ if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then |
| 110 |
+ elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* |
| 111 |
elog "to do that you can use qfile from portage-utils:" |
| 112 |
elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" |
| 113 |
fi |
Archives