Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/
Date: Fri, 23 Dec 2011 16:26:29
Message-Id: fdb18f6226c7e32c3e4f33dedc652053e49114e0.johu@gentoo
1 commit: fdb18f6226c7e32c3e4f33dedc652053e49114e0
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 23 16:24:09 2011 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 23 16:25:39 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fdb18f62
7
8 [dev-libs/libindicate] Removed newer version in tree
9
10 (Portage version: 2.2.0_alpha81/git/Linux x86_64, unsigned Manifest commit)
11
12 ---
13 .../files/libindicate-0.4.4-fix-aclocal.patch | 7 --
14 .../libindicate-0.4.4-fix-introspection.patch | 97 -------------------
15 ...libindicate-0.4.4-fix-out-of-source-build.patch | 51 ----------
16 .../libindicate-0.4.4-mono-parallel-make.patch | 12 ---
17 .../files/libindicate-0.4.4-optional-doc.patch | 45 ---------
18 .../libindicate-0.4.4-optional-examples.patch | 11 --
19 .../files/libindicate-0.4.4-optional-gtk.patch | 44 ---------
20 .../libindicate-0.4.4-optional-mono-example.patch | 8 --
21 .../libindicate-0.4.91-fix-python-version.patch | 26 -----
22 .../files/libindicate-0.4.91-optional-mono.patch | 43 --------
23 .../files/libindicate-0.4.91-optional-python.patch | 51 ----------
24 dev-libs/libindicate/libindicate-0.4.91-r2.ebuild | 101 --------------------
25 dev-libs/libindicate/metadata.xml | 12 ---
26 13 files changed, 0 insertions(+), 508 deletions(-)
27
28 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
29 deleted file mode 100644
30 index d7184a3..0000000
31 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch
32 +++ /dev/null
33 @@ -1,7 +0,0 @@
34 ---- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
35 -+++ Makefile.am 2010-09-20 23:12:20.591583239 +0200
36 -@@ -1,3 +1,4 @@
37 -+ACLOCAL_AMFLAGS = -I m4
38 -
39 - SUBDIRS = \
40 - libindicate \
41
42 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
43 deleted file mode 100644
44 index e3f1751..0000000
45 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch
46 +++ /dev/null
47 @@ -1,97 +0,0 @@
48 ---- /dev/null 1970-01-01 01:00:00.000000000 +0100
49 -+++ m4//introspection.m4 2010-09-20 23:33:07.134254070 +0200
50 -@@ -0,0 +1,94 @@
51 -+dnl -*- mode: autoconf -*-
52 -+dnl Copyright 2009 Johan Dahlin
53 -+dnl
54 -+dnl This file is free software; the author(s) gives unlimited
55 -+dnl permission to copy and/or distribute it, with or without
56 -+dnl modifications, as long as this notice is preserved.
57 -+dnl
58 -+
59 -+# serial 1
60 -+
61 -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
62 -+[
63 -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
64 -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
65 -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
66 -+
67 -+ dnl enable/disable introspection
68 -+ m4_if([$2], [require],
69 -+ [dnl
70 -+ enable_introspection=yes
71 -+ ],[dnl
72 -+ AC_ARG_ENABLE(introspection,
73 -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
74 -+ [Enable introspection for this build]),,
75 -+ [enable_introspection=auto])
76 -+ ])dnl
77 -+
78 -+ AC_MSG_CHECKING([for gobject-introspection])
79 -+
80 -+ dnl presence/version checking
81 -+ AS_CASE([$enable_introspection],
82 -+ [no], [dnl
83 -+ found_introspection="no (disabled, use --enable-introspection to enable)"
84 -+ ],dnl
85 -+ [yes],[dnl
86 -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
87 -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
88 -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
89 -+ found_introspection=yes,
90 -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
91 -+ ],dnl
92 -+ [auto],[dnl
93 -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
94 -+ ],dnl
95 -+ [dnl
96 -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
97 -+ ])dnl
98 -+
99 -+ AC_MSG_RESULT([$found_introspection])
100 -+
101 -+ INTROSPECTION_SCANNER=
102 -+ INTROSPECTION_COMPILER=
103 -+ INTROSPECTION_GENERATE=
104 -+ INTROSPECTION_GIRDIR=
105 -+ INTROSPECTION_TYPELIBDIR=
106 -+ if test "x$found_introspection" = "xyes"; then
107 -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
108 -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
109 -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
110 -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
111 -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
112 -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
113 -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
114 -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
115 -+ fi
116 -+ AC_SUBST(INTROSPECTION_SCANNER)
117 -+ AC_SUBST(INTROSPECTION_COMPILER)
118 -+ AC_SUBST(INTROSPECTION_GENERATE)
119 -+ AC_SUBST(INTROSPECTION_GIRDIR)
120 -+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
121 -+ AC_SUBST(INTROSPECTION_CFLAGS)
122 -+ AC_SUBST(INTROSPECTION_LIBS)
123 -+ AC_SUBST(INTROSPECTION_MAKEFILE)
124 -+
125 -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
126 -+])
127 -+
128 -+
129 -+dnl Usage:
130 -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
131 -+
132 -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
133 -+[
134 -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
135 -+])
136 -+
137 -+dnl Usage:
138 -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
139 -+
140 -+
141 -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
142 -+[
143 -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
144 -+])
145
146 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
147 deleted file mode 100644
148 index a87440e..0000000
149 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch
150 +++ /dev/null
151 @@ -1,51 +0,0 @@
152 ---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
153 -+++ examples/Makefile.am 2010-09-20 23:43:31.231899979 +0200
154 -@@ -18,7 +18,7 @@
155 - $(LIBINDICATE_CFLAGS)
156 -
157 - indicate_and_crash_LDADD = \
158 -- ../libindicate/libindicate.la \
159 -+ $(top_srcdir)/libindicate/libindicate.la \
160 - $(LIBINDICATE_LIBS)
161 -
162 - indicate_alot_SOURCES = \
163 -@@ -30,7 +30,7 @@
164 - $(LIBINDICATE_CFLAGS)
165 -
166 - indicate_alot_LDADD = \
167 -- ../libindicate/libindicate.la \
168 -+ $(top_srcdir)/libindicate/libindicate.la \
169 - $(LIBINDICATE_LIBS)
170 -
171 - listen_and_print_SOURCES = \
172 -@@ -43,8 +43,8 @@
173 - $(LIBINDICATEGTK_CFLAGS)
174 -
175 - listen_and_print_LDADD = \
176 -- ../libindicate/libindicate.la \
177 -- ../libindicate-gtk/libindicate-gtk.la \
178 -+ $(top_srcdir)/libindicate/libindicate.la \
179 -+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
180 - $(LIBINDICATE_LIBS) \
181 - $(LIBINDICATEGTK_LIBS)
182 -
183 -@@ -58,8 +58,8 @@
184 - $(LIBINDICATEGTK_CFLAGS)
185 -
186 - im_client_LDADD = \
187 -- ../libindicate/libindicate.la \
188 -- ../libindicate-gtk/libindicate-gtk.la \
189 -+ $(top_srcdir)/libindicate/libindicate.la \
190 -+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \
191 - $(LIBINDICATE_LIBS) \
192 - $(LIBINDICATEGTK_LIBS)
193 -
194 -@@ -72,7 +72,7 @@
195 - $(LIBINDICATE_CFLAGS)
196 -
197 - show_hide_server_LDADD = \
198 -- ../libindicate/libindicate.la \
199 -+ $(top_srcdir)/libindicate/libindicate.la \
200 - $(LIBINDICATE_LIBS)
201 -
202 - python_examples = \
203
204 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch b/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
205 deleted file mode 100644
206 index 1554b4c..0000000
207 --- a/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
208 +++ /dev/null
209 @@ -1,12 +0,0 @@
210 ---- bindings/mono/indicate/Makefile.am.orig 2011-01-30 00:14:17.670042664 +0100
211 -+++ bindings/mono/indicate/Makefile.am 2011-01-30 00:14:40.204346425 +0100
212 -@@ -61,7 +61,8 @@
213 - -e "s|PROP_MENU|menu|" \
214 - -e "s|PROP_DESKTOP|Desktop|" \
215 - -e "s|PROP_DESKTOP|desktop|" \
216 -- $< > $@
217 -+ $< > $@.tmp
218 -+ mv $@.tmp $@
219 -
220 - api_includes = $(GTK_SHARP_CFLAGS)
221 -
222
223 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
224 deleted file mode 100644
225 index 13c09f9..0000000
226 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
227 +++ /dev/null
228 @@ -1,45 +0,0 @@
229 ---- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
230 -+++ configure.ac 2010-09-20 23:26:30.159014141 +0200
231 -@@ -171,8 +171,18 @@
232 - # GTK Doc
233 - ###########################
234 -
235 -+AC_ARG_ENABLE([doc],
236 -+ AC_HELP_STRING([--disable-doc], [Disable doc generation]),
237 -+ [enable_doc=$enableval], [enable_doc=auto])
238 -+AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
239 -+
240 - GTK_DOC_CHECK([1.4])
241 -+AS_IF([test "x$enable_doc" != "xno"],[
242 - GNOME_DOC_INIT
243 -+],[
244 -+# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
245 -+GNOME_DOC_INIT(,,[:])
246 -+])
247 - GNOME_COMPILE_WARNINGS
248 -
249 - ##############################
250 -@@ -271,2 +281,7 @@
251 -- GObject Introspection: $enable_introspection
252 --])
253 -+ GObject Introspection: $enable_introspection
254 -+])
255 -+
256 -+AM_COND_IF([HAVE_GNOME_DOC_UTILS],
257 -+ [AC_MSG_NOTICE([ Documentation: yes])],
258 -+ [AC_MSG_NOTICE([ Documentation: no])]
259 -+)
260 ---- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
261 -+++ Makefile.am 2010-09-20 23:27:12.557785756 +0200
262 -@@ -1,2 +1,6 @@
263 -
264 -+if WANT_DOC
265 -+DOC_SUBDIR = docs
266 -+endif
267 -+
268 - SUBDIRS = \
269 -@@ -8,3 +12,3 @@
270 - tests \
271 -- docs
272 -+ $(DOC_SUBDIR)
273 -
274
275 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
276 deleted file mode 100644
277 index 8e2e036..0000000
278 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch
279 +++ /dev/null
280 @@ -1,11 +0,0 @@
281 ---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
282 -+++ examples/Makefile.am 2010-09-20 23:57:17.405792954 +0200
283 -@@ -2,7 +2,7 @@
284 - CSFILES = IndicatorMonoExample.cs
285 - CLEANFILES = $(ASSEMBLY)
286 -
287 --libexec_PROGRAMS = \
288 -+EXTRA_PROGRAMS = \
289 - indicate-and-crash \
290 - indicate-alot \
291 - listen-and-print \
292
293 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
294 deleted file mode 100644
295 index 2c5b259..0000000
296 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
297 +++ /dev/null
298 @@ -1,44 +0,0 @@
299 ---- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200
300 -+++ configure.ac 2010-09-20 23:17:50.380918143 +0200
301 -@@ -66,3 +66,9 @@
302 -
303 -+AC_ARG_ENABLE([gtk],
304 -+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
305 -+ [enable_gtk=$enableval], [enable_gtk=auto])
306 -+AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
307 -+
308 -+AS_IF([test "x$enable_gtk" != "xno"],[
309 - GDK_PIXBUF_REQUIRED_VERSION=2.12
310 -
311 -@@ -74,4 +80,7 @@
312 -- dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
313 -+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION,
314 -+ [have_gtk=yes]
315 -+)
316 - AC_SUBST(LIBINDICATEGTK_CFLAGS)
317 - AC_SUBST(LIBINDICATEGTK_LIBS)
318 -+])
319 -
320 -@@ -271,2 +280,7 @@
321 -- GObject Introspection: $enable_introspection
322 --])
323 -+ GObject Introspection: $enable_introspection
324 -+])
325 -+
326 -+AS_IF([test "x$have_gtk" = "xyes"],
327 -+ [AC_MSG_NOTICE([ Gtk: yes])],
328 -+ [AC_MSG_NOTICE([ Gtk: no])]
329 -+)
330 ---- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200
331 -+++ Makefile.am 2010-09-20 23:17:35.141406450 +0200
332 -@@ -1,5 +1,9 @@
333 -
334 -+if WANT_LIBINDICATEGTK
335 -+LIBINDICATEGTK_SUBDIR = libindicate-gtk
336 -+endif
337 -+
338 - SUBDIRS = \
339 - libindicate \
340 -- libindicate-gtk \
341 -+ $(LIBINDICATEGTK_SUBDIR) \
342 - bindings \
343
344 diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch b/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
345 deleted file mode 100644
346 index 97cb78c..0000000
347 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch
348 +++ /dev/null
349 @@ -1,8 +0,0 @@
350 ---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200
351 -+++ examples/Makefile.am 2010-09-20 23:44:49.173431396 +0200
352 -@@ -97,5 +97,3 @@
353 - $(ASSEMBLY): $(CSFILES) Makefile.am
354 - $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES)
355 - chmod a+x indicator-mono-example
356 --
357 --all: $(ASSEMBLY)
358
359 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
360 deleted file mode 100644
361 index c08f982..0000000
362 --- a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
363 +++ /dev/null
364 @@ -1,26 +0,0 @@
365 ---- configure.ac.orig 2011-01-29 21:38:44.667942630 +0100
366 -+++ configure.ac 2011-01-29 21:42:03.892863493 +0100
367 -@@ -153,15 +153,16 @@
368 --AM_PATH_PYTHON(2.3.5)
369 --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
370 --
371 -+PYTHON_REQUIRED=2.3.5
372 - PYGTK_REQUIRED=2.14.0
373 - PYGOBJECT_REQUIRED=0.22
374 -
375 --PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
376 -- pygobject-2.0 >= $PYGOBJECT_REQUIRED],
377 -- [have_python=yes]
378 -+AM_PATH_PYTHON([$PYTHON_REQUIRED])
379 -+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
380 -+
381 -+PKG_CHECK_MODULES([INDICATE_PYTHON], [python-$PYTHON_VERSION >= $PYTHON_REQUIRED
382 -+ pygtk-2.0 >= $PYGTK_REQUIRED
383 -+ pygobject-2.0 >= $PYGOBJECT_REQUIRED],
384 -+ [have_python=yes]
385 - )
386 -
387 --INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs)
388 - # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately
389 - INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION"
390 -
391
392 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
393 deleted file mode 100644
394 index d663389..0000000
395 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
396 +++ /dev/null
397 @@ -1,43 +0,0 @@
398 ---- configure.ac.orig 2011-01-29 21:02:19.646030407 +0100
399 -+++ configure.ac 2011-01-29 21:12:00.156516831 +0100
400 -@@ -91,6 +91,12 @@
401 - # Check for Mono support
402 - ###########################
403 -
404 -+AC_ARG_ENABLE([mono],
405 -+ AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
406 -+ [enable_mono=$enableval], [enable_mono=auto])
407 -+AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
408 -+
409 -+AS_IF([test "x$enable_mono" != "xno"],[
410 - MONO_REQUIRED_VERSION=1.0
411 - PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
412 -
413 -@@ -141,6 +147,7 @@
414 - AC_SUBST(GAPI_CODEGEN)
415 - AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
416 - AC_SUBST(GAPI_FIXUP)
417 -+])
418 -
419 - ###########################
420 - # Check for Python support
421 -@@ -273,2 +280,7 @@
422 -- GObject Introspection: $enable_introspection
423 --])
424 -+ GObject Introspection: $enable_introspection
425 -+])
426 -+
427 -+AS_IF([test "x$has_mono" = "xtrue"],
428 -+ [AC_MSG_NOTICE([ Mono bindings: yes])],
429 -+ [AC_MSG_NOTICE([ Mono bindings: no])]
430 -+)
431 ---- bindings/Makefile.am.orig 2011-01-29 21:10:05.095991987 +0100
432 -+++ bindings/Makefile.am 2011-01-29 21:11:06.349142195 +0100
433 -@@ -1,2 +1,6 @@
434 -+if WANT_MONO
435 -+MONO_SUBDIR = mono
436 -+endif
437 -+
438 --SUBDIRS = mono python
439 -+SUBDIRS = $(MONO_SUBDIR) python
440 -
441
442 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
443 deleted file mode 100644
444 index 43d42fb..0000000
445 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
446 +++ /dev/null
447 @@ -1,51 +0,0 @@
448 ---- configure.ac.orig 2011-01-29 21:51:17.724952231 +0100
449 -+++ configure.ac 2011-01-29 21:52:29.969745013 +0100
450 -@@ -146,4 +146,14 @@
451 - # Check for Python support
452 - ###########################
453 -
454 -+AC_ARG_ENABLE([python],
455 -+ AC_HELP_STRING([--disable-python], [Disable Python bindings generation]),
456 -+ [enable_python=$enableval], [enable_python=auto])
457 -+AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"])
458 -+
459 -+AS_IF([test "x$enable_python" != "xno"],[
460 -+ AS_IF([test "x$have_gtk" != "xyes"],[
461 -+ AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
462 -+ ])
463 -+
464 - AM_PATH_PYTHON(2.3.5)
465 -@@ -156,2 +166,4 @@
466 -- pygobject-2.0 >= $PYGOBJECT_REQUIRED])
467 -+ pygobject-2.0 >= $PYGOBJECT_REQUIRED],
468 -+ [have_python=yes]
469 -+)
470 -
471 -@@ -171,6 +183,7 @@
472 - PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
473 - AC_SUBST(PYGTK_CODEGEN)
474 - AC_MSG_RESULT($PYGTK_CODEGEN)
475 -+])
476 -
477 - ###########################
478 - # GTK Doc
479 -@@ -271,2 +284,7 @@
480 -- GObject Introspection: $enable_introspection
481 --])
482 -+ GObject Introspection: $enable_introspection
483 -+])
484 -+
485 -+AS_IF([test "x$have_python" = "xyes"],
486 -+ [AC_MSG_NOTICE([ Python bindings: yes])],
487 -+ [AC_MSG_NOTICE([ Python bindings: no])]
488 -+)
489 ---- bindings/Makefile.am.orig 2011-01-29 21:53:17.826282713 +0100
490 -+++ bindings/Makefile.am 2011-01-29 21:53:52.951209371 +0100
491 -@@ -1,2 +1,6 @@
492 -+if WANT_PYTHON
493 -+PYTHON_SUBDIR = python
494 -+endif
495 -+
496 --SUBDIRS = mono python
497 -+SUBDIRS = mono $(PYTHON_SUBDIR)
498 -
499
500 diff --git a/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
501 deleted file mode 100644
502 index 7315c30..0000000
503 --- a/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
504 +++ /dev/null
505 @@ -1,101 +0,0 @@
506 -# Copyright 1999-2011 Gentoo Foundation
507 -# Distributed under the terms of the GNU General Public License v2
508 -# $Header: $
509 -
510 -EAPI=4
511 -
512 -inherit autotools eutils versionator
513 -
514 -MY_MAJOR_VERSION="$(get_version_component_range 1-2)"
515 -if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then
516 - MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))"
517 -fi
518 -
519 -BROKEN_MONO="0.4.91"
520 -
521 -DESCRIPTION="Library to raise flags on DBus for other components of the desktop to pick up and visualize"
522 -HOMEPAGE="https://launchpad.net/libindicate/"
523 -SRC_URI="http://launchpad.net/${PN}/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
524 -
525 -LICENSE="LGPL-3"
526 -SLOT="0"
527 -KEYWORDS="~amd64 ~x86"
528 -IUSE="doc gtk +introspection mono python"
529 -
530 -RESTRICT="test"
531 -
532 -# For the dependency on dev-libs/libdbusmenu see launchpad-bug #552667
533 -RDEPEND="dev-libs/glib:2[introspection=]
534 - dev-libs/dbus-glib
535 - >=dev-libs/libdbusmenu-0.3.90[introspection=]
536 - dev-libs/libxml2:2
537 - x11-libs/gtk+:2
538 - python? ( dev-python/pygtk )
539 - mono? (
540 - dev-dotnet/gtk-sharp
541 - dev-dotnet/gtk-sharp-gapi
542 - )"
543 -DEPEND="${RDEPEND}
544 - doc? ( dev-util/gtk-doc )
545 - introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
546 - dev-util/gtk-doc-am
547 - dev-util/pkgconfig"
548 -
549 -REQUIRED_USE="python? ( gtk )"
550 -DOCS=( AUTHORS )
551 -
552 -if has "${PV}" ${BROKEN_MONO}; then
553 - # Mono bindings are broken in this version, forbid
554 - REQUIRED_USE+=" !mono"
555 -fi
556 -
557 -src_prepare() {
558 - # Make python optional, launchpad-bug #643921
559 - epatch "${FILESDIR}/${P}-optional-python.patch"
560 - # Restore SUBDIRS to make optional-mono apply
561 - sed -i bindings/Makefile.am \
562 - -e 's/^SUBDIRS =.*/SUBDIRS = mono python/'
563 - # Make mono optional, launchpad-bug #643922
564 - epatch "${FILESDIR}/${P}-optional-mono.patch"
565 - # Make SUBDIRS empty, after applying optional-python and optional-mono
566 - sed -i bindings/Makefile.am \
567 - -e 's/^SUBDIRS =.*/SUBDIRS = $(MONO_SUBDIR) $(PYTHON_SUBDIR)/'
568 - # Make gtk optional, launchpad-bug #431311
569 - epatch "${FILESDIR}/${PN}-0.4.4-optional-gtk.patch"
570 - # Make doc optional, launchpad-bug #643911
571 - epatch "${FILESDIR}/${PN}-0.4.4-optional-doc.patch"
572 - # Do not compile mono-example by default, launchpad-bug #643912
573 - epatch "${FILESDIR}/${PN}-0.4.4-optional-mono-example.patch"
574 - # Do not compile examples by default, launchpad-bug #643917
575 - epatch "${FILESDIR}/${PN}-0.4.4-optional-examples.patch"
576 - # Fix trouble with autoreconf and m4 directory, launchpad-bug #683552
577 - epatch "${FILESDIR}/${PN}-0.4.4-fix-aclocal.patch"
578 - # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537
579 - epatch "${FILESDIR}/${PN}-0.4.4-fix-introspection.patch"
580 - # Fix out-of-source builds, launchpad-bug #643913
581 - epatch "${FILESDIR}/${PN}-0.4.4-fix-out-of-source-build.patch"
582 - # Fix python version detection, launchpad-bug #594992
583 - epatch "${FILESDIR}/${P}-fix-python-version.patch"
584 - # Fix parallel-make for mono bindings, launchpad-bug #709954
585 - epatch "${FILESDIR}/${PN}-0.4.4-mono-parallel-make.patch"
586 - # Drop -Werror in a release
587 - sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed"
588 - eautoreconf
589 -}
590 -
591 -src_configure() {
592 - # gobject-instrospection is a nightmare in this package, it's fixable for libindicate
593 - # and not for libindicate-gtk, disable it until its fixed on upstream
594 - econf \
595 - --disable-dependency-tracking \
596 - --docdir=/usr/share/doc/${PF} \
597 - $(use_enable doc) \
598 - $(use_enable introspection) \
599 - $(use_enable mono) \
600 - $(use_enable python) \
601 - ${conf}
602 -}
603 -
604 -src_test() {
605 - emake check
606 -}
607
608 diff --git a/dev-libs/libindicate/metadata.xml b/dev-libs/libindicate/metadata.xml
609 deleted file mode 100644
610 index 1e36385..0000000
611 --- a/dev-libs/libindicate/metadata.xml
612 +++ /dev/null
613 @@ -1,12 +0,0 @@
614 -<?xml version="1.0" encoding="UTF-8"?>
615 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
616 -<pkgmetadata>
617 - <herd>kde</herd>
618 - <maintainer>
619 - <email>mrpouet@g.o</email>
620 - <name>Romain Perier</name>
621 - </maintainer>
622 - <use>
623 - <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
624 - </use>
625 -</pkgmetadata>