public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/
@ 2011-02-05 21:42 Dennis Schridde
  0 siblings, 0 replies; 4+ messages in thread
From: Dennis Schridde @ 2011-02-05 21:42 UTC (permalink / raw
  To: gentoo-commits

commit:     2579ba6fc74c17d300b74db72182b027efdabcc8
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sat Feb  5 21:41:15 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sat Feb  5 21:41:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2579ba6f

[dev-libs/libindicate] Improve patches based on upstream request, revbump

(Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E)

---
 .../files/libindicate-0.4.4-optional-doc.patch     |   18 ++++++++--
 .../files/libindicate-0.4.4-optional-gtk.patch     |   22 +++++++++++--
 .../libindicate-0.4.91-fix-python-version.patch    |   15 +++++----
 .../files/libindicate-0.4.91-optional-mono.patch   |   16 ++++++++--
 .../files/libindicate-0.4.91-optional-python.patch |   32 +++++++++++++++-----
 ...0.4.4-r1.ebuild => libindicate-0.4.4-r2.ebuild} |    0
 ...-0.4.91.ebuild => libindicate-0.4.91-r2.ebuild} |    0
 7 files changed, 78 insertions(+), 25 deletions(-)

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
index 857bc7a..13c09f9 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
@@ -6,19 +6,29 @@
  
 +AC_ARG_ENABLE([doc],
 +	AC_HELP_STRING([--disable-doc], [Disable doc generation]),
-+	[enable_doc=$enableval], enable_doc=auto)
++	[enable_doc=$enableval], [enable_doc=auto])
 +AM_CONDITIONAL([WANT_DOC], [test "x$enable_doc" != "xno"])
 +
  GTK_DOC_CHECK([1.4])
-+if test "x$enable_doc" != "xno" ; then
++AS_IF([test "x$enable_doc" != "xno"],[
  GNOME_DOC_INIT
-+else
++],[
 +# The initialisation is still needed for certain conditionals to be defined, just make it not output any error
 +GNOME_DOC_INIT(,,[:])
-+fi
++])
  GNOME_COMPILE_WARNINGS
  
  ##############################
+@@ -271,2 +281,7 @@
+-	GObject Introspection:  $enable_introspection
+-])
++	GObject Introspection:  $enable_introspection
++])
++
++AM_COND_IF([HAVE_GNOME_DOC_UTILS],
++	[AC_MSG_NOTICE([	Documentation:          yes])],
++	[AC_MSG_NOTICE([	Documentation:          no])]
++)
 --- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
 +++ Makefile.am	2010-09-20 23:27:12.557785756 +0200
 @@ -1,2 +1,6 @@

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
index 90272e3..2c5b259 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-optional-gtk.patch
@@ -4,17 +4,31 @@
  
 +AC_ARG_ENABLE([gtk],
 +	AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
-+	[enable_gtk=$enableval], enable_gtk=auto)
++	[enable_gtk=$enableval], [enable_gtk=auto])
 +AM_CONDITIONAL([WANT_LIBINDICATEGTK], [test "x$enable_gtk" != "xno"])
 +
-+if test "x$enable_gtk" != "xno" ; then
++AS_IF([test "x$enable_gtk" != "xno"],[
  GDK_PIXBUF_REQUIRED_VERSION=2.12
  
-@@ -75,3 +66,4 @@
+@@ -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)
-+fi
++])
  
+@@ -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 @@

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
index 357c6e3..c08f982 100644
--- 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
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2011-01-29 21:38:44.667942630 +0100
 +++ configure.ac	2011-01-29 21:42:03.892863493 +0100
-@@ -153,13 +153,14 @@
+@@ -153,15 +153,16 @@
 -AM_PATH_PYTHON(2.3.5)
 -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 -
@@ -9,13 +9,16 @@
  PYGOBJECT_REQUIRED=0.22
  
 -PKG_CHECK_MODULES(INDICATE_PYTHON, [pygtk-2.0 >= $PYGTK_REQUIRED
--				    pygobject-2.0 >= $PYGOBJECT_REQUIRED])
-+AM_PATH_PYTHON($PYTHON_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)
++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

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
index 323224a..d663389 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-mono.patch
@@ -6,10 +6,10 @@
  
 +AC_ARG_ENABLE([mono],
 +	AC_HELP_STRING([--disable-mono], [Disable Mono bindings generation]),
-+	[enable_mono=$enableval], enable_mono=auto)
++	[enable_mono=$enableval], [enable_mono=auto])
 +AM_CONDITIONAL([WANT_MONO], [test "x$enable_mono" != "xno"])
 +
-+if test "x$enable_mono" != "xno" ; then
++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)
  
@@ -17,10 +17,20 @@
  AC_SUBST(GAPI_CODEGEN)
  AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
  AC_SUBST(GAPI_FIXUP)
-+fi
++])
  
  ###########################
  # 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 @@

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
index cb058bc..43d42fb 100644
--- a/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
+++ b/dev-libs/libindicate/files/libindicate-0.4.91-optional-python.patch
@@ -1,28 +1,44 @@
 --- configure.ac.orig	2011-01-29 21:51:17.724952231 +0100
 +++ configure.ac	2011-01-29 21:52:29.969745013 +0100
-@@ -153,4 +153,14 @@
+@@ -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)
++	[enable_python=$enableval], [enable_python=auto])
 +AM_CONDITIONAL([WANT_PYTHON], [test "x$enable_python" != "xno"])
 +
-+if test "x$enable_python" != "xno" ; then
-+if test "x$enable_gtk" = "xno" ; then
-+	AC_MSG_ERROR([Python bindings require GTK support, please --enable-gtk])
-+fi
++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)
-@@ -179,6 +185,7 @@
+@@ -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)
-+fi
++])
  
  ###########################
  # 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 @@

diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
similarity index 100%
rename from dev-libs/libindicate/libindicate-0.4.4-r1.ebuild
rename to dev-libs/libindicate/libindicate-0.4.4-r2.ebuild

diff --git a/dev-libs/libindicate/libindicate-0.4.91.ebuild b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
similarity index 100%
rename from dev-libs/libindicate/libindicate-0.4.91.ebuild
rename to dev-libs/libindicate/libindicate-0.4.91-r2.ebuild



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/
@ 2011-02-09 20:11 Dennis Schridde
  0 siblings, 0 replies; 4+ messages in thread
From: Dennis Schridde @ 2011-02-09 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     384a13ad310e9d8ca82753d85338e6e5cee5d51f
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Wed Feb  9 20:09:18 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Wed Feb  9 20:09:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=384a13ad

[dev-libs/libindicate-0.4.4] Remove, migrated to Gentoo mainline

(Portage version: 2.2.0_alpha23/git/Linux x86_64, signed Manifest commit with key 50ED256E)

---
 .../libindicate-0.4.4-fix-python-version.patch     |   11 ---
 dev-libs/libindicate/libindicate-0.4.4-r2.ebuild   |   83 --------------------
 2 files changed, 0 insertions(+), 94 deletions(-)

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 198114b..0000000
--- 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/libindicate-0.4.4-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
deleted file mode 100644
index 5dd78c4..0000000
--- a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,83 +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.1 2011/01/29 16:09:35 tampakrap 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[introspection=]
-	dev-libs/dbus-glib
-	<dev-libs/libdbusmenu-0.3.50[introspection=]
-	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 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
-	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"
-	# Fix parallel-make for mono bindings, launchpad-bug #709954
-	epatch "${FILESDIR}/${P}-mono-parallel-make.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) \
-		|| die "configure failed"
-}
-
-src_test() {
-	emake check || die "testsuite failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS || die "dodoc failed"
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/
@ 2011-04-04  2:44 Locke Shinseiko
  0 siblings, 0 replies; 4+ messages in thread
From: Locke Shinseiko @ 2011-04-04  2:44 UTC (permalink / raw
  To: gentoo-commits

commit:     0528e56ad89cd6ac94d9f061555d8faf959297f4
Author:     Locke Shinseiko <wizzleby <AT> gmail <DOT> com>
AuthorDate: Mon Apr  4 02:43:11 2011 +0000
Commit:     Locke Shinseiko <wizzleby <AT> gmail <DOT> com>
CommitDate: Mon Apr  4 02:44:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0528e56a

[dev-libs/libindicate-0.4.4] Add app-text/gnome-doc-utils to DEPEND, revbump.

---
 .../libindicate-0.4.4-fix-python-version.patch     |   11 +++
 dev-libs/libindicate/libindicate-0.4.4-r3.ebuild   |   84 ++++++++++++++++++++
 2 files changed, 95 insertions(+), 0 deletions(-)

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
new file mode 100644
index 0000000..198114b
--- /dev/null
+++ b/dev-libs/libindicate/files/libindicate-0.4.4-fix-python-version.patch
@@ -0,0 +1,11 @@
+--- 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/libindicate-0.4.4-r3.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r3.ebuild
new file mode 100644
index 0000000..91199df
--- /dev/null
+++ b/dev-libs/libindicate/libindicate-0.4.4-r3.ebuild
@@ -0,0 +1,84 @@
+# 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.1 2011/02/07 10:05:34 tampakrap 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[introspection=]
+	dev-libs/dbus-glib
+	<dev-libs/libdbusmenu-0.3.50[introspection=]
+	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 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
+	app-text/gnome-doc-utils
+	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"
+	# Fix parallel-make for mono bindings, launchpad-bug #709954
+	epatch "${FILESDIR}/${P}-mono-parallel-make.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) \
+		|| die "configure failed"
+}
+
+src_test() {
+	emake check || die "testsuite failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/
@ 2011-12-23 16:26 Johannes Huber
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2011-12-23 16:26 UTC (permalink / raw
  To: gentoo-commits

commit:     fdb18f6226c7e32c3e4f33dedc652053e49114e0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 16:24:09 2011 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 16:25:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fdb18f62

[dev-libs/libindicate] Removed newer version in tree

(Portage version: 2.2.0_alpha81/git/Linux x86_64, unsigned Manifest commit)

---
 .../files/libindicate-0.4.4-fix-aclocal.patch      |    7 --
 .../libindicate-0.4.4-fix-introspection.patch      |   97 -------------------
 ...libindicate-0.4.4-fix-out-of-source-build.patch |   51 ----------
 .../libindicate-0.4.4-mono-parallel-make.patch     |   12 ---
 .../files/libindicate-0.4.4-optional-doc.patch     |   45 ---------
 .../libindicate-0.4.4-optional-examples.patch      |   11 --
 .../files/libindicate-0.4.4-optional-gtk.patch     |   44 ---------
 .../libindicate-0.4.4-optional-mono-example.patch  |    8 --
 .../libindicate-0.4.91-fix-python-version.patch    |   26 -----
 .../files/libindicate-0.4.91-optional-mono.patch   |   43 --------
 .../files/libindicate-0.4.91-optional-python.patch |   51 ----------
 dev-libs/libindicate/libindicate-0.4.91-r2.ebuild  |  101 --------------------
 dev-libs/libindicate/metadata.xml                  |   12 ---
 13 files changed, 0 insertions(+), 508 deletions(-)

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 d7184a3..0000000
--- 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 e3f1751..0000000
--- 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 a87440e..0000000
--- 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-mono-parallel-make.patch b/dev-libs/libindicate/files/libindicate-0.4.4-mono-parallel-make.patch
deleted file mode 100644
index 1554b4c..0000000
--- 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 13c09f9..0000000
--- a/dev-libs/libindicate/files/libindicate-0.4.4-optional-doc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.ac.orig	2010-09-20 23:15:36.692289201 +0200
-+++ configure.ac	2010-09-20 23:26:30.159014141 +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
- 
- ##############################
-@@ -271,2 +281,7 @@
--	GObject Introspection:  $enable_introspection
--])
-+	GObject Introspection:  $enable_introspection
-+])
-+
-+AM_COND_IF([HAVE_GNOME_DOC_UTILS],
-+	[AC_MSG_NOTICE([	Documentation:          yes])],
-+	[AC_MSG_NOTICE([	Documentation:          no])]
-+)
---- Makefile.am.orig	2010-09-20 23:12:10.442903362 +0200
-+++ Makefile.am	2010-09-20 23:27:12.557785756 +0200
-@@ -1,2 +1,6 @@
- 
-+if WANT_DOC
-+DOC_SUBDIR = docs
-+endif
-+
- SUBDIRS = \
-@@ -8,3 +12,3 @@
- 	tests \
--	docs
-+	$(DOC_SUBDIR)
- 

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 8e2e036..0000000
--- 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 2c5b259..0000000
--- 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 97cb78c..0000000
--- 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.91-fix-python-version.patch b/dev-libs/libindicate/files/libindicate-0.4.91-fix-python-version.patch
deleted file mode 100644
index c08f982..0000000
--- 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 d663389..0000000
--- 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 43d42fb..0000000
--- 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.4.91-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
deleted file mode 100644
index 7315c30..0000000
--- a/dev-libs/libindicate/libindicate-0.4.91-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools eutils versionator
-
-MY_MAJOR_VERSION="$(get_version_component_range 1-2)"
-if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then
-	MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))"
-fi
-
-BROKEN_MONO="0.4.91"
-
-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}/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk +introspection mono python"
-
-RESTRICT="test"
-
-# For the dependency on dev-libs/libdbusmenu see launchpad-bug #552667
-RDEPEND="dev-libs/glib:2[introspection=]
-	dev-libs/dbus-glib
-	>=dev-libs/libdbusmenu-0.3.90[introspection=]
-	dev-libs/libxml2:2
-	x11-libs/gtk+:2
-	python? ( dev-python/pygtk )
-	mono? (
-		dev-dotnet/gtk-sharp
-		dev-dotnet/gtk-sharp-gapi
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	dev-util/gtk-doc-am
-	dev-util/pkgconfig"
-
-REQUIRED_USE="python? ( gtk )"
-DOCS=( AUTHORS )
-
-if has "${PV}" ${BROKEN_MONO}; then
-	# Mono bindings are broken in this version, forbid
-	REQUIRED_USE+=" !mono"
-fi
-
-src_prepare() {
-	# Make python optional, launchpad-bug #643921
-	epatch "${FILESDIR}/${P}-optional-python.patch"
-	# Restore SUBDIRS to make optional-mono apply
-	sed -i bindings/Makefile.am \
-		-e 's/^SUBDIRS =.*/SUBDIRS = mono python/'
-	# Make mono optional, launchpad-bug #643922
-	epatch "${FILESDIR}/${P}-optional-mono.patch"
-	# Make SUBDIRS empty, after applying optional-python and optional-mono
-	sed -i bindings/Makefile.am \
-		-e 's/^SUBDIRS =.*/SUBDIRS = $(MONO_SUBDIR) $(PYTHON_SUBDIR)/'
-	# Make gtk optional, launchpad-bug #431311
-	epatch "${FILESDIR}/${PN}-0.4.4-optional-gtk.patch"
-	# Make doc optional, launchpad-bug #643911
-	epatch "${FILESDIR}/${PN}-0.4.4-optional-doc.patch"
-	# Do not compile mono-example by default, launchpad-bug #643912
-	epatch "${FILESDIR}/${PN}-0.4.4-optional-mono-example.patch"
-	# Do not compile examples by default, launchpad-bug #643917
-	epatch "${FILESDIR}/${PN}-0.4.4-optional-examples.patch"
-	# Fix trouble with autoreconf and m4 directory, launchpad-bug #683552
-	epatch "${FILESDIR}/${PN}-0.4.4-fix-aclocal.patch"
-	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552537
-	epatch "${FILESDIR}/${PN}-0.4.4-fix-introspection.patch"
-	# Fix out-of-source builds, launchpad-bug #643913
-	epatch "${FILESDIR}/${PN}-0.4.4-fix-out-of-source-build.patch"
-	# Fix python version detection, launchpad-bug #594992
-	epatch "${FILESDIR}/${P}-fix-python-version.patch"
-	# Fix parallel-make for mono bindings, launchpad-bug #709954
-	epatch "${FILESDIR}/${PN}-0.4.4-mono-parallel-make.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) \
-		$(use_enable mono) \
-		$(use_enable python) \
-		${conf}
-}
-
-src_test() {
-	emake check
-}

diff --git a/dev-libs/libindicate/metadata.xml b/dev-libs/libindicate/metadata.xml
deleted file mode 100644
index 1e36385..0000000
--- a/dev-libs/libindicate/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kde</herd>
-  <maintainer>
-    <email>mrpouet@gentoo.org</email>
-    <name>Romain Perier</name>
-  </maintainer>
-  <use>
-    <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
-  </use>
-</pkgmetadata>



^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-23 16:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-05 21:42 [gentoo-commits] proj/kde:master commit in: dev-libs/libindicate/, dev-libs/libindicate/files/ Dennis Schridde
  -- strict thread matches above, loose matches on Subject: below --
2011-02-09 20:11 Dennis Schridde
2011-04-04  2:44 Locke Shinseiko
2011-12-23 16:26 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox