Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Dennis Schridde <devurandom@×××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/
Date: Sat, 05 Feb 2011 21:42:41
Message-Id: 2579ba6fc74c17d300b74db72182b027efdabcc8.devurandom@gentoo
1 commit: 2579ba6fc74c17d300b74db72182b027efdabcc8
2 Author: Dennis Schridde <devurandom <AT> gmx <DOT> net>
3 AuthorDate: Sat Feb 5 21:41:15 2011 +0000
4 Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net>
5 CommitDate: Sat Feb 5 21:41:15 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2579ba6f
7
8 [dev-libs/libindicate] Improve patches based on upstream request, revbump
9
10 (Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E)
11
12 ---
13 .../files/libindicate-0.4.4-optional-doc.patch | 18 ++++++++--
14 .../files/libindicate-0.4.4-optional-gtk.patch | 22 +++++++++++--
15 .../libindicate-0.4.91-fix-python-version.patch | 15 +++++----
16 .../files/libindicate-0.4.91-optional-mono.patch | 16 ++++++++--
17 .../files/libindicate-0.4.91-optional-python.patch | 32 +++++++++++++++-----
18 ...0.4.4-r1.ebuild => libindicate-0.4.4-r2.ebuild} | 0
19 ...-0.4.91.ebuild => libindicate-0.4.91-r2.ebuild} | 0
20 7 files changed, 78 insertions(+), 25 deletions(-)
21
22 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
23 index 857bc7a..13c09f9 100644
24 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
25 +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
26 @@ -6,19 +6,29 @@
27
28 +AC_ARG_ENABLE([doc],
29 + AC_HELP_STRING([--disable-doc], [Disable doc generation]),
30 -+ [enable_doc=$enableval], enable_doc=auto)
31 ++ [enable_doc=$enableval], [enable_doc=auto])
32 +AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
33 +
34 GTK_DOC_CHECK([1.4])
35 -+if test "x$enable_doc" != "xno" ; then
36 ++AS_IF([test "x$enable_doc" != "xno"],[
37 GNOME_DOC_INIT
38 -+else
39 ++],[
40 +# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
41 +GNOME_DOC_INIT(,,[:])
42 -+fi
43 ++])
44 GNOME_COMPILE_WARNINGS
45
46 ##############################
47 +@@ -271,2 +281,7 @@
48 +- GObject Introspection: $enable_introspection
49 +-])
50 ++ GObject Introspection: $enable_introspection
51 ++])
52 ++
53 ++AM_COND_IF([HAVE_GNOME_DOC_UTILS],
54 ++ [AC_MSG_NOTICE([ Documentation: yes])],
55 ++ [AC_MSG_NOTICE([ Documentation: no])]
56 ++)
57 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
58 +++ Makefile.am 2010-09-20 23:27:12.557785756 +0200
59 @@ -1,2 +1,6 @@
60
61 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
62 index 90272e3..2c5b259 100644
63 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
64 +++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
65 @@ -4,17 +4,31 @@
66
67 +AC_ARG_ENABLE([gtk],
68 + AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
69 -+ [enable_gtk=$enableval], enable_gtk=auto)
70 ++ [enable_gtk=$enableval], [enable_gtk=auto])
71 +AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
72 +
73 -+if test "x$enable_gtk" != "xno" ; then
74 ++AS_IF([test "x$enable_gtk" != "xno"],[
75 GDK_PIXBUF_REQUIRED_VERSION=2.12
76
77 -@@ -75,3 +66,4 @@
78 +@@ -74,4 +80,7 @@
79 +- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
80 ++ dbus-glib-1 >= $DBUS_REQUIRED_VERSION,
81 ++ [have_gtk=yes]
82 ++)
83 AC_SUBST(LIBINDICATEGTK_CFLAGS)
84 AC_SUBST(LIBINDICATEGTK_LIBS)
85 -+fi
86 ++])
87
88 +@@ -271,2 +280,7 @@
89 +- GObject Introspection: $enable_introspection
90 +-])
91 ++ GObject Introspection: $enable_introspection
92 ++])
93 ++
94 ++AS_IF([test "x$have_gtk" = "xyes"],
95 ++ [AC_MSG_NOTICE([ Gtk: yes])],
96 ++ [AC_MSG_NOTICE([ Gtk: no])]
97 ++)
98 --- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
99 +++ Makefile.am 2010-09-20 23:17:35.141406450 +0200
100 @@ -1,5 +1,9 @@
101
102 diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
103 index 357c6e3..c08f982 100644
104 --- a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
105 +++ b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
106 @@ -1,6 +1,6 @@
107 --- configure.ac.orig 2011-01-29 21:38:44.667942630 +0100
108 +++ configure.ac 2011-01-29 21:42:03.892863493 +0100
109 -@@ -153,13 +153,14 @@
110 +@@ -153,15 +153,16 @@
111 -AM_PATH_PYTHON(2.3.5)
112 -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
113 -
114 @@ -9,13 +9,16 @@
115 PYGOBJECT_REQUIRED=0.22
116
117 -PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
118 -- pygobject-2.0 >= $PYGOBJECT_REQUIRED])
119 -+AM_PATH_PYTHON($PYTHON_REQUIRED)
120 +- pygobject-2.0 >= $PYGOBJECT_REQUIRED],
121 +- [have_python=yes]
122 ++AM_PATH_PYTHON([$PYTHON_REQUIRED])
123 +AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
124 +
125 -+PKG_CHECK_MODULES(INDICATE_PYTHON, python-$PYTHON_VERSION >= $PYTHON_REQUIRED
126 -+ pygtk-2.0 >= $PYGTK_REQUIRED
127 -+ pygobject-2.0 >= $PYGOBJECT_REQUIRED)
128 ++PKG_CHECK_MODULES([INDICATE_PYTHON], [python-$PYTHON_VERSION >= $PYTHON_REQUIRED
129 ++ pygtk-2.0 >= $PYGTK_REQUIRED
130 ++ pygobject-2.0 >= $PYGOBJECT_REQUIRED],
131 ++ [have_python=yes]
132 + )
133
134 -INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
135 # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
136
137 diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
138 index 323224a..d663389 100644
139 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
140 +++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
141 @@ -6,10 +6,10 @@
142
143 +AC_ARG_ENABLE([mono],
144 + AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
145 -+ [enable_mono=$enableval], enable_mono=auto)
146 ++ [enable_mono=$enableval], [enable_mono=auto])
147 +AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
148 +
149 -+if test "x$enable_mono" != "xno" ; then
150 ++AS_IF([test "x$enable_mono" != "xno"],[
151 MONO_REQUIRED_VERSION=1.0
152 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
153
154 @@ -17,10 +17,20 @@
155 AC_SUBST(GAPI_CODEGEN)
156 AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
157 AC_SUBST(GAPI_FIXUP)
158 -+fi
159 ++])
160
161 ###########################
162 # Check for Python support
163 +@@ -273,2 +280,7 @@
164 +- GObject Introspection: $enable_introspection
165 +-])
166 ++ GObject Introspection: $enable_introspection
167 ++])
168 ++
169 ++AS_IF([test "x$has_mono" = "xtrue"],
170 ++ [AC_MSG_NOTICE([ Mono bindings: yes])],
171 ++ [AC_MSG_NOTICE([ Mono bindings: no])]
172 ++)
173 --- bindings/Makefile.am.orig 2011-01-29 21:10:05.095991987 +0100
174 +++ bindings/Makefile.am 2011-01-29 21:11:06.349142195 +0100
175 @@ -1,2 +1,6 @@
176
177 diff --git a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
178 index cb058bc..43d42fb 100644
179 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
180 +++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
181 @@ -1,28 +1,44 @@
182 --- configure.ac.orig 2011-01-29 21:51:17.724952231 +0100
183 +++ configure.ac 2011-01-29 21:52:29.969745013 +0100
184 -@@ -153,4 +153,14 @@
185 +@@ -146,4 +146,14 @@
186 # Check for Python support
187 ###########################
188
189 +AC_ARG_ENABLE([python],
190 + AC_HELP_STRING([--disable-python], [Disable Python bindings generation]),
191 -+ [enable_python=$enableval], enable_python=auto)
192 ++ [enable_python=$enableval], [enable_python=auto])
193 +AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"])
194 +
195 -+if test "x$enable_python" != "xno" ; then
196 -+if test "x$enable_gtk" = "xno" ; then
197 -+ AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
198 -+fi
199 ++AS_IF([test "x$enable_python" != "xno"],[
200 ++ AS_IF([test "x$have_gtk" != "xyes"],[
201 ++ AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
202 ++ ])
203 +
204 AM_PATH_PYTHON(2.3.5)
205 -@@ -179,6 +185,7 @@
206 +@@ -156,2 +166,4 @@
207 +- pygobject-2.0 >= $PYGOBJECT_REQUIRED])
208 ++ pygobject-2.0 >= $PYGOBJECT_REQUIRED],
209 ++ [have_python=yes]
210 ++)
211 +
212 +@@ -171,6 +183,7 @@
213 PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
214 AC_SUBST(PYGTK_CODEGEN)
215 AC_MSG_RESULT($PYGTK_CODEGEN)
216 -+fi
217 ++])
218
219 ###########################
220 # GTK Doc
221 +@@ -271,2 +284,7 @@
222 +- GObject Introspection: $enable_introspection
223 +-])
224 ++ GObject Introspection: $enable_introspection
225 ++])
226 ++
227 ++AS_IF([test "x$have_python" = "xyes"],
228 ++ [AC_MSG_NOTICE([ Python bindings: yes])],
229 ++ [AC_MSG_NOTICE([ Python bindings: no])]
230 ++)
231 --- bindings/Makefile.am.orig 2011-01-29 21:53:17.826282713 +0100
232 +++ bindings/Makefile.am 2011-01-29 21:53:52.951209371 +0100
233 @@ -1,2 +1,6 @@
234
235 diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
236 similarity index 100%
237 rename from dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
238 rename to dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
239
240 diff --git a/dev-libs/libindicate/libindicate-0.4.91.ebuild b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
241 similarity index 100%
242 rename from dev-libs/libindicate/libindicate-0.4.91.ebuild
243 rename to dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
Report Message
Find on MARC Find on Google Groups