1 |
eva 09/04/26 22:36:49 |
2 |
|
3 |
Modified: ChangeLog libgnomekbd-2.22.0.ebuild |
4 |
libgnomekbd-2.24.0.ebuild |
5 |
Log: |
6 |
Avoid re-linking to system's libgnomekbd, thanks to vapier, bug #265428. |
7 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.49 gnome-base/libgnomekbd/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/ChangeLog?rev=1.49&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/ChangeLog?rev=1.49&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/ChangeLog?r1=1.48&r2=1.49 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v |
19 |
retrieving revision 1.48 |
20 |
retrieving revision 1.49 |
21 |
diff -u -r1.48 -r1.49 |
22 |
--- ChangeLog 12 Apr 2009 20:47:06 -0000 1.48 |
23 |
+++ ChangeLog 26 Apr 2009 22:36:49 -0000 1.49 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for gnome-base/libgnomekbd |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.48 2009/04/12 20:47:06 bluebird Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.49 2009/04/26 22:36:49 eva Exp $ |
29 |
+ |
30 |
+ 27 Apr 2009; Gilles Dartiguelongue <eva@g.o> |
31 |
+ +files/libgnomekbd-2.22.0-system-relink.patch, libgnomekbd-2.22.0, |
32 |
+ libgnomekbd-2.24.0: |
33 |
+ Avoid re-linking to system's libgnomekbd, thanks to vapier, bug #265428. |
34 |
|
35 |
12 Apr 2009; Friedrich Oslage <bluebird@g.o> |
36 |
libgnomekbd-2.24.0.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.9 gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild?rev=1.9&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild?rev=1.9&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild?r1=1.8&r2=1.9 |
45 |
|
46 |
Index: libgnomekbd-2.22.0.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v |
49 |
retrieving revision 1.8 |
50 |
retrieving revision 1.9 |
51 |
diff -u -r1.8 -r1.9 |
52 |
--- libgnomekbd-2.22.0.ebuild 13 Nov 2008 19:14:22 -0000 1.8 |
53 |
+++ libgnomekbd-2.22.0.ebuild 26 Apr 2009 22:36:49 -0000 1.9 |
54 |
@@ -1,8 +1,10 @@ |
55 |
# Copyright 1999-2008 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.8 2008/11/13 19:14:22 ranger Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.22.0.ebuild,v 1.9 2009/04/26 22:36:49 eva Exp $ |
59 |
|
60 |
-inherit gnome2 |
61 |
+EAPI="2" |
62 |
+ |
63 |
+inherit autotools eutils gnome2 |
64 |
|
65 |
DESCRIPTION="Gnome keyboard configuration library" |
66 |
HOMEPAGE="http://www.gnome.org" |
67 |
@@ -13,18 +15,18 @@ |
68 |
IUSE="" |
69 |
|
70 |
RDEPEND=">=dev-libs/glib-2.6 |
71 |
- >=sys-apps/dbus-0.92 |
72 |
- >=dev-libs/dbus-glib-0.34 |
73 |
- >=gnome-base/gconf-2.14 |
74 |
- >=x11-libs/gtk+-2.10.3 |
75 |
- >=gnome-base/libglade-2.6 |
76 |
- >=gnome-base/libgnome-2.16 |
77 |
- >=gnome-base/libgnomeui-2.16 |
78 |
- >=x11-libs/libxklavier-3.2 |
79 |
- !<gnome-base/gnome-control-center-2.17.0" |
80 |
+ >=sys-apps/dbus-0.92 |
81 |
+ >=dev-libs/dbus-glib-0.34 |
82 |
+ >=gnome-base/gconf-2.14 |
83 |
+ >=x11-libs/gtk+-2.10.3 |
84 |
+ >=gnome-base/libglade-2.6 |
85 |
+ >=gnome-base/libgnome-2.16 |
86 |
+ >=gnome-base/libgnomeui-2.16 |
87 |
+ >=x11-libs/libxklavier-3.2 |
88 |
+ !<gnome-base/gnome-control-center-2.17.0" |
89 |
DEPEND="${RDEPEND} |
90 |
- >=dev-util/intltool-0.35 |
91 |
- >=dev-util/pkgconfig-0.19" |
92 |
+ >=dev-util/intltool-0.35 |
93 |
+ >=dev-util/pkgconfig-0.19" |
94 |
|
95 |
DOCS="AUTHORS ChangeLog NEWS README" |
96 |
|
97 |
@@ -37,6 +39,13 @@ |
98 |
G2CONF="${G2CONF} --disable-tests" |
99 |
} |
100 |
|
101 |
+src_prepare() { |
102 |
+ # Fix linking to system's library, bug #265428 |
103 |
+ epatch "${FILESDIR}/${P}-system-relink.patch" |
104 |
+ |
105 |
+ eautomake |
106 |
+} |
107 |
+ |
108 |
src_compile() { |
109 |
# FreeBSD doesn't like -j |
110 |
use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" |
111 |
|
112 |
|
113 |
|
114 |
1.8 gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild |
115 |
|
116 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild?rev=1.8&view=markup |
117 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild?rev=1.8&content-type=text/plain |
118 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild?r1=1.7&r2=1.8 |
119 |
|
120 |
Index: libgnomekbd-2.24.0.ebuild |
121 |
=================================================================== |
122 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v |
123 |
retrieving revision 1.7 |
124 |
retrieving revision 1.8 |
125 |
diff -u -r1.7 -r1.8 |
126 |
--- libgnomekbd-2.24.0.ebuild 12 Apr 2009 20:47:06 -0000 1.7 |
127 |
+++ libgnomekbd-2.24.0.ebuild 26 Apr 2009 22:36:49 -0000 1.8 |
128 |
@@ -1,8 +1,10 @@ |
129 |
# Copyright 1999-2009 Gentoo Foundation |
130 |
# Distributed under the terms of the GNU General Public License v2 |
131 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.7 2009/04/12 20:47:06 bluebird Exp $ |
132 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.8 2009/04/26 22:36:49 eva Exp $ |
133 |
|
134 |
-inherit gnome2 |
135 |
+EAPI="2" |
136 |
+ |
137 |
+inherit autotools eutils gnome2 |
138 |
|
139 |
DESCRIPTION="Gnome keyboard configuration library" |
140 |
HOMEPAGE="http://www.gnome.org" |
141 |
@@ -34,6 +36,13 @@ |
142 |
G2CONF="${G2CONF} --disable-tests" |
143 |
} |
144 |
|
145 |
+src_prepare() { |
146 |
+ # Fix linking to system's library, bug #265428 |
147 |
+ epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch" |
148 |
+ |
149 |
+ eautomake |
150 |
+} |
151 |
+ |
152 |
src_compile() { |
153 |
# FreeBSD doesn't like -j |
154 |
use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" |