summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-11-25 22:12:51 +0100
committerChristoph Mende <angelos@gentoo.org>2011-11-25 22:12:51 +0100
commit39e3c449e2d9733fb533e9a4da6a9e1498429f41 (patch)
tree0aede6b74f133f0db2882a80a6656fb08205fd44 /dev-libs
parentscmpc: Add libmpdclient dependency (diff)
downloadangelos-39e3c449e2d9733fb533e9a4da6a9e1498429f41.tar.gz
angelos-39e3c449e2d9733fb533e9a4da6a9e1498429f41.tar.bz2
angelos-39e3c449e2d9733fb533e9a4da6a9e1498429f41.zip
Remove libdbusmenu
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libdbusmenu/Manifest24
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch8
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch68
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch55
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch59
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch20
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch135
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch129
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.4.4.ebuild79
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild79
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild79
-rw-r--r--dev-libs/libdbusmenu/metadata.xml9
12 files changed, 0 insertions, 744 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
deleted file mode 100644
index ad31f62..0000000
--- a/dev-libs/libdbusmenu/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX libdbusmenu-0.3.14-fix-aclocal.patch 201 RMD160 318e6abd0d997bcf2aee6fe869f87ef1571f521c SHA1 6dcf3e5a1b2ac26fec0e8655de965577b114dbc7 SHA256 9a872801a0d3c319abea5e789ebf47f7f302da8a864265623d20bd468c8326e5
-AUX libdbusmenu-0.3.14-optional-dumper.patch 1784 RMD160 3d6d322d58889e4419b2a07aa98b498cd8300d7c SHA1 5a57afbbabe2567e31a3872badb900fe24fd0dec SHA256 d182f8670d986ffdf1d0ade3c9b47d1fb8fdb41632755dfcfe0d1d696f584a96
-AUX libdbusmenu-0.3.16-optional-tests.patch 1530 RMD160 c19af1685c486d9899a8e6acc5f603264e9c1ae5 SHA1 4000509efe00902464e6dde83de312c89f8d5371 SHA256 24dd5aa18a1760b5df403c027b17b1896cb6b98748f4f459538e489297ede6ac
-AUX libdbusmenu-0.3.16-optional-vala.patch 1500 RMD160 3f180c443d3c734a2a0126385cdb03b90ce5f3fd SHA1 e84dadeea86767b5d9dc4b479465cc605afd1a49 SHA256 6fe47c788a6ba8496e52e5eb0410ae990a82a152cf94559b609f5037ad9a3225
-AUX libdbusmenu-0.3.94-decouple-testapp.patch 452 RMD160 d1b40ffc8d7cfbd181c8d1ce572a1f355902e0d3 SHA1 70a59fba59195835278f1946f4ecf398bead49de SHA256 1bc6ec38ae035466cf7db56efac359d19ebeabb90f6571c95d4e94af85f9574d
-AUX libdbusmenu-0.4.4-optional-gtk.patch 3772 RMD160 1a6049c1e24b6869eba85908123eef53cc3a87ad SHA1 3a1c24423fa34532da42b65221f4f8b5fbc93af9 SHA256 9d51fc010109a69e28cf8d05e1afa7a40685051f6fb1a79a84340ccb1407a0c5
-AUX libdbusmenu-0.4.90-optional-gtk.patch 3524 RMD160 4053f4f25c629494e744f4941c0bccf85cc07ddb SHA1 3692f1bd71cfe09c22aa016c7de08fe3dfc0f468 SHA256 3776c45fc1372f11264f366d2d05e0b1670d1173638540e313a050d2ebe9f637
-DIST libdbusmenu-0.4.4.tar.gz 1297118 RMD160 1bc6e31be2008fa2ec6842067b86d3e8beadddc6 SHA1 f94e06a16617a7ab704eb5d6a9a78165bcf37e32 SHA256 89c3b44cdda252717406152fac10f9845cbafbb55cf402e9361b341f6f6a64c6
-DIST libdbusmenu-0.4.5.tar.gz 1395039 RMD160 b5ea31328375a00b987d47049793cd09c6696b36 SHA1 53caeaf71378574cb8b0b48b3053a9a1f58356ef SHA256 4e8f00326f4bc51ab84cac276080f90070a0976099a5d305294e8f1c0d62add1
-DIST libdbusmenu-0.4.90.tar.gz 693434 RMD160 07853642047487622404c991d45c8c9e1c801073 SHA1 b82cd33bfc02e5293bf9e5dc00c35c26e8cb1e3c SHA256 c430d37036a1f08b3ae52114fcc95141f843e45e41e0ccf9270455d8eb6b457b
-EBUILD libdbusmenu-0.4.4.ebuild 2517 RMD160 34ba6d2e1346166aa87ba63facb20036a6944376 SHA1 560e3be03a42902d9b6a3d1e7d957199ba1ea786 SHA256 20e5880969f09a6e38edcca9004e3c152cfab8e0b6f6c56a342197362e06de66
-EBUILD libdbusmenu-0.4.5.ebuild 2524 RMD160 d92ae6c03be81e5ff8d01d7730e09d4e26ec3786 SHA1 63d5e5f05941c0a2eabc5123e0f466c531e1a04e SHA256 12748a60891c253e0098617c5783c90b58d165663474ca8eb93e17536a77c3a4
-EBUILD libdbusmenu-0.4.90.ebuild 2526 RMD160 9abb503bbc485ccef2cfe827c1c5fe8501979c3c SHA1 2458ca3e57cd451a4535811f8bdf295cf0be7f67 SHA256 9069f0a844ba2cabfbf57dc08bfd16f51597082ec10bb63a62e44cd439e8b389
-MISC metadata.xml 329 RMD160 ca3029bd8fece0ce6888b9689d554bf0ad4ed1dc SHA1 c8739c065cdaba2b7259fd44e8e6fc890efa1f37 SHA256 244b7f61aed94c089d2b5421c017ed225943c76eec8b1b20b536fd83fe58cd94
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk4d358ACgkQmWq1bYTyC0NRJgEAtLx+mGD2qtOgff8kIi3qT+Jn
-OScruknB2l5sGK3c6SQBAMkxQntSn2/BjwaEvq7xmc6VkTXsW3/QbHYWc7tmg/EK
-=scFm
------END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch 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 = -I m4
-+
- EXTRA_DIST = \
- COPYING.2.1 \
- COPYING-GPL3 \
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
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 @@
-
- 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
-
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.patch
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=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
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
- ###########################
-
-+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
-
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.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.patch
+++ /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 @@
-
--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)
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch
deleted file mode 100644
index 3d0fd4f..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.4.4-optional-gtk.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-commit 9fa1d7911a84e7bfbfe009567e16c89a08445ad3
-Author: Christoph Mende <mende.christoph@gmail.com>
-Date: Tue May 24 18:05:37 2011 +0200
-
- optional gtk
-
-diff --git a/Makefile.am b/Makefile.am
-index 81a2cbb..a69c377 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,9 +7,13 @@ if WANT_TESTS
- TESTS_SUBDIR = tests
- endif
-
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- libdbusmenu-glib \
-- libdbusmenu-gtk \
-+ $(LIBDBUSMENUGTK_SUBDIR) \
- tools \
- $(TESTS_SUBDIR) \
- docs \
-diff --git a/configure.ac b/configure.ac
-index 9e742c2..a7fa7f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,27 +58,37 @@ AC_SUBST(DBUSMENUGLIB_LIBS)
- 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)
-- AC_SUBST(DBUSMENUGTK_CFLAGS)
-- AC_SUBST(DBUSMENUGTK_LIBS)
-+ glib-2.0 >= $GLIB_REQUIRED_VERSION,
-+ [have_gtk=yes]
-+)
- 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)
-- AC_SUBST(DBUSMENUGTK_CFLAGS)
-- AC_SUBST(DBUSMENUGTK_LIBS)
-+ glib-2.0 >= $GLIB_REQUIRED_VERSION,
-+ [have_gtk=yes]
-+)
- ],
- [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
-@@ -228,3 +238,8 @@ AS_IF([test "x$have_tests" = "xyes"],
- AC_MSG_NOTICE([ Tests: no])
- )
-
-+AS_IF([test "x$enable_gtk" = "xyes"],
-+ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]),
-+ AC_MSG_NOTICE([ Gtk: no])
-+)
-+
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a2c0716..32e12ff 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -13,13 +13,17 @@ TESTS = \
- 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
-
- # The Python test only work on the system copy of
- # dbusmenu, so while they can be usefule they're not
-@@ -41,20 +45,24 @@ check_PROGRAMS = \
- 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"
-
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch
deleted file mode 100644
index 5a2a35b..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c2c0980..2fb4c84 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,9 +3,13 @@ EXTRA_DIST = \
- COPYING-GPL3 \
- m4/introspection.m4
-
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- libdbusmenu-glib \
-- libdbusmenu-gtk \
-+ $(LIBDBUSMENUGTK_SUBDIR) \
- tools \
- tests \
- docs \
-diff --git a/configure.ac b/configure.ac
-index 465d8bf..47ea915 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,27 +58,37 @@ AC_SUBST(DBUSMENUGLIB_LIBS)
- 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=3])
-+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)
-- AC_SUBST(DBUSMENUGTK_CFLAGS)
-- AC_SUBST(DBUSMENUGTK_LIBS)
-+ glib-2.0 >= $GLIB_REQUIRED_VERSION,
-+ [have_gtk=yes]
-+)
- 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)
-- AC_SUBST(DBUSMENUGTK_CFLAGS)
-- AC_SUBST(DBUSMENUGTK_LIBS)
-+ glib-2.0 >= $GLIB_REQUIRED_VERSION,
-+ [have_gtk=yes]
-+)
- ],
- [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
-@@ -199,3 +209,8 @@ libdbusmenu Configuration:
- GTK+ Version: $with_gtk
- ])
-
-+AS_IF([test "x$enable_gtk" = "xyes"],
-+ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]),
-+ AC_MSG_NOTICE([ Gtk: no])
-+)
-+
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a4763da..e6882af 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -13,13 +13,17 @@ TESTS = \
- 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
-
- XFAIL_TESTS = \
- test-glib-proxy
-@@ -44,20 +48,24 @@ check_PROGRAMS = \
- 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"
-
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.4.4.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.4.4.ebuild
deleted file mode 100644
index bb74532..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.4.4.ebuild
+++ /dev/null
@@ -1,79 +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=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.10 )
- 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}/${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}/${PN}-0.3.94-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() {
- VALA_API_GEN=$(type -p vapigen-0.10) \
- 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"
-}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild
deleted file mode 100644
index 7633871..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild
+++ /dev/null
@@ -1,79 +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=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.10 )
- 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}/${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}/${PN}-0.4.4-optional-gtk.patch"
- # Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
- epatch "${FILESDIR}/${PN}-0.3.94-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() {
- VALA_API_GEN=$(type -p vapigen-0.10) \
- 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"
-}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild
deleted file mode 100644
index e3e983a..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild
+++ /dev/null
@@ -1,79 +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=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-0.13.4[introspection=]
- dev-util/dbus-test-runner
- )
- vala? ( dev-lang/vala:0.12 )
- 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}/${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}/${PN}-0.3.94-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() {
- VALA_API_GEN=$(type -p vapigen-0.12) \
- 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"
-}
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
deleted file mode 100644
index f72a4b5..0000000
--- a/dev-libs/libdbusmenu/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kde</herd>
- <use>
- <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
- <flag name="vala">Enable bindings for dev-lang/vala</flag>
- </use>
-</pkgmetadata>