From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RLMjM-0003E0-HW for garchives@archives.gentoo.org; Tue, 01 Nov 2011 22:22:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8564D21C053; Tue, 1 Nov 2011 22:22:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 24C3B21C053 for ; Tue, 1 Nov 2011 22:22:45 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F8531B401E for ; Tue, 1 Nov 2011 22:22:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DB29080042 for ; Tue, 1 Nov 2011 22:22:43 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <24041512a56cb3543ecd76770a2155288684e2fc.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/ X-VCS-Repository: proj/kde X-VCS-Files: dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild dev-libs/libdbusmenu/metadata.xml X-VCS-Directories: dev-libs/libdbusmenu/ dev-libs/libdbusmenu/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 24041512a56cb3543ecd76770a2155288684e2fc Date: Tue, 1 Nov 2011 22:22:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2160470c-cc96-44ee-8ef1-2b18ce79faf8 X-Archives-Hash: 265754f695ce7499124d810f1f72fc7d commit: 24041512a56cb3543ecd76770a2155288684e2fc Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Tue Nov 1 22:22:29 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Tue Nov 1 22:22:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D24041512 [dev-libs/libdbusmenu] Moved to main tree --- .../files/libdbusmenu-0.3.14-fix-aclocal.patch | 8 -- .../files/libdbusmenu-0.3.14-optional-dumper.patch | 68 ----------- .../files/libdbusmenu-0.3.16-optional-tests.patch | 55 --------- .../files/libdbusmenu-0.3.16-optional-vala.patch | 59 ---------- .../libdbusmenu-0.3.94-decouple-testapp.patch | 20 ---- .../libdbusmenu-0.3.94-fix-introspection.patch | 11 -- .../files/libdbusmenu-0.3.94-optional-gtk.patch | 119 --------------= ------ dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild | 86 -------------- dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild | 62 ---------- dev-libs/libdbusmenu/metadata.xml | 10 -- 10 files changed, 0 insertions(+), 498 deletions(-) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.pa= tch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch deleted file mode 100644 index d4fdcaa..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 -+++ Makefile.am 2010-09-20 22:21:12.976592367 +0200 -@@ -1,3 +1,5 @@ -+ACLOCAL_AMFLAGS =3D -I m4 -+ - EXTRA_DIST =3D \ - COPYING.2.1 \ - COPYING-GPL3 \ diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumpe= r.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.p= atch deleted file mode 100644 index 644c799..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 -+++ configure.ac 2010-09-20 22:05:38.292979567 +0200 -@@ -63,8 +63,17 @@ -=20 - X11_REQUIRED_VERSION=3D1.3 -=20 -+AC_ARG_ENABLE([dumper], -+ AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), -+ [enable_dumper=3D$enableval], [enable_dumper=3Dauto]) -+AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" !=3D "xno= "]) -+ -+AS_IF([test "x$enable_dumper" !=3D "xno"],[ - PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >=3D $GTK_REQUIRED_VERSION -- x11 >=3D $X11_REQUIRED_VERSION) -+ x11 >=3D $X11_REQUIRED_VERSION, -+ [have_dumper=3Dyes] -+) -+]) -=20 - AC_SUBST(DBUSMENUDUMPER_CFLAGS) - AC_SUBST(DBUSMENUDUMPER_LIBS) -@@ -193,1 +193,6 @@ -=20 -+AS_IF([test "x$have_dumper" =3D "xyes"], -+ AC_MSG_NOTICE([ Dumper: yes]), -+ AC_MSG_NOTICE([ Dumper: no]) -+) -+ ---- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200 -+++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200 -@@ -3,5 +3,9 @@ -=20 --libexec_PROGRAMS =3D dbusmenu-dumper -+libexec_PROGRAMS =3D -+ -+if WANT_DBUSMENUDUMPER -+libexec_PROGRAMS +=3D dbusmenu-dumper -+endif -=20 - libexec_SCRIPTS =3D dbusmenu-bench -=20 ---- tests/Makefile.am.orig 2011-02-07 00:01:11.066461559 +0100 -+++ tests/Makefile.am 2011-02-07 00:02:33.487751202 +0100 -@@ -10,6 +10,10 @@ - test-glib-properties \ - test-glib-proxy \ - test-glib-simple-items \ -- test-glib-submenu \ -+ test-glib-submenu -+ -+if WANT_DBUSMENUDUMPER -+TESTS +=3D \ - test-json -+endif -=20 -@@ -36,7 +40,11 @@ - test-glib-proxy-proxy \ - test-glib-submenu-client \ - test-glib-submenu-server \ -- test-glib-simple-items \ -+ test-glib-simple-items -+ -+if WANT_DBUSMENUDUMPER -+check_PROGRAMS +=3D \ - test-json-client \ - test-json-server -+endif -=20 diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests= .patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.pat= ch deleted file mode 100644 index e047cd8..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 -+++ configure.ac 2010-09-20 22:01:21.623107607 +0200 -@@ -76,8 +76,17 @@ - JSON_GLIB_REQUIRED_VERSION=3D0.6.0 - GIO_UNIX_REQUIRED_VERSION=3D2.24 -=20 -+AC_ARG_ENABLE([tests], -+ AC_HELP_STRING([--disable-tests], [Disable tests]), -+ [enable_tests=3D$enableval], [enable_tests=3Dauto]) -+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" !=3D "xno"]) -+ -+AS_IF([test "x$enable_tests" !=3D "xno"],[ - PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >=3D $JSON_GLIB_REQUIRE= D_VERSION -- gio-unix-2.0 >=3D $GIO_UNIX_REQUIRED= _VERSION) -+ gio-unix-2.0 >=3D $GIO_UNIX_REQUIRED= _VERSION, -+ [have_tests=3Dyes] -+) -+]) -=20 - AC_SUBST(DBUSMENUTESTS_CFLAGS) - AC_SUBST(DBUSMENUTESTS_LIBS) -@@ -193,1 +193,6 @@ -=20 -+AS_IF([test "x$have_tests" =3D "xyes"], -+ AC_MSG_NOTICE([ Tests: yes]), -+ AC_MSG_NOTICE([ Tests: no]) -+) -+ ---- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 -+++ Makefile.am 2010-09-20 22:01:55.525674385 +0200 -@@ -5,2 +5,6 @@ -=20 -+if WANT_TESTS -+TESTS_SUBDIR =3D tests -+endif -+ - SUBDIRS =3D \ -@@ -9,3 +9,3 @@ - tools \ -- tests \ -+ $(TESTS_SUBDIR) \ - docs \ ---- tools/testapp/Makefile.am.orig 2011-01-29 13:42:00.984605528 +010= 0 -+++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100 -@@ -1,5 +1,9 @@ -=20 --libexec_PROGRAMS =3D dbusmenu-testapp -+libexec_PROGRAMS =3D -+ -+if WANT_TESTS -+libexec_PROGRAMS +=3D dbusmenu-testapp -+endif -=20 - dbusmenu_testapp_SOURCES =3D \ - main.c diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.= patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch deleted file mode 100644 index 72fcd57..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- configure.ac.orig 2011-02-05 15:01:31.212827464 +0100 -+++ configure.ac 2011-02-05 15:13:08.310031260 +0100 -@@ -143,7 +143,17 @@ - # Vala API Generation - ########################### -=20 -+AC_ARG_ENABLE([vala], -+ AC_HELP_STRING([--disable-vala], [Disable vala]), -+ [enable_vala=3D$enableval], [enable_vala=3Dauto]) -+ -+AS_IF([test "x$enable_vala" !=3D "xno"],[ -+ AM_COND_IF([HAVE_INTROSPECTION],,[ -+ AC_MSG_ERROR([Vala bindings require introspection support, please --e= nable-introspection]) -+ ]) - AC_PATH_PROG([VALA_API_GEN], [vapigen]) -+]) -+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) -=20 - ########################### - # XSLT Processor -@@ -193,1 +193,6 @@ -=20 -+AM_COND_IF([HAVE_VALA], -+ AC_MSG_NOTICE([ Vala bindings: yes]), -+ AC_MSG_NOTICE([ Vala bindings no]) -+) -+ ---- libdbusmenu-gtk/Makefile.am.orig 2011-02-05 15:09:06.429965757 +0100 -+++ libdbusmenu-gtk/Makefile.am 2011-02-05 15:08:14.742722310 +0100 -@@ -131,6 +131,7 @@ - # VAPI Files - ######################### -=20 -+if HAVE_VALA - if HAVE_INTROSPECTION -=20 - vapidir =3D $(datadir)/vala/vapi -@@ -154,4 +155,5 @@ - CLEANFILES +=3D $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir -=20 - endif -+endif -=20 ---- libdbusmenu-glib/Makefile.am.orig 2011-02-05 15:08:49.613538681 +010= 0 -+++ libdbusmenu-glib/Makefile.am 2011-02-05 15:06:23.826443241 +0100 -@@ -165,6 +165,7 @@ - # VAPI Files - ######################### -=20 -+if HAVE_VALA - if HAVE_INTROSPECTION -=20 - vapidir =3D $(datadir)/vala/vapi -@@ -176,4 +177,5 @@ - CLEANFILES +=3D $(vapi_DATA) -=20 - endif -+endif -=20 diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testa= pp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp= .patch deleted file mode 100644 index 64812a4..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patc= h +++ /dev/null @@ -1,20 +0,0 @@ ---- tools/testapp/Makefile.am.orig 2011-01-29 20:50:54.266939219 +0100 -+++ tools/testapp/Makefile.am 2011-01-29 20:51:16.185268917 +0100 -@@ -1,10 +1,4 @@ -=20 --if USE_GTK3 --VER=3D3 --else --VER=3D --endif -- - libexec_PROGRAMS =3D -=20 - if WANT_TESTS -@@ -22,6 +16,4 @@ -=20 - dbusmenu_testapp_LDADD =3D \ - $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ -- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ -- $(DBUSMENUGTK_LIBS) \ - $(DBUSMENUTESTS_LIBS) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspect= ion.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspecti= on.patch deleted file mode 100644 index a259942..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.pat= ch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:16:34.481082458 +0= 100 -+++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:20:31.703396315 +0100 -@@ -138,7 +138,7 @@ -=20 - introspection_sources =3D $(libdbusmenu_glibinclude_HEADERS) -=20 --Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la -+Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la - Dbusmenu_Glib_0_4_gir_INCLUDES =3D \ - GObject-2.0 - Dbusmenu_Glib_0_4_gir_CFLAGS =3D $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir) diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.p= atch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch deleted file mode 100644 index e178447..0000000 --- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 -+++ configure.ac 2011-01-29 20:42:10.969923186 +0100 -@@ -58,29 +58,39 @@ - GTK_REQUIRED_VERSION=3D2.16 - GTK3_REQUIRED_VERSION=3D2.91 -=20 -+AC_ARG_ENABLE([gtk], -+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), -+ [enable_gtk=3D$enableval], [enable_gtk=3Dauto]) -+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" !=3D "xno"]) -+ - AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=3D2@:>@])], - [], - [with_gtk=3D2]) -+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" =3D "x3"]) -+ -+AS_IF([test "x$enable_gtk" !=3D "xno"],[ - AS_IF([test "x$with_gtk" =3D x3], - [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >=3D $GTK3_REQUIRED_V= ERSION - glib-2.0 >=3D $GLIB_REQUIRED_V= ERSION -- libxml-2.0 >=3D $XML_REQUIRED_= VERSION) -+ libxml-2.0 >=3D $XML_REQUIRED_= VERSION, -+ [have_gtk=3Dyes] -+) -- AC_SUBST(DBUSMENUGTK_CFLAGS) -- AC_SUBST(DBUSMENUGTK_LIBS) - AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) - ], - [test "x$with_gtk" =3D x2], - [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >=3D $GTK_REQUIRED_VE= RSION - glib-2.0 >=3D $GLIB_REQUIRED_V= ERSION -- libxml-2.0 >=3D $XML_REQUIRED_= VERSION) -+ libxml-2.0 >=3D $XML_REQUIRED_= VERSION, -+ [have_gtk=3Dyes] -+) -- AC_SUBST(DBUSMENUGTK_CFLAGS) -- AC_SUBST(DBUSMENUGTK_LIBS) - ], - [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] - ) --AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" =3D x3]) -+]) -+AC_SUBST(DBUSMENUGTK_CFLAGS) -+AC_SUBST(DBUSMENUGTK_LIBS) -=20 - ########################### - # Dependencies - dumper -@@ -193,1 +193,6 @@ -=20 -+AS_IF([test "x$enable_gtk" =3D "xyes"], -+ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), -+ 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 @@ -=20 -+if WANT_LIBDBUSMENUGTK -+LIBDBUSMENUGTK_SUBDIR =3D libdbusmenu-gtk -+endif -+ - SUBDIRS =3D \ - libdbusmenu-glib \ -- libdbusmenu-gtk \ -+ $(LIBDBUSMENUGTK_SUBDIR) \ - tools \ ---- tests/Makefile.am.orig 2011-01-29 20:47:16.721588701 +0100 -+++ tests/Makefile.am 2011-01-29 20:45:10.116455527 +0100 -@@ -11,13 +11,17 @@ - test-glib-proxy \ - test-glib-simple-items \ - test-glib-submenu \ -- test-json \ -+ test-json -+ -+if WANT_LIBDBUSMENUGTK -+TESTS +=3D \ - test-gtk-objects-test \ - test-gtk-label \ - test-gtk-shortcut \ - test-gtk-reorder \ - test-gtk-submenu \ - test-gtk-parser-test -+endif -=20 - check_PROGRAMS =3D \ - glib-server-nomenu \ -@@ -31,20 +35,24 @@ - 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 +=3D \ -+ 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 \ - test-gtk-parser -+endif -=20 - XVFB_RUN=3D". $(srcdir)/run-xvfb.sh" -=20 diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild b/dev-libs= /libdbusmenu/libdbusmenu-0.3.94-r2.ebuild deleted file mode 100644 index 11eda14..0000000 --- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D4 - -inherit autotools eutils versionator virtualx - -MY_MAJOR_VERSION=3D"$(get_version_component_range 1-2)" -if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then - MY_MAJOR_VERSION=3D"$(get_major_version).$(($(get_version_component_ran= ge 2)+1))" -fi - -DESCRIPTION=3D"Library to pass menu structure across DBus" -HOMEPAGE=3D"https://launchpad.net/dbusmenu" -SRC_URI=3D"http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+down= load/${P}.tar.gz" - -LICENSE=3D"LGPL-3" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"gtk gtk3 +introspection test vala" - -RDEPEND=3D"dev-libs/glib:2 - dev-libs/dbus-glib - dev-libs/libxml2:2 - gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - )" -DEPEND=3D"${RDEPEND} - introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) - test? ( - dev-libs/json-glib[introspection=3D] - 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=3Dvala) require introspection support (USE=3D= introspection)" - die "Vala bindings (USE=3Dvala) require introspection support (USE=3Di= ntrospection)" - fi -} - -src_prepare() { - # Make tests optional, launchpad-bug #713685 - epatch "${FILESDIR}/${PN}-0.3.16-optional-vala.patch" - # Make tests optional, launchpad-bug #552526 - epatch "${FILESDIR}/${PN}-0.3.16-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/M= akefile.am || die "sed failed" - eautoreconf -} - -src_configure() { - local conf - if use gtk3 ; then - conf=3D"${conf} --with-gtk=3D3" - else - conf=3D"${conf} --with-gtk=3D2" - fi - - econf \ - $(use_enable gtk) \ - $(use_enable gtk dumper) \ - $(use_enable introspection) \ - $(use_enable test tests) \ - $(use_enable vala) \ - ${conf} -} - -src_test() { - Xemake check -} diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild b/dev-libs/lib= dbusmenu/libdbusmenu-0.5.1.ebuild deleted file mode 100644 index b8366e4..0000000 --- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild +++ /dev/null @@ -1,62 +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.3.= 16-r2.ebuild,v 1.1 2011/02/07 09:56:46 tampakrap Exp $ - -EAPI=3D3 - -inherit autotools eutils versionator virtualx - -MY_MAJOR_VERSION=3D"$(get_version_component_range 1-2)" -if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then - MY_MAJOR_VERSION=3D"$(get_major_version).$(($(get_version_component_ran= ge 2)+1))" -fi - -DESCRIPTION=3D"Library to pass menu structure across DBus" -HOMEPAGE=3D"https://launchpad.net/dbusmenu" -SRC_URI=3D"http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+down= load/${P}.tar.gz" - -LICENSE=3D"LGPL-3" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"gtk +introspection test vala" - -RDEPEND=3D"dev-libs/glib:2 - dev-libs/dbus-glib - dev-libs/libxml2:2 - gtk? ( x11-libs/gtk+:2 )" -DEPEND=3D"${RDEPEND} - introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) - test? ( - dev-libs/json-glib[introspection=3D] - dev-util/dbus-test-runner - ) - vala? ( dev-lang/vala:0.10 ) - dev-util/intltool - dev-util/pkgconfig" - -pkg_setup() { - if use vala && use !introspection ; then - eerror "Vala bindings (USE=3Dvala) require introspection support (USE=3D= introspection)" - die "Vala bindings (USE=3Dvala) require introspection support (USE=3Di= ntrospection)" - fi -} - -src_configure() { - VALA_API_GEN=3D$(type -p vapigen-0.10) \ - econf \ - --with-gtk=3D2 \ - $(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=3D"${ED}" install || die "make install failed" - dodoc AUTHORS || die "dodoc failed" -} diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/met= adata.xml deleted file mode 100644 index bb3e5c1..0000000 --- a/dev-libs/libdbusmenu/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - kde - - Build experimental gtk3 version instead of using= gtk2 - Use dev-libs/gobject-introspection for = introspection - Enable bindings for dev-lang/vala - -