aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-11-01 23:22:29 +0100
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-11-01 23:22:29 +0100
commit24041512a56cb3543ecd76770a2155288684e2fc (patch)
treef2a978600f14572196a3d8a4d0ed0432de2bea8d /dev-libs
parent[dev-libs/libdbusmenu] Version bump (diff)
downloadkde-24041512a56cb3543ecd76770a2155288684e2fc.tar.gz
kde-24041512a56cb3543ecd76770a2155288684e2fc.tar.bz2
kde-24041512a56cb3543ecd76770a2155288684e2fc.zip
[dev-libs/libdbusmenu] Moved to main tree
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libdbusmenu/Manifest32
-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.3.94-fix-introspection.patch11
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch119
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild86
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild62
-rw-r--r--dev-libs/libdbusmenu/metadata.xml10
11 files changed, 0 insertions, 530 deletions
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
deleted file mode 100644
index 71ad699056..0000000000
--- a/dev-libs/libdbusmenu/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-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.3.94-fix-introspection.patch 440 RMD160 c3f88647e841352a8458d225c69128b8f74fdcca SHA1 45ee137cc519dce56bbd59d0ce9ba3975c6719ad SHA256 1bf6efc1150e42bfda680678e7ef926f6aa50bd3d4e9854c877cdcf8a61762ee
-AUX libdbusmenu-0.3.94-optional-gtk.patch 3490 RMD160 4946bbd0d3d8dd5d2ff48708db30a6016763ca02 SHA1 31247718c60e227070de822c9c02bc17a3343261 SHA256 93b222e233ab1b31de1f670d69c39530b45e0fdb04845fce1ea29a4e4f26ade2
-DIST libdbusmenu-0.3.94.tar.gz 614544 RMD160 5ede1948800fd2cf1721ff70f950c52865a78bd4 SHA1 9b06ac06c5d4248ce9e33d0c797c5b9c5b5d1ba7 SHA256 8cc600632ed894ba26d624cc9ad375da63bfed01f665ab6e2e2299567c6d95e5
-DIST libdbusmenu-0.5.1.tar.gz 701014 RMD160 9e47d804bb19b84de7a4c3140f12a417c7260624 SHA1 fb8b4c382aae19a037a625ba85684e8f6c02f01c SHA256 932d26fe29634ea465f2fb861b80ecafeaf0d5f898cdc35b3379b046ad5b2812
-EBUILD libdbusmenu-0.3.94-r2.ebuild 2469 RMD160 aeb38c4ef60c72f2b6933ac7ece64b8649e57a9b SHA1 64ce954fdcd7775bc2f09d9164d6a676d0b1eaf4 SHA256 e318cdb13ca25bc40a9f5593804228e01119a7c08ed112fb62573f5c6105c47a
-EBUILD libdbusmenu-0.5.1.ebuild 1700 RMD160 d501133f2c2c08b96cfdb618f0305589b88bb534 SHA1 71bc0d25c2956f607e8f5ab2b4e9d459c3195b30 SHA256 87891f7fe0ee287bb05e499f25464694494b90fe79743c59759151c3641a4ea9
-MISC metadata.xml 409 RMD160 2ee443faa26b15e8e12281faee55e2b160768745 SHA1 220966ab3109ae2969566a0c3ac8d1e1cda4fe18 SHA256 75ac27fadab34b1d697a2d610678d4f990077f3b50f76a23b37e2a776ec9bc18
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOsGosAAoJENwGBM22xffeMUEP/0n+kqls9Op9uh/GUy6+jVf0
-QJwNS2FsGOwcJzQ8dOdAzV9KGrHkLaWfnUOlUKF1ESxkVsGm3svc0ZN2oxXfayjD
-/PN+Y+hgOBNbP2G3CprwNFzuDSONY5eG+E265PRUnyIwCu7rnf/P4+33OR6S7rcf
-XIgMjLcAP+NzPeYL+axUKa/twU1r4BIRPlyE0eWd3L4OuiEn3/SFmY8yT1pTyzvp
-tpd3XKhYdhnhDpn8Q85LXyOeC5KhJEsq24aEWin4NYoPFeKNi3RzwV1VkCyKyQt6
-cwoKIh8uby8I4VXLjE3nra9ga+2IIbvY4m0bUS1JSEq09gwJs96JvpNVWdKiWEca
-uy6LDRuOVo6W3jgm+8O2aOqQxO7B3jqaTgNpv9ZP9XCRJql7F97SCoWVDkQ4lwjx
-NAptTMbJQ9GOmA6oTTT1V/pzrF1+gvsmKd6SNFIh6K2qHYqUitZOoDWsqizinDDx
-YuABRq3pFDfxgKm+5htLE3xA0Op3Q6AVkfXll2HzmFCV/g8CD0EHlzcxakMfB1fm
-KuFNlFoJ6+U7htJvXr2+3Db9sJq14PIHI8vgd7VOLap4pFm3JILavmtSuX58yTpT
-LisI5i9ZtM1ykd9OAvL1WOxOYAeFBjO/AYIo/7p5MN0yn7KdK5ClpjK7+M1s/5LZ
-IjtEZr0n63DL9fLbRr3G
-=RQ2P
------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 d4fdcaaecf..0000000000
--- 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 644c799eda..0000000000
--- 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 e047cd83bf..0000000000
--- 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 72fcd57d19..0000000000
--- 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 64812a4001..0000000000
--- 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.3.94-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
deleted file mode 100644
index a259942536..0000000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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)
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
deleted file mode 100644
index e178447f7a..0000000000
--- 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=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"
-
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 11eda14c2e..0000000000
--- 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=4
-
-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 gtk3 +introspection test vala"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/dbus-glib
- dev-libs/libxml2:2
- gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( 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 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/Makefile.am || die "sed failed"
- eautoreconf
-}
-
-src_configure() {
- local conf
- if use gtk3 ; then
- conf="${conf} --with-gtk=3"
- else
- conf="${conf} --with-gtk=2"
- 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/libdbusmenu/libdbusmenu-0.5.1.ebuild
deleted file mode 100644
index b8366e424f..0000000000
--- 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=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_configure() {
- VALA_API_GEN=$(type -p vapigen-0.10) \
- econf \
- --with-gtk=2 \
- $(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 bb3e5c11a2..0000000000
--- a/dev-libs/libdbusmenu/metadata.xml
+++ /dev/null
@@ -1,10 +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="gtk3">Build experimental gtk3 version instead of using gtk2</flag>
- <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
- <flag name="vala">Enable bindings for dev-lang/vala</flag>
- </use>
-</pkgmetadata>