| 1 |
commit: 24041512a56cb3543ecd76770a2155288684e2fc |
| 2 |
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de> |
| 3 |
AuthorDate: Tue Nov 1 22:22:29 2011 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 1 22:22:29 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=24041512 |
| 7 |
|
| 8 |
[dev-libs/libdbusmenu] Moved to main tree |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/libdbusmenu-0.3.14-fix-aclocal.patch | 8 -- |
| 12 |
.../files/libdbusmenu-0.3.14-optional-dumper.patch | 68 ----------- |
| 13 |
.../files/libdbusmenu-0.3.16-optional-tests.patch | 55 --------- |
| 14 |
.../files/libdbusmenu-0.3.16-optional-vala.patch | 59 ---------- |
| 15 |
.../libdbusmenu-0.3.94-decouple-testapp.patch | 20 ---- |
| 16 |
.../libdbusmenu-0.3.94-fix-introspection.patch | 11 -- |
| 17 |
.../files/libdbusmenu-0.3.94-optional-gtk.patch | 119 -------------------- |
| 18 |
dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild | 86 -------------- |
| 19 |
dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild | 62 ---------- |
| 20 |
dev-libs/libdbusmenu/metadata.xml | 10 -- |
| 21 |
10 files changed, 0 insertions(+), 498 deletions(-) |
| 22 |
|
| 23 |
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 |
| 24 |
deleted file mode 100644 |
| 25 |
index d4fdcaa..0000000 |
| 26 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch |
| 27 |
+++ /dev/null |
| 28 |
@@ -1,8 +0,0 @@ |
| 29 |
---- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
| 30 |
-+++ Makefile.am 2010-09-20 22:21:12.976592367 +0200 |
| 31 |
-@@ -1,3 +1,5 @@ |
| 32 |
-+ACLOCAL_AMFLAGS = -I m4 |
| 33 |
-+ |
| 34 |
- EXTRA_DIST = \ |
| 35 |
- COPYING.2.1 \ |
| 36 |
- COPYING-GPL3 \ |
| 37 |
|
| 38 |
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 |
| 39 |
deleted file mode 100644 |
| 40 |
index 644c799..0000000 |
| 41 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,68 +0,0 @@ |
| 44 |
---- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
| 45 |
-+++ configure.ac 2010-09-20 22:05:38.292979567 +0200 |
| 46 |
-@@ -63,8 +63,17 @@ |
| 47 |
- |
| 48 |
- X11_REQUIRED_VERSION=1.3 |
| 49 |
- |
| 50 |
-+AC_ARG_ENABLE([dumper], |
| 51 |
-+ AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), |
| 52 |
-+ [enable_dumper=$enableval], [enable_dumper=auto]) |
| 53 |
-+AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) |
| 54 |
-+ |
| 55 |
-+AS_IF([test "x$enable_dumper" != "xno"],[ |
| 56 |
- PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
| 57 |
-- x11 >= $X11_REQUIRED_VERSION) |
| 58 |
-+ x11 >= $X11_REQUIRED_VERSION, |
| 59 |
-+ [have_dumper=yes] |
| 60 |
-+) |
| 61 |
-+]) |
| 62 |
- |
| 63 |
- AC_SUBST(DBUSMENUDUMPER_CFLAGS) |
| 64 |
- AC_SUBST(DBUSMENUDUMPER_LIBS) |
| 65 |
-@@ -193,1 +193,6 @@ |
| 66 |
- |
| 67 |
-+AS_IF([test "x$have_dumper" = "xyes"], |
| 68 |
-+ AC_MSG_NOTICE([ Dumper: yes]), |
| 69 |
-+ AC_MSG_NOTICE([ Dumper: no]) |
| 70 |
-+) |
| 71 |
-+ |
| 72 |
---- tools/Makefile.am.orig 2010-09-20 22:02:07.280175897 +0200 |
| 73 |
-+++ tools/Makefile.am 2010-09-20 22:05:15.621664358 +0200 |
| 74 |
-@@ -3,5 +3,9 @@ |
| 75 |
- |
| 76 |
--libexec_PROGRAMS = dbusmenu-dumper |
| 77 |
-+libexec_PROGRAMS = |
| 78 |
-+ |
| 79 |
-+if WANT_DBUSMENUDUMPER |
| 80 |
-+libexec_PROGRAMS += dbusmenu-dumper |
| 81 |
-+endif |
| 82 |
- |
| 83 |
- libexec_SCRIPTS = dbusmenu-bench |
| 84 |
- |
| 85 |
---- tests/Makefile.am.orig 2011-02-07 00:01:11.066461559 +0100 |
| 86 |
-+++ tests/Makefile.am 2011-02-07 00:02:33.487751202 +0100 |
| 87 |
-@@ -10,6 +10,10 @@ |
| 88 |
- test-glib-properties \ |
| 89 |
- test-glib-proxy \ |
| 90 |
- test-glib-simple-items \ |
| 91 |
-- test-glib-submenu \ |
| 92 |
-+ test-glib-submenu |
| 93 |
-+ |
| 94 |
-+if WANT_DBUSMENUDUMPER |
| 95 |
-+TESTS += \ |
| 96 |
- test-json |
| 97 |
-+endif |
| 98 |
- |
| 99 |
-@@ -36,7 +40,11 @@ |
| 100 |
- test-glib-proxy-proxy \ |
| 101 |
- test-glib-submenu-client \ |
| 102 |
- test-glib-submenu-server \ |
| 103 |
-- test-glib-simple-items \ |
| 104 |
-+ test-glib-simple-items |
| 105 |
-+ |
| 106 |
-+if WANT_DBUSMENUDUMPER |
| 107 |
-+check_PROGRAMS += \ |
| 108 |
- test-json-client \ |
| 109 |
- test-json-server |
| 110 |
-+endif |
| 111 |
- |
| 112 |
|
| 113 |
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 |
| 114 |
deleted file mode 100644 |
| 115 |
index e047cd8..0000000 |
| 116 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch |
| 117 |
+++ /dev/null |
| 118 |
@@ -1,55 +0,0 @@ |
| 119 |
---- configure.ac.orig 2010-09-20 21:51:50.289828895 +0200 |
| 120 |
-+++ configure.ac 2010-09-20 22:01:21.623107607 +0200 |
| 121 |
-@@ -76,8 +76,17 @@ |
| 122 |
- JSON_GLIB_REQUIRED_VERSION=0.6.0 |
| 123 |
- GIO_UNIX_REQUIRED_VERSION=2.24 |
| 124 |
- |
| 125 |
-+AC_ARG_ENABLE([tests], |
| 126 |
-+ AC_HELP_STRING([--disable-tests], [Disable tests]), |
| 127 |
-+ [enable_tests=$enableval], [enable_tests=auto]) |
| 128 |
-+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) |
| 129 |
-+ |
| 130 |
-+AS_IF([test "x$enable_tests" != "xno"],[ |
| 131 |
- PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION |
| 132 |
-- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) |
| 133 |
-+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, |
| 134 |
-+ [have_tests=yes] |
| 135 |
-+) |
| 136 |
-+]) |
| 137 |
- |
| 138 |
- AC_SUBST(DBUSMENUTESTS_CFLAGS) |
| 139 |
- AC_SUBST(DBUSMENUTESTS_LIBS) |
| 140 |
-@@ -193,1 +193,6 @@ |
| 141 |
- |
| 142 |
-+AS_IF([test "x$have_tests" = "xyes"], |
| 143 |
-+ AC_MSG_NOTICE([ Tests: yes]), |
| 144 |
-+ AC_MSG_NOTICE([ Tests: no]) |
| 145 |
-+) |
| 146 |
-+ |
| 147 |
---- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
| 148 |
-+++ Makefile.am 2010-09-20 22:01:55.525674385 +0200 |
| 149 |
-@@ -5,2 +5,6 @@ |
| 150 |
- |
| 151 |
-+if WANT_TESTS |
| 152 |
-+TESTS_SUBDIR = tests |
| 153 |
-+endif |
| 154 |
-+ |
| 155 |
- SUBDIRS = \ |
| 156 |
-@@ -9,3 +9,3 @@ |
| 157 |
- tools \ |
| 158 |
-- tests \ |
| 159 |
-+ $(TESTS_SUBDIR) \ |
| 160 |
- docs \ |
| 161 |
---- tools/testapp/Makefile.am.orig 2011-01-29 13:42:00.984605528 +0100 |
| 162 |
-+++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100 |
| 163 |
-@@ -1,5 +1,9 @@ |
| 164 |
- |
| 165 |
--libexec_PROGRAMS = dbusmenu-testapp |
| 166 |
-+libexec_PROGRAMS = |
| 167 |
-+ |
| 168 |
-+if WANT_TESTS |
| 169 |
-+libexec_PROGRAMS += dbusmenu-testapp |
| 170 |
-+endif |
| 171 |
- |
| 172 |
- dbusmenu_testapp_SOURCES = \ |
| 173 |
- main.c |
| 174 |
|
| 175 |
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 |
| 176 |
deleted file mode 100644 |
| 177 |
index 72fcd57..0000000 |
| 178 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch |
| 179 |
+++ /dev/null |
| 180 |
@@ -1,59 +0,0 @@ |
| 181 |
---- configure.ac.orig 2011-02-05 15:01:31.212827464 +0100 |
| 182 |
-+++ configure.ac 2011-02-05 15:13:08.310031260 +0100 |
| 183 |
-@@ -143,7 +143,17 @@ |
| 184 |
- # Vala API Generation |
| 185 |
- ########################### |
| 186 |
- |
| 187 |
-+AC_ARG_ENABLE([vala], |
| 188 |
-+ AC_HELP_STRING([--disable-vala], [Disable vala]), |
| 189 |
-+ [enable_vala=$enableval], [enable_vala=auto]) |
| 190 |
-+ |
| 191 |
-+AS_IF([test "x$enable_vala" != "xno"],[ |
| 192 |
-+ AM_COND_IF([HAVE_INTROSPECTION],,[ |
| 193 |
-+ AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) |
| 194 |
-+ ]) |
| 195 |
- AC_PATH_PROG([VALA_API_GEN], [vapigen]) |
| 196 |
-+]) |
| 197 |
-+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) |
| 198 |
- |
| 199 |
- ########################### |
| 200 |
- # XSLT Processor |
| 201 |
-@@ -193,1 +193,6 @@ |
| 202 |
- |
| 203 |
-+AM_COND_IF([HAVE_VALA], |
| 204 |
-+ AC_MSG_NOTICE([ Vala bindings: yes]), |
| 205 |
-+ AC_MSG_NOTICE([ Vala bindings no]) |
| 206 |
-+) |
| 207 |
-+ |
| 208 |
---- libdbusmenu-gtk/Makefile.am.orig 2011-02-05 15:09:06.429965757 +0100 |
| 209 |
-+++ libdbusmenu-gtk/Makefile.am 2011-02-05 15:08:14.742722310 +0100 |
| 210 |
-@@ -131,6 +131,7 @@ |
| 211 |
- # VAPI Files |
| 212 |
- ######################### |
| 213 |
- |
| 214 |
-+if HAVE_VALA |
| 215 |
- if HAVE_INTROSPECTION |
| 216 |
- |
| 217 |
- vapidir = $(datadir)/vala/vapi |
| 218 |
-@@ -154,4 +155,5 @@ |
| 219 |
- CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir |
| 220 |
- |
| 221 |
- endif |
| 222 |
-+endif |
| 223 |
- |
| 224 |
---- libdbusmenu-glib/Makefile.am.orig 2011-02-05 15:08:49.613538681 +0100 |
| 225 |
-+++ libdbusmenu-glib/Makefile.am 2011-02-05 15:06:23.826443241 +0100 |
| 226 |
-@@ -165,6 +165,7 @@ |
| 227 |
- # VAPI Files |
| 228 |
- ######################### |
| 229 |
- |
| 230 |
-+if HAVE_VALA |
| 231 |
- if HAVE_INTROSPECTION |
| 232 |
- |
| 233 |
- vapidir = $(datadir)/vala/vapi |
| 234 |
-@@ -176,4 +177,5 @@ |
| 235 |
- CLEANFILES += $(vapi_DATA) |
| 236 |
- |
| 237 |
- endif |
| 238 |
-+endif |
| 239 |
- |
| 240 |
|
| 241 |
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 |
| 242 |
deleted file mode 100644 |
| 243 |
index 64812a4..0000000 |
| 244 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch |
| 245 |
+++ /dev/null |
| 246 |
@@ -1,20 +0,0 @@ |
| 247 |
---- tools/testapp/Makefile.am.orig 2011-01-29 20:50:54.266939219 +0100 |
| 248 |
-+++ tools/testapp/Makefile.am 2011-01-29 20:51:16.185268917 +0100 |
| 249 |
-@@ -1,10 +1,4 @@ |
| 250 |
- |
| 251 |
--if USE_GTK3 |
| 252 |
--VER=3 |
| 253 |
--else |
| 254 |
--VER= |
| 255 |
--endif |
| 256 |
-- |
| 257 |
- libexec_PROGRAMS = |
| 258 |
- |
| 259 |
- if WANT_TESTS |
| 260 |
-@@ -22,6 +16,4 @@ |
| 261 |
- |
| 262 |
- dbusmenu_testapp_LDADD = \ |
| 263 |
- $(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \ |
| 264 |
-- $(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \ |
| 265 |
-- $(DBUSMENUGTK_LIBS) \ |
| 266 |
- $(DBUSMENUTESTS_LIBS) |
| 267 |
|
| 268 |
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 |
| 269 |
deleted file mode 100644 |
| 270 |
index a259942..0000000 |
| 271 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch |
| 272 |
+++ /dev/null |
| 273 |
@@ -1,11 +0,0 @@ |
| 274 |
---- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:16:34.481082458 +0100 |
| 275 |
-+++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:20:31.703396315 +0100 |
| 276 |
-@@ -138,7 +138,7 @@ |
| 277 |
- |
| 278 |
- introspection_sources = $(libdbusmenu_glibinclude_HEADERS) |
| 279 |
- |
| 280 |
--Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la |
| 281 |
-+Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la |
| 282 |
- Dbusmenu_Glib_0_4_gir_INCLUDES = \ |
| 283 |
- GObject-2.0 |
| 284 |
- Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir) |
| 285 |
|
| 286 |
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 |
| 287 |
deleted file mode 100644 |
| 288 |
index e178447..0000000 |
| 289 |
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch |
| 290 |
+++ /dev/null |
| 291 |
@@ -1,119 +0,0 @@ |
| 292 |
---- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100 |
| 293 |
-+++ configure.ac 2011-01-29 20:42:10.969923186 +0100 |
| 294 |
-@@ -58,29 +58,39 @@ |
| 295 |
- GTK_REQUIRED_VERSION=2.16 |
| 296 |
- GTK3_REQUIRED_VERSION=2.91 |
| 297 |
- |
| 298 |
-+AC_ARG_ENABLE([gtk], |
| 299 |
-+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), |
| 300 |
-+ [enable_gtk=$enableval], [enable_gtk=auto]) |
| 301 |
-+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) |
| 302 |
-+ |
| 303 |
- AC_ARG_WITH([gtk], |
| 304 |
- [AS_HELP_STRING([--with-gtk], |
| 305 |
- [Which version of gtk to use @<:@default=2@:>@])], |
| 306 |
- [], |
| 307 |
- [with_gtk=2]) |
| 308 |
-+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) |
| 309 |
-+ |
| 310 |
-+AS_IF([test "x$enable_gtk" != "xno"],[ |
| 311 |
- AS_IF([test "x$with_gtk" = x3], |
| 312 |
- [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION |
| 313 |
- glib-2.0 >= $GLIB_REQUIRED_VERSION |
| 314 |
-- libxml-2.0 >= $XML_REQUIRED_VERSION) |
| 315 |
-+ libxml-2.0 >= $XML_REQUIRED_VERSION, |
| 316 |
-+ [have_gtk=yes] |
| 317 |
-+) |
| 318 |
-- AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 319 |
-- AC_SUBST(DBUSMENUGTK_LIBS) |
| 320 |
- AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) |
| 321 |
- ], |
| 322 |
- [test "x$with_gtk" = x2], |
| 323 |
- [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
| 324 |
- glib-2.0 >= $GLIB_REQUIRED_VERSION |
| 325 |
-- libxml-2.0 >= $XML_REQUIRED_VERSION) |
| 326 |
-+ libxml-2.0 >= $XML_REQUIRED_VERSION, |
| 327 |
-+ [have_gtk=yes] |
| 328 |
-+) |
| 329 |
-- AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 330 |
-- AC_SUBST(DBUSMENUGTK_LIBS) |
| 331 |
- ], |
| 332 |
- [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] |
| 333 |
- ) |
| 334 |
--AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) |
| 335 |
-+]) |
| 336 |
-+AC_SUBST(DBUSMENUGTK_CFLAGS) |
| 337 |
-+AC_SUBST(DBUSMENUGTK_LIBS) |
| 338 |
- |
| 339 |
- ########################### |
| 340 |
- # Dependencies - dumper |
| 341 |
-@@ -193,1 +193,6 @@ |
| 342 |
- |
| 343 |
-+AS_IF([test "x$enable_gtk" = "xyes"], |
| 344 |
-+ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]), |
| 345 |
-+ AC_MSG_NOTICE([ Gtk: no]) |
| 346 |
-+) |
| 347 |
-+ |
| 348 |
---- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200 |
| 349 |
-+++ Makefile.am 2010-09-20 21:59:23.492035983 +0200 |
| 350 |
-@@ -5,5 +5,9 @@ |
| 351 |
- |
| 352 |
-+if WANT_LIBDBUSMENUGTK |
| 353 |
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk |
| 354 |
-+endif |
| 355 |
-+ |
| 356 |
- SUBDIRS = \ |
| 357 |
- libdbusmenu-glib \ |
| 358 |
-- libdbusmenu-gtk \ |
| 359 |
-+ $(LIBDBUSMENUGTK_SUBDIR) \ |
| 360 |
- tools \ |
| 361 |
---- tests/Makefile.am.orig 2011-01-29 20:47:16.721588701 +0100 |
| 362 |
-+++ tests/Makefile.am 2011-01-29 20:45:10.116455527 +0100 |
| 363 |
-@@ -11,13 +11,17 @@ |
| 364 |
- test-glib-proxy \ |
| 365 |
- test-glib-simple-items \ |
| 366 |
- test-glib-submenu \ |
| 367 |
-- test-json \ |
| 368 |
-+ test-json |
| 369 |
-+ |
| 370 |
-+if WANT_LIBDBUSMENUGTK |
| 371 |
-+TESTS += \ |
| 372 |
- test-gtk-objects-test \ |
| 373 |
- test-gtk-label \ |
| 374 |
- test-gtk-shortcut \ |
| 375 |
- test-gtk-reorder \ |
| 376 |
- test-gtk-submenu \ |
| 377 |
- test-gtk-parser-test |
| 378 |
-+endif |
| 379 |
- |
| 380 |
- check_PROGRAMS = \ |
| 381 |
- glib-server-nomenu \ |
| 382 |
-@@ -31,20 +35,24 @@ |
| 383 |
- test-glib-proxy-client \ |
| 384 |
- test-glib-proxy-server \ |
| 385 |
- test-glib-proxy-proxy \ |
| 386 |
-- test-gtk-objects \ |
| 387 |
- test-glib-submenu-client \ |
| 388 |
- test-glib-submenu-server \ |
| 389 |
-+ test-glib-simple-items \ |
| 390 |
-+ test-json-client \ |
| 391 |
-+ test-json-server |
| 392 |
-+ |
| 393 |
-+if WANT_LIBDBUSMENUGTK |
| 394 |
-+check_PROGRAMS += \ |
| 395 |
-+ test-gtk-objects \ |
| 396 |
- test-gtk-label-client \ |
| 397 |
- test-gtk-label-server \ |
| 398 |
- test-gtk-shortcut-client \ |
| 399 |
- test-gtk-shortcut-server \ |
| 400 |
-- test-glib-simple-items \ |
| 401 |
- test-gtk-reorder-server \ |
| 402 |
-- test-json-client \ |
| 403 |
-- test-json-server \ |
| 404 |
- test-gtk-submenu-server \ |
| 405 |
- test-gtk-submenu-client \ |
| 406 |
- test-gtk-parser |
| 407 |
-+endif |
| 408 |
- |
| 409 |
- XVFB_RUN=". $(srcdir)/run-xvfb.sh" |
| 410 |
- |
| 411 |
|
| 412 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild |
| 413 |
deleted file mode 100644 |
| 414 |
index 11eda14..0000000 |
| 415 |
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild |
| 416 |
+++ /dev/null |
| 417 |
@@ -1,86 +0,0 @@ |
| 418 |
-# Copyright 1999-2011 Gentoo Foundation |
| 419 |
-# Distributed under the terms of the GNU General Public License v2 |
| 420 |
-# $Header: $ |
| 421 |
- |
| 422 |
-EAPI=4 |
| 423 |
- |
| 424 |
-inherit autotools eutils versionator virtualx |
| 425 |
- |
| 426 |
-MY_MAJOR_VERSION="$(get_version_component_range 1-2)" |
| 427 |
-if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then |
| 428 |
- MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))" |
| 429 |
-fi |
| 430 |
- |
| 431 |
-DESCRIPTION="Library to pass menu structure across DBus" |
| 432 |
-HOMEPAGE="https://launchpad.net/dbusmenu" |
| 433 |
-SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz" |
| 434 |
- |
| 435 |
-LICENSE="LGPL-3" |
| 436 |
-SLOT="0" |
| 437 |
-KEYWORDS="~amd64 ~x86" |
| 438 |
-IUSE="gtk gtk3 +introspection test vala" |
| 439 |
- |
| 440 |
-RDEPEND="dev-libs/glib:2 |
| 441 |
- dev-libs/dbus-glib |
| 442 |
- dev-libs/libxml2:2 |
| 443 |
- gtk? ( |
| 444 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 445 |
- !gtk3? ( x11-libs/gtk+:2 ) |
| 446 |
- )" |
| 447 |
-DEPEND="${RDEPEND} |
| 448 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) |
| 449 |
- test? ( |
| 450 |
- dev-libs/json-glib[introspection=] |
| 451 |
- dev-util/dbus-test-runner |
| 452 |
- ) |
| 453 |
- vala? ( dev-lang/vala:0 ) |
| 454 |
- dev-util/intltool |
| 455 |
- dev-util/pkgconfig" |
| 456 |
- |
| 457 |
-pkg_setup() { |
| 458 |
- if use vala && use !introspection ; then |
| 459 |
- eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)" |
| 460 |
- die "Vala bindings (USE=vala) require introspection support (USE=introspection)" |
| 461 |
- fi |
| 462 |
-} |
| 463 |
- |
| 464 |
-src_prepare() { |
| 465 |
- # Make tests optional, launchpad-bug #713685 |
| 466 |
- epatch "${FILESDIR}/${PN}-0.3.16-optional-vala.patch" |
| 467 |
- # Make tests optional, launchpad-bug #552526 |
| 468 |
- epatch "${FILESDIR}/${PN}-0.3.16-optional-tests.patch" |
| 469 |
- # Make libdbusmenu-gtk library optional, launchpad-bug #552530 |
| 470 |
- epatch "${FILESDIR}/${P}-optional-gtk.patch" |
| 471 |
- # Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761 |
| 472 |
- epatch "${FILESDIR}/${P}-decouple-testapp.patch" |
| 473 |
- # Make dbusmenudumper optional, launchpad-bug #643871 |
| 474 |
- epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch" |
| 475 |
- # Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538 |
| 476 |
- epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch" |
| 477 |
- # Fix introspection generation, launchpad-bug #713690 |
| 478 |
- epatch "${FILESDIR}/${P}-fix-introspection.patch" |
| 479 |
- # Drop -Werror in a release |
| 480 |
- sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed" |
| 481 |
- eautoreconf |
| 482 |
-} |
| 483 |
- |
| 484 |
-src_configure() { |
| 485 |
- local conf |
| 486 |
- if use gtk3 ; then |
| 487 |
- conf="${conf} --with-gtk=3" |
| 488 |
- else |
| 489 |
- conf="${conf} --with-gtk=2" |
| 490 |
- fi |
| 491 |
- |
| 492 |
- econf \ |
| 493 |
- $(use_enable gtk) \ |
| 494 |
- $(use_enable gtk dumper) \ |
| 495 |
- $(use_enable introspection) \ |
| 496 |
- $(use_enable test tests) \ |
| 497 |
- $(use_enable vala) \ |
| 498 |
- ${conf} |
| 499 |
-} |
| 500 |
- |
| 501 |
-src_test() { |
| 502 |
- Xemake check |
| 503 |
-} |
| 504 |
|
| 505 |
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild |
| 506 |
deleted file mode 100644 |
| 507 |
index b8366e4..0000000 |
| 508 |
--- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild |
| 509 |
+++ /dev/null |
| 510 |
@@ -1,62 +0,0 @@ |
| 511 |
-# Copyright 1999-2011 Gentoo Foundation |
| 512 |
-# Distributed under the terms of the GNU General Public License v2 |
| 513 |
-# $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 $ |
| 514 |
- |
| 515 |
-EAPI=3 |
| 516 |
- |
| 517 |
-inherit autotools eutils versionator virtualx |
| 518 |
- |
| 519 |
-MY_MAJOR_VERSION="$(get_version_component_range 1-2)" |
| 520 |
-if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then |
| 521 |
- MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))" |
| 522 |
-fi |
| 523 |
- |
| 524 |
-DESCRIPTION="Library to pass menu structure across DBus" |
| 525 |
-HOMEPAGE="https://launchpad.net/dbusmenu" |
| 526 |
-SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz" |
| 527 |
- |
| 528 |
-LICENSE="LGPL-3" |
| 529 |
-SLOT="0" |
| 530 |
-KEYWORDS="~amd64 ~x86" |
| 531 |
-IUSE="gtk +introspection test vala" |
| 532 |
- |
| 533 |
-RDEPEND="dev-libs/glib:2 |
| 534 |
- dev-libs/dbus-glib |
| 535 |
- dev-libs/libxml2:2 |
| 536 |
- gtk? ( x11-libs/gtk+:2 )" |
| 537 |
-DEPEND="${RDEPEND} |
| 538 |
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) |
| 539 |
- test? ( |
| 540 |
- dev-libs/json-glib[introspection=] |
| 541 |
- dev-util/dbus-test-runner |
| 542 |
- ) |
| 543 |
- vala? ( dev-lang/vala:0.10 ) |
| 544 |
- dev-util/intltool |
| 545 |
- dev-util/pkgconfig" |
| 546 |
- |
| 547 |
-pkg_setup() { |
| 548 |
- if use vala && use !introspection ; then |
| 549 |
- eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)" |
| 550 |
- die "Vala bindings (USE=vala) require introspection support (USE=introspection)" |
| 551 |
- fi |
| 552 |
-} |
| 553 |
- |
| 554 |
-src_configure() { |
| 555 |
- VALA_API_GEN=$(type -p vapigen-0.10) \ |
| 556 |
- econf \ |
| 557 |
- --with-gtk=2 \ |
| 558 |
- $(use_enable gtk) \ |
| 559 |
- $(use_enable gtk dumper) \ |
| 560 |
- $(use_enable introspection) \ |
| 561 |
- $(use_enable test tests) \ |
| 562 |
- $(use_enable vala) |
| 563 |
-} |
| 564 |
- |
| 565 |
-src_test() { |
| 566 |
- Xemake check || die "testsuite failed" |
| 567 |
-} |
| 568 |
- |
| 569 |
-src_install() { |
| 570 |
- emake DESTDIR="${ED}" install || die "make install failed" |
| 571 |
- dodoc AUTHORS || die "dodoc failed" |
| 572 |
-} |
| 573 |
|
| 574 |
diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml |
| 575 |
deleted file mode 100644 |
| 576 |
index bb3e5c1..0000000 |
| 577 |
--- a/dev-libs/libdbusmenu/metadata.xml |
| 578 |
+++ /dev/null |
| 579 |
@@ -1,10 +0,0 @@ |
| 580 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 581 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 582 |
-<pkgmetadata> |
| 583 |
- <herd>kde</herd> |
| 584 |
- <use> |
| 585 |
- <flag name="gtk3">Build experimental gtk3 version instead of using gtk2</flag> |
| 586 |
- <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag> |
| 587 |
- <flag name="vala">Enable bindings for dev-lang/vala</flag> |
| 588 |
- </use> |
| 589 |
-</pkgmetadata> |
Archives