[gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/

["Dennis Schridde" <devurandom@gmx.net>]

commit:     659b7ad4e04745fa11cee95ec44a553de2536fa6
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Wed Feb  9 20:08:17 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Wed Feb  9 20:08:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=659b7ad4

[dev-libs/libdbusmenu-0.3.16] Remove, migrated to Gentoo mainline

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

---
 .../libdbusmenu-0.3.16-decouple-testapp.patch      |    9 --
 .../libdbusmenu-0.3.16-fix-introspection.patch     |   11 ---
 .../files/libdbusmenu-0.3.16-optional-gtk.patch    |   92 --------------------
 dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild  |   80 -----------------
 4 files changed, 0 insertions(+), 192 deletions(-)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
deleted file mode 100644
index d98ffab..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- tools/testapp/Makefile.am.orig	2011-01-29 13:42:00.984605528 +0100
-+++ tools/testapp/Makefile.am	2011-01-29 13:44:45.523514281 +0100
-@@ -12,6 +13,4 @@
- 
- dbusmenu_testapp_LDADD = \
- 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
--	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \
--	$(DBUSMENUGTK_LIBS) \
- 	$(DBUSMENUTESTS_LIBS)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
deleted file mode 100644
index 5977795..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:38:38.713641727 +0100
-+++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:38:44.917448353 +0100
-@@ -123,7 +123,7 @@
- 
- introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
- 
--Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
-+Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la
- Dbusmenu_Glib_0_2_gir_INCLUDES = \
- 	GObject-2.0
- Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
deleted file mode 100644
index 844fa14..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
-+++ configure.ac	2010-09-20 21:58:03.536293089 +0200
-@@ -49,10 +49,19 @@
- 
- GTK_REQUIRED_VERSION=2.16
- 
-+AC_ARG_ENABLE([gtk],
-+	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
-+	[enable_gtk=$enableval], [enable_gtk=auto])
-+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
-+
-+AS_IF([test "x$enable_gtk" != "xno"],[
- PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                 glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                 dbus-glib-1 >= $DBUS_REQUIRED_VERSION
--                                libxml-2.0 >= $XML_REQUIRED_VERSION)
-+                                libxml-2.0 >= $XML_REQUIRED_VERSION,
-+                                [have_gtk=yes]
-+)
-+])
- 
- AC_SUBST(DBUSMENUGTK_CFLAGS)
- AC_SUBST(DBUSMENUGTK_LIBS)
-@@ -193,1 +192,6 @@
- 
-+AS_IF([test "x$have_gtk" = "xyes"],
-+	AC_MSG_NOTICE([	Gtk:                    yes]),
-+	AC_MSG_NOTICE([	Gtk:                    no])
-+)
-+
---- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
-+++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
-@@ -5,5 +5,9 @@
- 
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- 	libdbusmenu-glib \
--	libdbusmenu-gtk \
-+	$(LIBDBUSMENUGTK_SUBDIR) \
- 	tools \
---- tests/Makefile.am.orig	2011-01-29 14:37:11.863805482 +0100
-+++ tests/Makefile.am	2011-01-29 14:38:48.910883303 +0100
-@@ -11,12 +11,16 @@
- 	test-glib-proxy \
- 	test-glib-simple-items \
- 	test-glib-submenu \
--	test-json \
-+	test-json
-+
-+if WANT_LIBDBUSMENUGTK
-+TESTS += \
- 	test-gtk-objects-test \
- 	test-gtk-label \
- 	test-gtk-shortcut \
- 	test-gtk-reorder \
- 	test-gtk-submenu
-+endif
- 
- check_PROGRAMS = \
- 	glib-server-nomenu \
-@@ -30,19 +34,23 @@
- 	test-glib-proxy-client \
- 	test-glib-proxy-server \
- 	test-glib-proxy-proxy \
--	test-gtk-objects \
- 	test-glib-submenu-client \
- 	test-glib-submenu-server \
-+	test-glib-simple-items \
-+	test-json-client \
-+	test-json-server
-+
-+if WANT_LIBDBUSMENUGTK
-+check_PROGRAMS += \
-+	test-gtk-objects \
- 	test-gtk-label-client \
- 	test-gtk-label-server \
- 	test-gtk-shortcut-client \
- 	test-gtk-shortcut-server \
--	test-glib-simple-items \
- 	test-gtk-reorder-server \
--	test-json-client \
--	test-json-server \
- 	test-gtk-submenu-server \
- 	test-gtk-submenu-client
-+endif
- 
- XVFB_RUN=". $(srcdir)/run-xvfb.sh"
- 
-

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
deleted file mode 100644
index 7cc9790..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
+++ /dev/null
@@ -1,80 +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/libdbusmenu/libdbusmenu-0.2.8.ebuild,v 1.2 2010/09/14 07:41:41 reavertm Exp $
-
-EAPI=3
-
-inherit autotools eutils versionator virtualx
-
-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
-
-DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="https://launchpad.net/dbusmenu"
-SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk +introspection test vala"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	test? (
-		dev-libs/json-glib[introspection=]
-		dev-util/dbus-test-runner
-	)
-	vala? ( dev-lang/vala:0 )
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use vala && use !introspection ; then
-		eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)"
-		die "Vala bindings (USE=vala) require introspection support (USE=introspection)"
-	fi
-}
-
-src_prepare() {
-	# Make Vala bindings optional, launchpad-bug #713685
-	epatch "${FILESDIR}/${P}-optional-vala.patch"
-	# Make tests optional, launchpad-bug #552526
-	epatch "${FILESDIR}/${P}-optional-tests.patch"
-	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
-	epatch "${FILESDIR}/${P}-optional-gtk.patch"
-	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
-	epatch "${FILESDIR}/${P}-decouple-testapp.patch"
-	# Make dbusmenudumper optional, launchpad-bug #643871
-	epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch"
-	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
-	epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch"
-	# Fix introspection generation, launchpad-bug #713690
-	epatch "${FILESDIR}/${P}-fix-introspection.patch"
-	# Drop -Werror in a release
-	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk) \
-		$(use_enable gtk dumper) \
-		$(use_enable introspection) \
-		$(use_enable test tests) \
-		$(use_enable vala)
-}
-
-src_test() {
-	Xemake check || die "testsuite failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS || die "dodoc failed"
-}