# ChangeLog for dev-libs/libdbusmenu-qt
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.22 2011/11/20 12:22:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.23 2011/11/25 20:50:13 ssuominen Exp $
+
+ 25 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+ -libdbusmenu-qt-0.6.2.ebuild:
+ old
20 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
Maintained by both ayatana and kde.
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.6.2.ebuild,v 1.7 2011/06/01 16:15:22 ranger Exp $
-
-EAPI="3"
-
-QT_DEPEND="4.6.3"
-inherit cmake-utils
-
-DESCRIPTION="A library providing Qt implementation of DBusMenu specification"
-HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug test"
-
-# Bug #315215, require X server running
-RESTRICT="test"
-
-RDEPEND="
- >=x11-libs/qt-core-${QT_DEPEND}:4
- >=x11-libs/qt-gui-${QT_DEPEND}:4[dbus]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/qjson
- >=x11-libs/qt-test-${QT_DEPEND}:4
- )
-"
-
-DOCS=(NEWS README)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build test TESTS)
- )
- cmake-utils_src_configure
-}
# ChangeLog for dev-libs/libdbusmenu
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.10 2011/11/20 12:41:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.11 2011/11/25 20:49:59 ssuominen Exp $
+
+ 25 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+ -libdbusmenu-0.2.8.ebuild, -files/libdbusmenu-0.2.8-1-optional-gtk.patch,
+ -files/libdbusmenu-0.2.8-2-optional-tests.patch,
+ -files/libdbusmenu-0.2.8-no-gobject-introspection.patch,
+ -files/libdbusmenu-0.3.14-fix-aclocal.patch,
+ -files/libdbusmenu-0.3.14-optional-dumper.patch, -libdbusmenu-0.3.16.ebuild,
+ -libdbusmenu-0.3.16-r2.ebuild,
+ -files/libdbusmenu-0.3.16-decouple-testapp.patch,
+ -files/libdbusmenu-0.3.16-fix-introspection.patch,
+ -files/libdbusmenu-0.3.16-optional-gtk.patch,
+ -files/libdbusmenu-0.3.16-optional-tests.patch,
+ -files/libdbusmenu-0.3.16-optional-vala.patch,
+ -files/libdbusmenu-0.3.16-parallel-make.patch,
+ -files/libdbusmenu-0.3.94-decouple-testapp.patch,
+ -files/libdbusmenu-0.3.94-fix-introspection.patch,
+ -files/libdbusmenu-0.3.94-optional-gtk.patch:
+ old
20 Nov 2011; Pacho Ramos <pacho@gentoo.org> libdbusmenu-0.5.1.ebuild:
Drop DEPRECATED flags, bug #391103
+++ /dev/null
---- configure.ac.orig 2010-03-31 12:56:17.483842274 +0200
-+++ configure.ac 2010-03-31 12:57:25.783592956 +0200
-@@ -42,10 +42,17 @@
-
- GTK_REQUIRED_VERSION=2.16
-
-+AC_ARG_ENABLE([gtk],
-+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]),
-+ [enable_gtk=$enableval], enable_gtk=auto)
-+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
-+
-+if test "x$enable_gtk" != "xno"; then
- 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)
-+fi
-
- AC_SUBST(DBUSMENUGTK_CFLAGS)
- AC_SUBST(DBUSMENUGTK_LIBS)
---- Makefile.am.orig 2010-03-31 13:01:21.871844609 +0200
-+++ Makefile.am 2010-03-31 13:19:34.896594837 +0200
-@@ -5,10 +5,13 @@
-
- SUBDIRS = \
- libdbusmenu-glib \
-- libdbusmenu-gtk \
- tools \
- tests \
- po
-
-+if WANT_LIBDBUSMENUGTK
-+SUBDIRS += libdbusmenu-gtk
-+endif
-+
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
-
+++ /dev/null
---- configure.ac.orig 2010-03-31 12:56:17.483842274 +0200
-+++ configure.ac 2010-03-31 13:08:36.291843605 +0200
-@@ -56,7 +56,14 @@
-
- JSON_GLIB_REQUIRED_VERSION=0.6.0
-
-+AC_ARG_ENABLE([tests],
-+ AC_HELP_STRING([--disable-tests], [Disable tests]),
-+ [enable_tests=$enableval], enable_tests=auto)
-+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
-+
-+if test "x$enable_tests" != "xno"; then
- PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION)
-+fi
-
- AC_SUBST(DBUSMENUTESTS_CFLAGS)
- AC_SUBST(DBUSMENUTESTS_LIBS)
---- Makefile.am.orig 2010-03-31 13:01:21.871844609 +0200
-+++ Makefile.am 2010-03-31 13:33:03.953843279 +0200
-@@ -7,7 +7,10 @@
- libdbusmenu-glib \
- tools \
-- tests \
- po
-
-+if WANT_TESTS
-+SUBDIRS += tests
-+endif
-+
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
-
---- tools/Makefile.am.orig 2010-03-31 13:44:57.924843955 +0200
-+++ tools/Makefile.am 2010-03-31 13:47:19.073593832 +0200
-@@ -1,5 +1,9 @@
-
--SUBDIRS = testapp
-+SUBDIRS =
-+
-+if WANT_TESTS
-+SUBDIRS += testapp
-+endif
-
- libexec_PROGRAMS = dbusmenu-dumper
-
+++ /dev/null
---- configure.ac.orig 2010-03-31 12:42:16.497596552 +0200
-+++ configure.ac 2010-03-31 12:42:47.001595062 +0200
-@@ -74,6 +74,6 @@
- ###########################
-
--GOBJECT_INTROSPECTION_CHECK([0.6.7])
-+AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
-
- ###########################
- # GTK Doc
+++ /dev/null
---- 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 = -I m4
-+
- EXTRA_DIST = \
- COPYING.2.1 \
- COPYING-GPL3 \
+++ /dev/null
---- 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 @@
-
- X11_REQUIRED_VERSION=1.3
-
-+AC_ARG_ENABLE([dumper],
-+ AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]),
-+ [enable_dumper=$enableval], [enable_dumper=auto])
-+AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"])
-+
-+AS_IF([test "x$enable_dumper" != "xno"],[
- PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-- x11 >= $X11_REQUIRED_VERSION)
-+ x11 >= $X11_REQUIRED_VERSION,
-+ [have_dumper=yes]
-+)
-+])
-
- AC_SUBST(DBUSMENUDUMPER_CFLAGS)
- AC_SUBST(DBUSMENUDUMPER_LIBS)
-@@ -193,1 +193,6 @@
-
-+AS_IF([test "x$have_dumper" = "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 @@
-
--libexec_PROGRAMS = dbusmenu-dumper
-+libexec_PROGRAMS =
-+
-+if WANT_DBUSMENUDUMPER
-+libexec_PROGRAMS += dbusmenu-dumper
-+endif
-
- libexec_SCRIPTS = dbusmenu-bench
-
---- 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 += \
- test-json
-+endif
-
-@@ -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 += \
- test-json-client \
- test-json-server
-+endif
-
+++ /dev/null
---- 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)
+++ /dev/null
---- ./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)
+++ /dev/null
---- 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"
-
-
+++ /dev/null
---- 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=0.6.0
- GIO_UNIX_REQUIRED_VERSION=2.24
-
-+AC_ARG_ENABLE([tests],
-+ AC_HELP_STRING([--disable-tests], [Disable tests]),
-+ [enable_tests=$enableval], [enable_tests=auto])
-+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
-+
-+AS_IF([test "x$enable_tests" != "xno"],[
- PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION)
-+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION,
-+ [have_tests=yes]
-+)
-+])
-
- AC_SUBST(DBUSMENUTESTS_CFLAGS)
- AC_SUBST(DBUSMENUTESTS_LIBS)
-@@ -193,1 +193,6 @@
-
-+AS_IF([test "x$have_tests" = "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 @@
-
-+if WANT_TESTS
-+TESTS_SUBDIR = tests
-+endif
-+
- SUBDIRS = \
-@@ -9,3 +9,3 @@
- tools \
-- tests \
-+ $(TESTS_SUBDIR) \
- docs \
---- 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
-@@ -1,5 +1,9 @@
-
--libexec_PROGRAMS = dbusmenu-testapp
-+libexec_PROGRAMS =
-+
-+if WANT_TESTS
-+libexec_PROGRAMS += dbusmenu-testapp
-+endif
-
- dbusmenu_testapp_SOURCES = \
- main.c
+++ /dev/null
---- 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
- ###########################
-
-+AC_ARG_ENABLE([vala],
-+ AC_HELP_STRING([--disable-vala], [Disable vala]),
-+ [enable_vala=$enableval], [enable_vala=auto])
-+
-+AS_IF([test "x$enable_vala" != "xno"],[
-+ AM_COND_IF([HAVE_INTROSPECTION],,[
-+ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
-+ ])
- AC_PATH_PROG([VALA_API_GEN], [vapigen])
-+])
-+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"])
-
- ###########################
- # XSLT Processor
-@@ -193,1 +193,6 @@
-
-+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
- #########################
-
-+if HAVE_VALA
- if HAVE_INTROSPECTION
-
- vapidir = $(datadir)/vala/vapi
-@@ -154,4 +155,5 @@
- CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
-
- endif
-+endif
-
---- libdbusmenu-glib/Makefile.am.orig 2011-02-05 15:08:49.613538681 +0100
-+++ libdbusmenu-glib/Makefile.am 2011-02-05 15:06:23.826443241 +0100
-@@ -165,6 +165,7 @@
- # VAPI Files
- #########################
-
-+if HAVE_VALA
- if HAVE_INTROSPECTION
-
- vapidir = $(datadir)/vala/vapi
-@@ -176,4 +177,5 @@
- CLEANFILES += $(vapi_DATA)
-
- endif
-+endif
-
+++ /dev/null
---- Makefile.am.orig 2011-01-29 13:49:42.828302898 +0100
-+++ Makefile.am 2011-01-29 13:50:45.096371768 +0100
-@@ -21,4 +21,8 @@
-
-+libdbusmenu-gtk: libdbusmenu-glib
-+tests: libdbusmenu-gtk
-+tools: libdbusmenu-gtk
-+
- DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
-
- dist-hook:
+++ /dev/null
---- 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 @@
-
--if USE_GTK3
--VER=3
--else
--VER=
--endif
--
- libexec_PROGRAMS =
-
- if WANT_TESTS
-@@ -22,6 +16,4 @@
-
- dbusmenu_testapp_LDADD = \
- $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
-- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
-- $(DBUSMENUGTK_LIBS) \
- $(DBUSMENUTESTS_LIBS)
+++ /dev/null
---- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:16:34.481082458 +0100
-+++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:20:31.703396315 +0100
-@@ -138,7 +138,7 @@
-
- introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
-
--Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
-+Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la
- Dbusmenu_Glib_0_4_gir_INCLUDES = \
- GObject-2.0
- Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
+++ /dev/null
---- 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=2.16
- GTK3_REQUIRED_VERSION=2.91
-
-+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"])
-+
- AC_ARG_WITH([gtk],
- [AS_HELP_STRING([--with-gtk],
- [Which version of gtk to use @<:@default=2@:>@])],
- [],
- [with_gtk=2])
-+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
-+
-+AS_IF([test "x$enable_gtk" != "xno"],[
- AS_IF([test "x$with_gtk" = x3],
- [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- glib-2.0 >= $GLIB_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)
- AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
- ],
- [test "x$with_gtk" = x2],
- [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION
- glib-2.0 >= $GLIB_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)
- ],
- [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
- )
--AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
-+])
-+AC_SUBST(DBUSMENUGTK_CFLAGS)
-+AC_SUBST(DBUSMENUGTK_LIBS)
-
- ###########################
- # Dependencies - dumper
-@@ -193,1 +193,6 @@
-
-+AS_IF([test "x$enable_gtk" = "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 @@
-
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- 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 += \
- test-gtk-objects-test \
- test-gtk-label \
- test-gtk-shortcut \
- test-gtk-reorder \
- test-gtk-submenu \
- test-gtk-parser-test
-+endif
-
- check_PROGRAMS = \
- 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 += \
-+ 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
-
- XVFB_RUN=". $(srcdir)/run-xvfb.sh"
-
+++ /dev/null
-# 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.4 2011/01/06 15:36:34 dilfridge Exp $
-
-EAPI=2
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="https://launchpad.net/dbusmenu"
-SRC_URI="http://launchpad.net/dbusmenu/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk test"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/dbus-glib
- dev-libs/libxml2:2
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- test? ( dev-libs/json-glib )
- dev-util/intltool
- dev-util/pkgconfig"
-
-src_prepare() {
- # Make libdbusmenu-gtk library optional, launchpad-bug #552530
- epatch "${FILESDIR}/${P}-1-optional-gtk.patch"
- # Make tests optional, launchpad-bug #552526
- epatch "${FILESDIR}/${P}-2-optional-tests.patch"
- # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
- epatch "${FILESDIR}/${P}-no-gobject-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) \
- --disable-tests
- # tests disabled, bug 315217
- # $(use_enable test tests)
-}
-
-src_test() {
- emake check || die "testsuite failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS || die "dodoc failed"
-}
+++ /dev/null
-# 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=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="${ED}" install || die "make install failed"
- dodoc AUTHORS || die "dodoc failed"
-}
+++ /dev/null
-# 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.ebuild,v 1.2 2011/02/07 09:56:46 tampakrap Exp $
-
-EAPI=3
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="https://launchpad.net/dbusmenu"
-SRC_URI="http://launchpad.net/dbusmenu/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk +introspection test"
-
-# Needs running dbus and a program called "dbus-test-runner"
-RESTRICT="test"
-
-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/intltool
- dev-util/pkgconfig"
-
-src_prepare() {
- # Make libdbusmenu-gtk library optional, launchpad-bug #552530
- epatch "${FILESDIR}/${P}-optional-gtk.patch"
- # Make tests optional, launchpad-bug #552526
- epatch "${FILESDIR}/${P}-optional-tests.patch"
- # Try to make parallel-make safe, launchpad-bug #709762
- epatch "${FILESDIR}/${P}-parallel-make.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"
- # 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)
-}
-
-src_test() {
- emake check || die "testsuite failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS || die "dodoc failed"
-}
projects / gentoo.git / commitdiff