From 8f3efe53f9493156ad0e8046d1dd17b07d47e5cf Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 19 Nov 2011 17:50:17 +0000 Subject: [PATCH] old Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64 --- dev-libs/libindicate-qt/ChangeLog | 6 +- .../libindicate-qt-0.2.5-r1.ebuild | 34 --- .../libindicate-qt-0.2.5.ebuild | 24 --- dev-libs/libindicate/ChangeLog | 23 ++- ...bindicate-0.2.3-optional-gtk-support.patch | 194 ------------------ ...dicate-0.4.4-as-needed-introspection.patch | 30 --- .../files/libindicate-0.4.4-fix-aclocal.patch | 7 - .../libindicate-0.4.4-fix-introspection.patch | 97 --------- ...dicate-0.4.4-fix-out-of-source-build.patch | 51 ----- ...libindicate-0.4.4-fix-python-version.patch | 11 - ...libindicate-0.4.4-mono-parallel-make.patch | 12 -- .../libindicate-0.4.4-optional-doc.patch | 42 ---- .../libindicate-0.4.4-optional-examples.patch | 11 - .../libindicate-0.4.4-optional-gtk.patch | 44 ---- ...indicate-0.4.4-optional-mono-example.patch | 8 - .../files/libindicate-0.4.4-parallel.patch | 30 --- ...ibindicate-0.4.91-fix-python-version.patch | 26 --- .../libindicate-0.4.91-optional-mono.patch | 43 ---- .../libindicate-0.4.91-optional-python.patch | 51 ----- .../libindicate/libindicate-0.2.3-r1.ebuild | 52 ----- .../libindicate/libindicate-0.4.4-r1.ebuild | 76 ------- .../libindicate/libindicate-0.4.4-r2.ebuild | 92 --------- dev-libs/libindicate/libindicate-0.4.4.ebuild | 74 ------- dev-libs/libindicator/ChangeLog | 7 +- .../libindicator-0.3.6-missing_template.patch | 63 ------ .../libindicator/libindicator-0.3.13.ebuild | 39 ---- .../libindicator/libindicator-0.3.22.ebuild | 43 ---- .../libindicator/libindicator-0.3.6.ebuild | 43 ---- 28 files changed, 33 insertions(+), 1200 deletions(-) delete mode 100644 dev-libs/libindicate-qt/libindicate-qt-0.2.5-r1.ebuild delete mode 100644 dev-libs/libindicate-qt/libindicate-qt-0.2.5.ebuild delete mode 100644 dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch delete mode 100644 dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch delete mode 100644 dev-libs/libindicate/libindicate-0.2.3-r1.ebuild delete mode 100644 dev-libs/libindicate/libindicate-0.4.4-r1.ebuild delete mode 100644 dev-libs/libindicate/libindicate-0.4.4-r2.ebuild delete mode 100644 dev-libs/libindicate/libindicate-0.4.4.ebuild delete mode 100644 dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch delete mode 100644 dev-libs/libindicator/libindicator-0.3.13.ebuild delete mode 100644 dev-libs/libindicator/libindicator-0.3.22.ebuild delete mode 100644 dev-libs/libindicator/libindicator-0.3.6.ebuild diff --git a/dev-libs/libindicate-qt/ChangeLog b/dev-libs/libindicate-qt/ChangeLog index 59488064cd1a..ef619ab0cc3f 100644 --- a/dev-libs/libindicate-qt/ChangeLog +++ b/dev-libs/libindicate-qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libindicate-qt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/ChangeLog,v 1.7 2011/11/19 17:48:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/ChangeLog,v 1.8 2011/11/19 17:48:49 ssuominen Exp $ + + 19 Nov 2011; Samuli Suominen + -libindicate-qt-0.2.5.ebuild, -libindicate-qt-0.2.5-r1.ebuild: + old *libindicate-qt-0.2.5.91 (19 Nov 2011) diff --git a/dev-libs/libindicate-qt/libindicate-qt-0.2.5-r1.ebuild b/dev-libs/libindicate-qt/libindicate-qt-0.2.5-r1.ebuild deleted file mode 100644 index ce7e41c5d33a..000000000000 --- a/dev-libs/libindicate-qt/libindicate-qt-0.2.5-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/libindicate-qt-0.2.5-r1.ebuild,v 1.2 2011/03/27 22:57:56 arfrever Exp $ - -EAPI=2 - -inherit virtualx cmake-utils - -DESCRIPTION="Qt wrapper for libindicate library" -HOMEPAGE="https://launchpad.net/libindicate-qt/" -SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - x11-libs/qt-gui:4 - >=dev-libs/libindicate-0.3.3 - + -libindicate-0.2.3-r1.ebuild, + -files/libindicate-0.2.3-optional-gtk-support.patch, + -libindicate-0.4.4.ebuild, -libindicate-0.4.4-r1.ebuild, + -libindicate-0.4.4-r2.ebuild, + -files/libindicate-0.4.4-as-needed-introspection.patch, + -files/libindicate-0.4.4-fix-aclocal.patch, + -files/libindicate-0.4.4-fix-introspection.patch, + -files/libindicate-0.4.4-fix-out-of-source-build.patch, + -files/libindicate-0.4.4-fix-python-version.patch, + -files/libindicate-0.4.4-mono-parallel-make.patch, + -files/libindicate-0.4.4-optional-doc.patch, + -files/libindicate-0.4.4-optional-examples.patch, + -files/libindicate-0.4.4-optional-gtk.patch, + -files/libindicate-0.4.4-optional-mono-example.patch, + -files/libindicate-0.4.4-parallel.patch, + -files/libindicate-0.4.91-fix-python-version.patch, + -files/libindicate-0.4.91-optional-mono.patch, + -files/libindicate-0.4.91-optional-python.patch: + old *libindicate-0.6.1-r200 (19 Nov 2011) diff --git a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch b/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch deleted file mode 100644 index ed04dc8cefb7..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.2.3-optional-gtk-support.patch +++ /dev/null @@ -1,194 +0,0 @@ -Date: Mon, 23 Nov 2009 23:14:01 +0100 -Subject: Make gtk support optional, Fix some QA - ---- - Makefile.am | 17 +++++++---- - configure.ac | 23 +++++++++++---- - examples/Makefile.am | 64 ++++++++++++++++++++++--------------------- - libindicate-gtk/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - 5 files changed, 63 insertions(+), 45 deletions(-) - ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,10 +1,15 @@ -+SUBDIRS = libindicate - --SUBDIRS = \ -- libindicate \ -- libindicate-gtk \ -- examples \ -- tests \ -- docs -+if HAVE_LIBINDICATEGTK -+SUBDIRS += libindicate-gtk -+endif -+ -+SUBDIRS += \ -+ examples \ -+ tests -+if INSTALL_DOC -+SUBDIRS += docs -+endif - - EXTRA_DIST = \ - COPYING.LGPL.2.1 \ ---- a/configure.ac -+++ b/configure.ac -@@ -63,11 +63,18 @@ AC_SUBST(LIBINDICATE_LIBS) - - GDK_PIXBUF_REQUIRED_VERSION=2.12 - --PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION -- gio-2.0 >= $GIO_REQUIRED_VERSION -- gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- dbus-glib-1 >= $DBUS_REQUIRED_VERSION) -+AC_ARG_ENABLE([gtk], -+ AC_HELP_STRING([--disable-gtk], [Disable libindicator-gtk library]), -+ [enable_gtk=$enableval], enable_gtk=auto) -+ -+if test "x$enable_gtk" != "xno"; then -+ PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION -+ gio-2.0 >= $GIO_REQUIRED_VERSION -+ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION -+ gtk+-2.0 >= $GTK_REQUIRED_VERSION -+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION) -+fi -+AM_CONDITIONAL([HAVE_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"]) - AC_SUBST(LIBINDICATEGTK_CFLAGS) - AC_SUBST(LIBINDICATEGTK_LIBS) - -@@ -103,8 +110,12 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes") - # GTK Doc - ########################### - -+AC_ARG_ENABLE([doc], -+ AC_HELP_STRING([--disable-doc], [Do not install API doc]), -+ [enable_doc=$enableval], [enable_doc=auto]) -+AM_CONDITIONAL([INSTALL_DOC], [test "x$enable_doc" != "xno"]) - GTK_DOC_CHECK([1.4]) --GNOME_DOC_INIT -+#GNOME_DOC_INIT - GNOME_COMPILE_WARNINGS - - ############################## ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,33 +1,12 @@ - --libexec_PROGRAMS = \ -+EXTRA_PROGRAMS = \ - indicate-and-crash \ - indicate-alot \ -- listen-and-print \ -- im-client \ - show-hide-server -- --indicate_and_crash_SOURCES = \ -- indicate-and-crash.c -- --indicate_and_crash_CFLAGS = \ -- -I $(srcdir)/.. \ -- $(LIBINDICATE_CFLAGS) -- --indicate_and_crash_LDADD = \ -- ../libindicate/libindicate.la \ -- $(LIBINDICATE_LIBS) -- --indicate_alot_SOURCES = \ -- indicate-alot.c -- --indicate_alot_CFLAGS = \ -- -I $(srcdir)/.. \ -- $(LIBINDICATE_CFLAGS) -- --indicate_alot_LDADD = \ -- ../libindicate/libindicate.la \ -- $(LIBINDICATE_LIBS) -- -+if HAVE_LIBINDICATEGTK -+EXTRA_PROGRAMS += \ -+ listen-and-print \ -+ im-client - listen_and_print_SOURCES = \ - listen-and-print.c - -@@ -37,8 +16,8 @@ listen_and_print_CFLAGS = \ - $(LIBINDICATEGTK_CFLAGS) - - listen_and_print_LDADD = \ -- ../libindicate/libindicate.la \ -- ../libindicate-gtk/libindicate-gtk.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ - $(LIBINDICATE_LIBS) \ - $(LIBINDICATEGTK_LIBS) - -@@ -51,10 +30,33 @@ im_client_CFLAGS = \ - $(LIBINDICATEGTK_CFLAGS) - - im_client_LDADD = \ -- ../libindicate/libindicate.la \ -- ../libindicate-gtk/libindicate-gtk.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ - $(LIBINDICATE_LIBS) \ - $(LIBINDICATEGTK_LIBS) -+endif -+ -+indicate_and_crash_SOURCES = \ -+ indicate-and-crash.c -+ -+indicate_and_crash_CFLAGS = \ -+ -I $(srcdir)/.. \ -+ $(LIBINDICATE_CFLAGS) -+ -+indicate_and_crash_LDADD = \ -+ $(top_srcdir)/libindicate/libindicate.la \ -+ $(LIBINDICATE_LIBS) -+ -+indicate_alot_SOURCES = \ -+ indicate-alot.c -+ -+indicate_alot_CFLAGS = \ -+ -I $(srcdir)/.. \ -+ $(LIBINDICATE_CFLAGS) -+ -+indicate_alot_LDADD = \ -+ $(top_srcdir)/libindicate/libindicate.la \ -+ $(LIBINDICATE_LIBS) - - show_hide_server_SOURCES = \ - show-hide-server.c -@@ -64,7 +66,7 @@ show_hide_server_CFLAGS = \ - $(LIBINDICATE_CFLAGS) - - show_hide_server_LDADD = \ -- ../libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ - $(LIBINDICATE_LIBS) - - examplesdir = $(docdir)/examples/ ---- a/libindicate-gtk/Makefile.am -+++ b/libindicate-gtk/Makefile.am -@@ -32,7 +32,7 @@ libindicate_gtk_la_CFLAGS = \ - $(LIBINDICATEGTK_CFLAGS) - - libindicate_gtk_la_LIBADD = \ -- ../libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ - $(LIBINDICATEGTK_LIBS) - - pkgconfig_DATA = indicate-gtk.pc ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -9,7 +9,7 @@ TESTS = \ - test_indicator_display \ - test_indicator_display_half - --libexec_PROGRAMS = \ -+check_PROGRAMS = \ - test-interests-client \ - test-interests-server \ - test-interests-server1 \ diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch deleted file mode 100644 index fda48a86f65c..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch +++ /dev/null @@ -1,30 +0,0 @@ - libindicate-gtk/Makefile.am | 2 +- - libindicate/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am -index 9e73402..4527996 100644 ---- a/libindicate-gtk/Makefile.am -+++ b/libindicate-gtk/Makefile.am -@@ -56,7 +56,7 @@ Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am - --include=GLib-2.0 \ - --include=GdkPixbuf-2.0 \ - --include=Indicate-0.2 \ -- --library=indicate-gtk \ -+ --library=libindicate-gtk.la \ - --add-include-path=$(top_builddir)/libindicate \ - $(LIBINDICATEGTK_CFLAGS) -I$(srcdir) -I$(top_srcdir) \ - --output Indicate-Gtk-0.2.gir $(irscanner_headers) \ -diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am -index 3703299..22cf1e2 100644 ---- a/libindicate/Makefile.am -+++ b/libindicate/Makefile.am -@@ -119,7 +119,7 @@ Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am - --include=GObject-2.0 \ - --include=GLib-2.0 \ - --include=Dbusmenu-Glib-0.2 \ -- --library=indicate \ -+ --library=libindicate.la \ - $(LIBINDICATE_CFLAGS) -I $(srcdir) -I $(top_srcdir) \ - --output Indicate-0.2.gir $(irscanner_headers) \ - $(addprefix --c-include=libindicate/, $(indicate_headers)) 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 deleted file mode 100644 index d7184a39ec3e..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-aclocal.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200 -+++ Makefile.am 2010-09-20 23:12:20.591583239 +0200 -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = \ - libindicate \ 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 deleted file mode 100644 index e3f17518f50a..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-introspection.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ m4//introspection.m4 2010-09-20 23:33:07.134254070 +0200 -@@ -0,0 +1,94 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+ dnl enable/disable introspection -+ m4_if([$2], [require], -+ [dnl -+ enable_introspection=yes -+ ],[dnl -+ AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+ ])dnl -+ -+ AC_MSG_CHECKING([for gobject-introspection]) -+ -+ dnl presence/version checking -+ AS_CASE([$enable_introspection], -+ [no], [dnl -+ found_introspection="no (disabled, use --enable-introspection to enable)" -+ ],dnl -+ [yes],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -+ ],dnl -+ [auto],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -+ ],dnl -+ [dnl -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -+ ])dnl -+ -+ AC_MSG_RESULT([$found_introspection]) -+ -+ INTROSPECTION_SCANNER= -+ INTROSPECTION_COMPILER= -+ INTROSPECTION_GENERATE= -+ INTROSPECTION_GIRDIR= -+ INTROSPECTION_TYPELIBDIR= -+ if test "x$found_introspection" = "xyes"; then -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ fi -+ AC_SUBST(INTROSPECTION_SCANNER) -+ AC_SUBST(INTROSPECTION_COMPILER) -+ AC_SUBST(INTROSPECTION_GENERATE) -+ AC_SUBST(INTROSPECTION_GIRDIR) -+ AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) -+ -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) 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 deleted file mode 100644 index a87440e605ba..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-out-of-source-build.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200 -+++ examples/Makefile.am 2010-09-20 23:43:31.231899979 +0200 -@@ -18,7 +18,7 @@ - $(LIBINDICATE_CFLAGS) - - indicate_and_crash_LDADD = \ -- ../libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ - $(LIBINDICATE_LIBS) - - indicate_alot_SOURCES = \ -@@ -30,7 +30,7 @@ - $(LIBINDICATE_CFLAGS) - - indicate_alot_LDADD = \ -- ../libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ - $(LIBINDICATE_LIBS) - - listen_and_print_SOURCES = \ -@@ -43,8 +43,8 @@ - $(LIBINDICATEGTK_CFLAGS) - - listen_and_print_LDADD = \ -- ../libindicate/libindicate.la \ -- ../libindicate-gtk/libindicate-gtk.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ - $(LIBINDICATE_LIBS) \ - $(LIBINDICATEGTK_LIBS) - -@@ -58,8 +58,8 @@ - $(LIBINDICATEGTK_CFLAGS) - - im_client_LDADD = \ -- ../libindicate/libindicate.la \ -- ../libindicate-gtk/libindicate-gtk.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate-gtk/libindicate-gtk.la \ - $(LIBINDICATE_LIBS) \ - $(LIBINDICATEGTK_LIBS) - -@@ -72,7 +72,7 @@ - $(LIBINDICATE_CFLAGS) - - show_hide_server_LDADD = \ -- ../libindicate/libindicate.la \ -+ $(top_srcdir)/libindicate/libindicate.la \ - $(LIBINDICATE_LIBS) - - python_examples = \ diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch deleted file mode 100644 index 198114b65647..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bindings/python/Makefile.am.orig 2010-12-01 11:02:01.089105608 +0100 -+++ bindings/python/Makefile.am 2010-12-01 11:02:32.619126150 +0100 -@@ -21,7 +21,7 @@ - indicatedir = $(pkgpyexecdir)/indicate - indicate_LTLIBRARIES = _indicate.la - --_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python2.6 -lpython2.6 -+_indicate_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_indicate -lpyglib-2.0-python@PYTHON_VERSION@ -lpython@PYTHON_VERSION@ - _indicate_la_LIBADD = $(INDICATE_PYTHON_LIBS) -L$(top_builddir)/libindicate/.libs/ -lindicate -L$(top_builddir)/libindicate-gtk/.libs -lindicate-gtk $(LIBINDICATEGTK_LIBS) - _indicate_la_SOURCES = indicatemodule.c - nodist__indicate_la_SOURCES = indicate.c 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 deleted file mode 100644 index 1554b4c14bb8..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- bindings/mono/indicate/Makefile.am.orig 2011-01-30 00:14:17.670042664 +0100 -+++ bindings/mono/indicate/Makefile.am 2011-01-30 00:14:40.204346425 +0100 -@@ -61,7 +61,8 @@ - -e "s|PROP_MENU|menu|" \ - -e "s|PROP_DESKTOP|Desktop|" \ - -e "s|PROP_DESKTOP|desktop|" \ -- $< > $@ -+ $< > $@.tmp -+ mv $@.tmp $@ - - api_includes = $(GTK_SHARP_CFLAGS) - 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 deleted file mode 100644 index 21bf198b328d..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ruN libindicate-0.4.4.orig/Makefile.am libindicate-0.4.4/Makefile.am ---- libindicate-0.4.4.orig/Makefile.am 2010-06-02 21:06:51.000000000 +0200 -+++ libindicate-0.4.4/Makefile.am 2011-04-13 01:06:13.763221971 +0200 -@@ -1,11 +1,15 @@ - -+if WANT_DOC -+DOC_SUBDIR = docs -+endif -+ - SUBDIRS = \ - libindicate \ - libindicate-gtk \ - bindings \ - examples \ - tests \ -- docs -+ $(DOC_SUBDIR) - - EXTRA_DIST = \ - COPYING.LGPL.2.1 \ -diff -ruN libindicate-0.4.4.orig/configure.ac libindicate-0.4.4/configure.ac ---- libindicate-0.4.4.orig/configure.ac 2010-09-15 18:24:09.000000000 +0200 -+++ libindicate-0.4.4/configure.ac 2011-04-13 01:07:01.744221988 +0200 -@@ -171,8 +171,18 @@ - # GTK Doc - ########################### - -+AC_ARG_ENABLE([doc], -+ AC_HELP_STRING([--disable-doc], [Disable doc generation]), -+ [enable_doc=$enableval], [enable_doc=auto]) -+AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"]) -+ - GTK_DOC_CHECK([1.4]) -+AS_IF([test "x$enable_doc" != "xno"],[ - GNOME_DOC_INIT -+],[ -+# The initialisation is still needed for certain conditionals to be defined, just make it not output any error -+GNOME_DOC_INIT(,,[:]) -+]) - GNOME_COMPILE_WARNINGS - - ############################## 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 deleted file mode 100644 index 8e2e03644040..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-examples.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200 -+++ examples/Makefile.am 2010-09-20 23:57:17.405792954 +0200 -@@ -2,7 +2,7 @@ - CSFILES = IndicatorMonoExample.cs - CLEANFILES = $(ASSEMBLY) - --libexec_PROGRAMS = \ -+EXTRA_PROGRAMS = \ - indicate-and-crash \ - indicate-alot \ - listen-and-print \ 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 deleted file mode 100644 index 2c5b2592a3b0..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- configure.ac.orig 2010-09-20 23:15:36.692289201 +0200 -+++ configure.ac 2010-09-20 23:17:50.380918143 +0200 -@@ -66,3 +66,9 @@ - -+AC_ARG_ENABLE([gtk], -+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]), -+ [enable_gtk=$enableval], [enable_gtk=auto]) -+AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"]) -+ -+AS_IF([test "x$enable_gtk" != "xno"],[ - GDK_PIXBUF_REQUIRED_VERSION=2.12 - -@@ -74,4 +80,7 @@ -- dbus-glib-1 >= $DBUS_REQUIRED_VERSION) -+ dbus-glib-1 >= $DBUS_REQUIRED_VERSION, -+ [have_gtk=yes] -+) - AC_SUBST(LIBINDICATEGTK_CFLAGS) - AC_SUBST(LIBINDICATEGTK_LIBS) -+]) - -@@ -271,2 +280,7 @@ -- GObject Introspection: $enable_introspection --]) -+ GObject Introspection: $enable_introspection -+]) -+ -+AS_IF([test "x$have_gtk" = "xyes"], -+ [AC_MSG_NOTICE([ Gtk: yes])], -+ [AC_MSG_NOTICE([ Gtk: no])] -+) ---- Makefile.am.orig 2010-09-20 23:12:10.442903362 +0200 -+++ Makefile.am 2010-09-20 23:17:35.141406450 +0200 -@@ -1,5 +1,9 @@ - -+if WANT_LIBINDICATEGTK -+LIBINDICATEGTK_SUBDIR = libindicate-gtk -+endif -+ - SUBDIRS = \ - libindicate \ -- libindicate-gtk \ -+ $(LIBINDICATEGTK_SUBDIR) \ - bindings \ 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 deleted file mode 100644 index 97cb78ce3c44..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-mono-example.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- examples/Makefile.am.orig 2010-09-20 23:42:07.380545155 +0200 -+++ examples/Makefile.am 2010-09-20 23:44:49.173431396 +0200 -@@ -97,5 +97,3 @@ - $(ASSEMBLY): $(CSFILES) Makefile.am - $(CSC) $(CSFLAGS) -out:$(ASSEMBLY) -target:exe $(references) $(srcdir)/$(CSFILES) - chmod a+x indicator-mono-example -- --all: $(ASSEMBLY) diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch b/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch deleted file mode 100644 index bf0828e5ac7b..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch +++ /dev/null @@ -1,30 +0,0 @@ - libindicate-gtk/Makefile.am | 2 +- - libindicate/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am -index 4527996..3fd9c5e 100644 ---- a/libindicate-gtk/Makefile.am -+++ b/libindicate-gtk/Makefile.am -@@ -47,7 +47,7 @@ BUILT_GIRSOURCES = - - irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_gtk_headers)) - --Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am -+Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate-gtk.la Makefile.am - $(INTROSPECTION_SCANNER) \ - -v --namespace Indicate \ - --nsversion=0.2 \ -diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am -index 22cf1e2..8712b4e 100644 ---- a/libindicate/Makefile.am -+++ b/libindicate/Makefile.am -@@ -111,7 +111,7 @@ BUILT_GIRSOURCES = - - irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers)) - --Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am -+Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate.la Makefile.am - $(INTROSPECTION_SCANNER) \ - -v --namespace Indicate \ - --nsversion=0.2 \ 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 deleted file mode 100644 index c08f982ac7a9..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.ac.orig 2011-01-29 21:38:44.667942630 +0100 -+++ configure.ac 2011-01-29 21:42:03.892863493 +0100 -@@ -153,15 +153,16 @@ --AM_PATH_PYTHON(2.3.5) --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -- -+PYTHON_REQUIRED=2.3.5 - PYGTK_REQUIRED=2.14.0 - PYGOBJECT_REQUIRED=0.22 - --PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED -- pygobject-2.0 >= $PYGOBJECT_REQUIRED], -- [have_python=yes] -+AM_PATH_PYTHON([$PYTHON_REQUIRED]) -+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+ -+PKG_CHECK_MODULES([INDICATE_PYTHON], [python-$PYTHON_VERSION >= $PYTHON_REQUIRED -+ pygtk-2.0 >= $PYGTK_REQUIRED -+ pygobject-2.0 >= $PYGOBJECT_REQUIRED], -+ [have_python=yes] - ) - --INDICATE_PYTHON_LIBS+=$(python$PYTHON_VERSION-config --libs) - # libpyglib-2.0-python* doesn't have a pkgconfig unfortunately - INDICATE_PYTHON_LIBS+=" -lpyglib-2.0-python$PYTHON_VERSION" - 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 deleted file mode 100644 index d663389db9bb..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.ac.orig 2011-01-29 21:02:19.646030407 +0100 -+++ configure.ac 2011-01-29 21:12:00.156516831 +0100 -@@ -91,6 +91,12 @@ - # Check for Mono support - ########################### - -+AC_ARG_ENABLE([mono], -+ AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]), -+ [enable_mono=$enableval], [enable_mono=auto]) -+AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"]) -+ -+AS_IF([test "x$enable_mono" != "xno"],[ - MONO_REQUIRED_VERSION=1.0 - PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) - -@@ -141,6 +147,7 @@ - AC_SUBST(GAPI_CODEGEN) - AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) - AC_SUBST(GAPI_FIXUP) -+]) - - ########################### - # Check for Python support -@@ -273,2 +280,7 @@ -- GObject Introspection: $enable_introspection --]) -+ GObject Introspection: $enable_introspection -+]) -+ -+AS_IF([test "x$has_mono" = "xtrue"], -+ [AC_MSG_NOTICE([ Mono bindings: yes])], -+ [AC_MSG_NOTICE([ Mono bindings: no])] -+) ---- bindings/Makefile.am.orig 2011-01-29 21:10:05.095991987 +0100 -+++ bindings/Makefile.am 2011-01-29 21:11:06.349142195 +0100 -@@ -1,2 +1,6 @@ -+if WANT_MONO -+MONO_SUBDIR = mono -+endif -+ --SUBDIRS = mono python -+SUBDIRS = $(MONO_SUBDIR) python - 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 deleted file mode 100644 index 43d42fbd22fb..000000000000 --- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- configure.ac.orig 2011-01-29 21:51:17.724952231 +0100 -+++ configure.ac 2011-01-29 21:52:29.969745013 +0100 -@@ -146,4 +146,14 @@ - # Check for Python support - ########################### - -+AC_ARG_ENABLE([python], -+ AC_HELP_STRING([--disable-python], [Disable Python bindings generation]), -+ [enable_python=$enableval], [enable_python=auto]) -+AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"]) -+ -+AS_IF([test "x$enable_python" != "xno"],[ -+ AS_IF([test "x$have_gtk" != "xyes"],[ -+ AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk]) -+ ]) -+ - AM_PATH_PYTHON(2.3.5) -@@ -156,2 +166,4 @@ -- pygobject-2.0 >= $PYGOBJECT_REQUIRED]) -+ pygobject-2.0 >= $PYGOBJECT_REQUIRED], -+ [have_python=yes] -+) - -@@ -171,6 +183,7 @@ - PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" - AC_SUBST(PYGTK_CODEGEN) - AC_MSG_RESULT($PYGTK_CODEGEN) -+]) - - ########################### - # GTK Doc -@@ -271,2 +284,7 @@ -- GObject Introspection: $enable_introspection --]) -+ GObject Introspection: $enable_introspection -+]) -+ -+AS_IF([test "x$have_python" = "xyes"], -+ [AC_MSG_NOTICE([ Python bindings: yes])], -+ [AC_MSG_NOTICE([ Python bindings: no])] -+) ---- bindings/Makefile.am.orig 2011-01-29 21:53:17.826282713 +0100 -+++ bindings/Makefile.am 2011-01-29 21:53:52.951209371 +0100 -@@ -1,2 +1,6 @@ -+if WANT_PYTHON -+PYTHON_SUBDIR = python -+endif -+ --SUBDIRS = mono python -+SUBDIRS = mono $(PYTHON_SUBDIR) - diff --git a/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild b/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild deleted file mode 100644 index 6654875b58c4..000000000000 --- a/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild,v 1.4 2011/08/28 17:36:11 jlec Exp $ - -EAPI=2 - -inherit autotools eutils versionator - -DESCRIPTION="Library to raise flags on DBus for other components of the desktop to pick up and visualize" -HOMEPAGE="https://launchpad.net/libindicate/" -SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="gtk doc" -# They put their mother in the tarball ? ^^ -RESTRICT="test" - -RDEPEND="dev-libs/glib:2 - >=dev-libs/dbus-glib-0.76 - dev-libs/libxml2:2 - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - dev-util/pkgconfig" - -src_prepare() { - # Make libindicator-gtk library optional - epatch "${FILESDIR}/${P}-optional-gtk-support.patch" - # Drop -Werror in a release - sed -e 's:-Werror::g' -i libindicate/Makefile.in || die "sed failed" - eautoreconf -} - -src_configure() { - local my_conf - - # gobject-instrospection is a nightmare in this package, it's fixable for libindicate - # and not for libindicate-gtk, disable it until its fixed on upstream - my_conf="--disable-dependency-tracking - --disable-gobject-introspection - --docdir=/usr/share/doc/${PF} - $(use_enable gtk) - $(use_enable doc)" - econf $my_conf -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS || die "dodoc failed" -} diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild deleted file mode 100644 index 75c3bfafb7b4..000000000000 --- a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild,v 1.3 2011/08/28 17:36:11 jlec Exp $ - -EAPI=2 - -inherit autotools eutils versionator - -DESCRIPTION="Library to raise flags on DBus for other components of the desktop to pick up and visualize" -HOMEPAGE="https://launchpad.net/libindicate/" -SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +introspection" - -RESTRICT="test" - -# For the dependency on dev-libs/libdbusmenu see launchpad-bug #552667 -RDEPEND="dev-libs/glib:2 - dev-libs/dbus-glib - dev-libs/libdbusmenu[introspection?] - dev-libs/libxml2:2 - x11-libs/gtk+:2 - dev-python/pygtk:2 - dev-dotnet/gtk-sharp - dev-dotnet/gtk-sharp-gapi - introspection? ( >=dev-libs/gobject-introspection-0.6.3 )" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - dev-util/gtk-doc-am - dev-util/pkgconfig" - -src_prepare() { - # Without patches: - # Make python optional, launchpad-bug #643921 - # Make mono optional, launchpad-bug #643922 - - # Incomplete patches: - # Make gtk optional, needs optional-python or code modifications, launchpad-bug #431311 - #epatch "${FILESDIR}/${P}-optional-gtk.patch" - - # Make doc optional, launchpad-bug #643911 - epatch "${FILESDIR}/${P}-optional-doc.patch" - # Do not compile mono-example by default, launchpad-bug #643912 - epatch "${FILESDIR}/${P}-optional-mono-example.patch" - # Do not compile examples by default, launchpad-bug #643917 - epatch "${FILESDIR}/${P}-optional-examples.patch" - # Fix trouble with autoreconf and m4 directory, launchpad-bug #683552 - epatch "${FILESDIR}/${P}-fix-aclocal.patch" - # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537 - epatch "${FILESDIR}/${P}-fix-introspection.patch" - # Fix out-of-source builds, launchpad-bug #643913 - epatch "${FILESDIR}/${P}-fix-out-of-source-build.patch" - # Fix compilation for python != 2.6, launchpad-bug #594992 - epatch "${FILESDIR}/${P}-fix-python-version.patch" - # Drop -Werror in a release - sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed" - eautoreconf -} - -src_configure() { - # gobject-instrospection is a nightmare in this package, it's fixable for libindicate - # and not for libindicate-gtk, disable it until its fixed on upstream - econf \ - --disable-dependency-tracking \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable doc) \ - $(use_enable introspection) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS || die "dodoc failed" -} diff --git a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild deleted file mode 100644 index 8fbf0f0c6e53..000000000000 --- a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.7 2011/11/04 23:04:20 dilfridge Exp $ - -EAPI=2 - -inherit autotools eutils versionator - -DESCRIPTION="Library to raise flags on DBus for other components of the desktop to pick up and visualize" -HOMEPAGE="https://launchpad.net/libindicate/" -SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc +introspection" - -RESTRICT="test" - -# For the dependency on dev-libs/libdbusmenu see launchpad-bug #552667 -RDEPEND="dev-libs/glib:2 - dev-libs/dbus-glib - =dev-libs/gobject-introspection-0.6.3 )" -DEPEND="${RDEPEND} - app-text/gnome-doc-utils - doc? ( dev-util/gtk-doc ) - dev-util/gtk-doc-am - dev-util/pkgconfig - introspection? ( dev-lang/vala:0.14[vapigen] ) -" - -src_prepare() { - # Without patches: - # Make python optional, launchpad-bug #643921 - # Make mono optional, launchpad-bug #643922 - - # Incomplete patches: - # Make gtk optional, needs optional-python or code modifications, launchpad-bug #431311 - #epatch "${FILESDIR}/${P}-optional-gtk.patch" - - # Make doc optional, launchpad-bug #643911 - epatch "${FILESDIR}/${P}-optional-doc.patch" - # Do not compile mono-example by default, launchpad-bug #643912 - epatch "${FILESDIR}/${P}-optional-mono-example.patch" - # Do not compile examples by default, launchpad-bug #643917 - epatch "${FILESDIR}/${P}-optional-examples.patch" - # Fix trouble with autoreconf and m4 directory, launchpad-bug #683552 - epatch "${FILESDIR}/${P}-fix-aclocal.patch" - # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537 - epatch "${FILESDIR}/${P}-fix-introspection.patch" - # Fix out-of-source builds, launchpad-bug #643913 - epatch "${FILESDIR}/${P}-fix-out-of-source-build.patch" - # Fix compilation for python != 2.6, launchpad-bug #594992 - epatch "${FILESDIR}/${P}-fix-python-version.patch" - # Fix parallel-make for mono bindings, launchpad-bug #709954 - epatch "${FILESDIR}/${P}-mono-parallel-make.patch" - # Fix for forced as-needed #379543 - epatch "${FILESDIR}/${P}-as-needed-introspection.patch" - # Fix for forced as-needed #354495 - epatch "${FILESDIR}/${P}-parallel.patch" - # Drop -Werror in a release - sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed" - # Find slotted vapigen - sed -e 's:vapigen:vapigen-0.14:g' -i configure.ac || die - eautoreconf -} - -src_configure() { - # gobject-instrospection is a nightmare in this package, it's fixable for libindicate - # and not for libindicate-gtk, disable it until its fixed on upstream - econf \ - --disable-dependency-tracking \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable doc) \ - $(use_enable introspection) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - # cleanup (bug 356015) - find "${D}" -name "*.la" -exec rm {} + - find "${D}" -name "_indicate.a" -exec rm {} + - - dodoc AUTHORS || die "dodoc failed" -} diff --git a/dev-libs/libindicate/libindicate-0.4.4.ebuild b/dev-libs/libindicate/libindicate-0.4.4.ebuild deleted file mode 100644 index 6b1d9302edb4..000000000000 --- a/dev-libs/libindicate/libindicate-0.4.4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.2 2011/08/28 17:36:11 jlec Exp $ - -EAPI=2 - -inherit autotools eutils versionator - -DESCRIPTION="Library to raise flags on DBus for other components of the desktop to pick up and visualize" -HOMEPAGE="https://launchpad.net/libindicate/" -SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RESTRICT="test" - -# For the dependency on dev-libs/libdbusmenu see launchpad-bug #552667 -RDEPEND="dev-libs/glib:2 - dev-libs/dbus-glib - dev-libs/libdbusmenu - dev-libs/libxml2:2 - x11-libs/gtk+:2 - dev-python/pygtk - dev-dotnet/gtk-sharp - dev-dotnet/gtk-sharp-gapi" -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) - dev-util/gtk-doc-am - dev-util/pkgconfig" - -src_prepare() { - # Without patches: - # Make python optional, launchpad-bug #643921 - # Make mono optional, launchpad-bug #643922 - - # Incomplete patches: - # Make gtk optional, needs optional-python or code modifications, launchpad-bug #431311 - #epatch "${FILESDIR}/${P}-optional-gtk.patch" - - # Make doc optional, launchpad-bug #643911 - epatch "${FILESDIR}/${P}-optional-doc.patch" - # Do not compile mono-example by default, launchpad-bug #643912 - epatch "${FILESDIR}/${P}-optional-mono-example.patch" - # Do not compile examples by default, launchpad-bug #643917 - epatch "${FILESDIR}/${P}-optional-examples.patch" - # Fix trouble with autoreconf and m4 directory, launchpad-bug #683552 - epatch "${FILESDIR}/${P}-fix-aclocal.patch" - # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537 - epatch "${FILESDIR}/${P}-fix-introspection.patch" - # Fix out-of-source builds, launchpad-bug #643913 - epatch "${FILESDIR}/${P}-fix-out-of-source-build.patch" - # Fix compilation for python != 2.6, launchpad-bug #594992 - epatch "${FILESDIR}/${P}-fix-python-version.patch" - # Drop -Werror in a release - sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed" - eautoreconf -} - -src_configure() { - # gobject-instrospection is a nightmare in this package, it's fixable for libindicate - # and not for libindicate-gtk, disable it until its fixed on upstream - econf \ - --disable-dependency-tracking \ - --docdir=/usr/share/doc/${PF} \ - $(use_enable doc) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS || die "dodoc failed" -} diff --git a/dev-libs/libindicator/ChangeLog b/dev-libs/libindicator/ChangeLog index b92e9e00ff82..2476310e000a 100644 --- a/dev-libs/libindicator/ChangeLog +++ b/dev-libs/libindicator/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libindicator # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.7 2011/11/19 14:13:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.8 2011/11/19 17:50:17 ssuominen Exp $ + + 19 Nov 2011; Samuli Suominen + -libindicator-0.3.6.ebuild, -files/libindicator-0.3.6-missing_template.patch, + -libindicator-0.3.13.ebuild, -libindicator-0.3.22.ebuild: + old *libindicator-0.4.1-r200 (19 Nov 2011) diff --git a/dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch b/dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch deleted file mode 100644 index 68e12a5e7018..000000000000 --- a/dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- /dev/null -+++ libindicator/indicator-object-enum-types.c.template -@@ -0,0 +1,30 @@ -+/*** BEGIN file-header ***/ -+#include "indicator-object-enum-types.h" -+/*** END file-header ***/ -+ -+/*** BEGIN file-production ***/ -+/* enumerations from "@filename@" */ -+#include "@filename@" -+/*** END file-production ***/ -+ -+/*** BEGIN value-header ***/ -+GType -+@enum_name@_get_type (void) { -+ static GType enum_type_id = 0; -+ if (G_UNLIKELY (!enum_type_id)) -+ { -+ static const G@Type@Value values[] = { -+/*** END value-header ***/ -+ -+/*** BEGIN value-production ***/ -+ { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, -+/*** END value-production ***/ -+ -+/*** BEGIN value-tail ***/ -+ { 0, NULL, NULL } -+ }; -+ enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); -+ } -+ return enum_type_id; -+} -+/*** END value-tail ***/ ---- /dev/null -+++ libindicator/indicator-object-enum-types.h.template -@@ -0,0 +1,27 @@ -+/*** BEGIN file-header ***/ -+ -+#ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__ -+#define __INDICATOR_OBJECT_ENUM_TYPES_H__ -+ -+#include -+ -+G_BEGIN_DECLS -+ -+/*** END file-header ***/ -+ -+/*** BEGIN file-production ***/ -+/* enumerations from "@filename@" */ -+/*** END file-production ***/ -+ -+/*** BEGIN file-tail ***/ -+G_END_DECLS -+ -+#endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */ -+/*** END file-tail ***/ -+ -+/*** BEGIN value-header ***/ -+ -+GType @enum_name@_get_type (void) G_GNUC_CONST; -+#define INDICATOR_OBJECT_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) -+ -+/*** END value-header ***/ diff --git a/dev-libs/libindicator/libindicator-0.3.13.ebuild b/dev-libs/libindicator/libindicator-0.3.13.ebuild deleted file mode 100644 index 18f6f939de3a..000000000000 --- a/dev-libs/libindicator/libindicator-0.3.13.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-0.3.13.ebuild,v 1.1 2010/09/18 18:53:14 eva Exp $ - -EAPI=2 - -inherit autotools base eutils - -DESCRIPTION="A set of symbols and convience functions that all indicators would like to use" -HOMEPAGE="http://launchpad.net/libindicator/" -SRC_URI="http://launchpad.net/${PN}/0.3/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.18:2 - >=dev-libs/glib-2.22:2 - >=dev-libs/dbus-glib-0.76 - !