diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-11-13 13:12:27 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-11-13 13:12:27 +0000 |
commit | e0e13ea43945cb0f678f1511ae7a8ca883cf2ed7 (patch) | |
tree | 4bc0bb72913e2ff1c5043c3780fe6d54601685f3 /gnome-base | |
parent | Drop old (#508854) (diff) | |
download | gentoo-2-e0e13ea43945cb0f678f1511ae7a8ca883cf2ed7.tar.gz gentoo-2-e0e13ea43945cb0f678f1511ae7a8ca883cf2ed7.tar.bz2 gentoo-2-e0e13ea43945cb0f678f1511ae7a8ca883cf2ed7.zip |
Drop package due bug #508854
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/libgdu/ChangeLog | 43 | ||||
-rw-r--r-- | gnome-base/libgdu/Manifest | 17 | ||||
-rw-r--r-- | gnome-base/libgdu/files/libgdu-3.0.2-gold.patch | 17 | ||||
-rw-r--r-- | gnome-base/libgdu/files/libgdu-3.0.2-no-palimpsest-nautilus.patch | 263 | ||||
-rw-r--r-- | gnome-base/libgdu/files/libgdu-3.0.2-optional-avahi.patch | 92 | ||||
-rw-r--r-- | gnome-base/libgdu/libgdu-3.0.2.ebuild | 72 | ||||
-rw-r--r-- | gnome-base/libgdu/metadata.xml | 5 |
7 files changed, 0 insertions, 509 deletions
diff --git a/gnome-base/libgdu/ChangeLog b/gnome-base/libgdu/ChangeLog deleted file mode 100644 index 61fc00f80b2a..000000000000 --- a/gnome-base/libgdu/ChangeLog +++ /dev/null @@ -1,43 +0,0 @@ -# ChangeLog for gnome-base/libgdu -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgdu/ChangeLog,v 1.11 2012/10/28 15:52:33 armin76 Exp $ - - 28 Oct 2012; Raúl Porcel <armin76@gentoo.org> libgdu-3.0.2.ebuild: - ia64/sh/sparc stable wrt #427544 - - 16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> libgdu-3.0.2.ebuild: - stable ppc, bug #427544 - - 15 Oct 2012; Matt Turner <mattst88@gentoo.org> libgdu-3.0.2.ebuild: - Stable on alpha, bug 427544. - - 07 Oct 2012; Anthony G. Basile <blueness@gentoo.org> libgdu-3.0.2.ebuild: - stable ppc64, bug #427544 - - 06 Oct 2012; Markus Meier <maekke@gentoo.org> libgdu-3.0.2.ebuild: - arm stable, bug #427544 - - 04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> libgdu-3.0.2.ebuild: - Stable for amd64, wrt bug #427544 - - 03 Oct 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> libgdu-3.0.2.ebuild: - x86 stable wrt bug #427544 - - 02 Jun 2012; Anthony G. Basile <blueness@gentoo.org> libgdu-3.0.2.ebuild: - Keyword ~mips - - 05 May 2012; Jeff Horelick <jdhore@gentoo.org> libgdu-3.0.2.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 24 Apr 2012; Justin Lecher <jlec@gentoo.org> libgdu-3.0.2.ebuild, - +files/libgdu-3.0.2-gold.patch, metadata.xml: - Added compatibility fix for gold - -*libgdu-3.0.2 (12 Apr 2012) - - 12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> - +libgdu-3.0.2.ebuild, +files/libgdu-3.0.2-no-palimpsest-nautilus.patch, - +files/libgdu-3.0.2-optional-avahi.patch, +metadata.xml: - New ebuild for gnome-disk-utility's libraries. Split out of - gnome-disk-utility for use by gvfs since gnome-disk-utility-3.4 no longer - provides them. diff --git a/gnome-base/libgdu/Manifest b/gnome-base/libgdu/Manifest deleted file mode 100644 index 0408006d2cc7..000000000000 --- a/gnome-base/libgdu/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX libgdu-3.0.2-gold.patch 530 SHA256 68fdd2e9240161e5c2643af34564b1c530c410f69e21094b9c264b7f83891ee3 SHA512 06fa5e20402084d52e17594cf1e82c798fe0ee81f7065ca0e2db910dc93640b0bc6ca51e39646167691a88d09c4d3e1eff2693d9f9d7d48899d4c9953e5b370f WHIRLPOOL 7d0810d2cf97636825d764d48e24978a13ea41d18cf57dfec8eeb8de56b3588a2b7957bc5672301ba697ec8a48283ee6e9ecdb038e878a50e7ea86d859c0e36d -AUX libgdu-3.0.2-no-palimpsest-nautilus.patch 7952 SHA256 39d2f32526a73c86bc8588ddccfa345abfe98421b415b26804c86db264f29db2 SHA512 2f092fa8ac02f07593321cb9e2365bc95332351a2cd78c92c862c277553989092dd2785824eb0588037e7971311ca296adabd381fe7cb84ab07604852d4a9664 WHIRLPOOL f9743243672a947a758d681f159db47581b0955727481551f90503239215e9950b4dcda58e8077de805a7d782af96b38e1b64185f42d4951db47cbd72853c891 -AUX libgdu-3.0.2-optional-avahi.patch 3297 SHA256 e0c309302e5d1bf88d73d95d1e24adfeef6bad74180c205f3981f87582a27e84 SHA512 5f26954fe24b441c77624906a25266b62b7c76b4022b3f7e87ab4ca9313c23de40b7533e562c56dc1bf906ede576439d16e848e17d60e74cf6ed4d71d1227865 WHIRLPOOL 67631637519caf9583baceea00fe7b0598875a750d764cb53e0750db6a22ddbcba30997c68c4e2aca3e81943b90913c1c30b6f1189f34f5d582ba7c8bb79197a -DIST gnome-disk-utility-3.0.2.tar.xz 2002052 SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5 SHA512 b7e68f42d9199c74b60f32b27456b81a6351dc717e54a0dd6162b4e0af521f50deda587012a94ba2768d76dc9dda40dbf505cfea9ca94f879df5d9093fef8969 WHIRLPOOL dd13ad2e2ae57976cd1dfb0539a5dc1b845bb9c8d2feb3708b0bf8e50a3f5324df962dcff7ac937636f466257913f75f060775ba280fe56b63c6e53a243c8de3 -EBUILD libgdu-3.0.2.ebuild 1910 SHA256 0e81e6c5cbc61a0c0a7fc0d796ebf8897cb43e1d096da6f2e7f1f9671d9c5a33 SHA512 4357316482437799043d8ea3bd8bb1508225fba18a496da2b98d2b277968cec87525bb77396ee4b802f91b47d8f03411d5203f5ddbabc040de117edc9de22384 WHIRLPOOL 62a15d4513b73510aa41a1e2f5a85633a38f004374a75888ccd2aa3a638d1dfdbb29045aa3455656986f2d06b7991e6159861b9576e80d446eb49ba865baf4d3 -MISC ChangeLog 1668 SHA256 03de0cb6bc16315582c113988fea9313106d395d86a0340d202defdf77cd83a7 SHA512 9f3dcbf76b4dbab0021367db48023c10dcd0ebbfa645038c7be5b7c66e13560d4744ded6160eabfd060620d03993f980d4f3b1c3c16911296568c2bb44afa1d1 WHIRLPOOL 62cf5e13a9d8e7e1b52ce7a6e1fa3e2295e5655a3e2609139733c03e43ebbe715dbc16708eec214b0bf536949ee38d9d2d6c7fcb19cfc9fe4442e36c5f29f407 -MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlCNVMIACgkQuQc30/atMkDmigCgniydXPgSF06MfV2i/lcfcMbQ -mY0AnjjMrprEkyYp9mCsof14fojaMii1 -=85lx ------END PGP SIGNATURE----- diff --git a/gnome-base/libgdu/files/libgdu-3.0.2-gold.patch b/gnome-base/libgdu/files/libgdu-3.0.2-gold.patch deleted file mode 100644 index a22f0d53dd1b..000000000000 --- a/gnome-base/libgdu/files/libgdu-3.0.2-gold.patch +++ /dev/null @@ -1,17 +0,0 @@ - src/notification/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/notification/Makefile.am b/src/notification/Makefile.am -index 3dbdd6f..e65f6fd 100644 ---- a/src/notification/Makefile.am -+++ b/src/notification/Makefile.am -@@ -38,7 +38,8 @@ gdu_notification_daemon_LDADD = \ - $(GTK3_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(top_builddir)/src/gdu/libgdu.la \ -- $(top_builddir)/src/gdu-gtk/libgdu-gtk.la -+ $(top_builddir)/src/gdu-gtk/libgdu-gtk.la \ -+ -lm - - clean-local : - rm -f *~ diff --git a/gnome-base/libgdu/files/libgdu-3.0.2-no-palimpsest-nautilus.patch b/gnome-base/libgdu/files/libgdu-3.0.2-no-palimpsest-nautilus.patch deleted file mode 100644 index 0ecfe83c5afe..000000000000 --- a/gnome-base/libgdu/files/libgdu-3.0.2-no-palimpsest-nautilus.patch +++ /dev/null @@ -1,263 +0,0 @@ -From b18ee6b0ee74e10056460b7107e7dd8f2d39dd8e Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Thu, 12 Apr 2012 02:56:40 -0400 -Subject: [PATCH] Split palimpsest and nautilus plugin out - ---- - Makefile.am | 2 +- - configure.ac | 53 +--------------------------------------- - data/Makefile.am | 6 ---- - data/icons/16x16/Makefile.am | 1 - - data/icons/22x22/Makefile.am | 1 - - data/icons/24x24/Makefile.am | 1 - - data/icons/256x256/Makefile.am | 1 - - data/icons/32x32/Makefile.am | 1 - - data/icons/48x48/Makefile.am | 1 - - src/Makefile.am | 6 +---- - 10 files changed, 3 insertions(+), 70 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4fd5718..7b5b3ae 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - --SUBDIRS = src data doc help po -+SUBDIRS = src data doc po - - EXTRA_DIST = \ - autogen.sh \ -diff --git a/configure.ac b/configure.ac -index 77a16ab..c785122 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,7 +129,6 @@ GIO2_REQUIRED=2.22 - DBUS_GLIB_REQUIRED=0.74 - GNOME_KEYRING_REQUIRED=2.22 - GTK3_REQUIRED=2.90.7 --UNIQUE_REQUIRED=2.90.1 - LIBNOTIFY_REQUIRED=0.6.1 - NAUTILUS_REQUIRED=2.91.0 - AVAHI_UI_REQUIRED=0.6.25 -@@ -147,25 +146,12 @@ PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0 >= $GIO2_REQUIRED]) - PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GLIB2_REQUIRED]) - PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) - PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) --PKG_CHECK_MODULES(UNIQUE, [unique-3.0 >= $UNIQUE_REQUIRED]) - PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) - PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) --PKG_CHECK_MODULES(X11, [x11]) - PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) - PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED]) - - # ************* --# Remote Access --# ************* --have_remote_access=no --AC_ARG_ENABLE(remote_access, AS_HELP_STRING([--disable-remote-access], [disable access to remote udisks daemons])) --if test "x$enable_remote_access" != "xno"; then -- AC_DEFINE(HAVE_REMOTE_ACCESS, 1, [Defined if remote access is enabled]) -- have_remote_access=yes --fi --AM_CONDITIONAL(HAVE_REMOTE_ACCESS, [test "$have_remote_access" = "yes"]) -- --# ************* - # GNOME Keyring - # ************* - -@@ -185,48 +171,17 @@ AC_SUBST(GNOME_KEYRING_LIBS) - AC_SUBST(GNOME_KEYRING_CFLAGS) - AM_CONDITIONAL(ENABLE_GNOME_KEYRING, [test "$have_gnome_keyring" = "yes"]) - --# ************* --# Documentation --# ************* -- --AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) --if test x$SCROLLKEEPER_CONFIG = xno; then -- AC_MSG_ERROR(Could not find scrollkeeper-config, please install the scrollkeeper package) --fi -- - # ******************** - # Internationalization - # ******************** - - IT_PROG_INTLTOOL([$INTLTOOL_REQUIRED]) - --GETTEXT_PACKAGE=gnome-disk-utility -+GETTEXT_PACKAGE=libgdu - AC_SUBST([GETTEXT_PACKAGE]) - AM_GLIB_GNU_GETTEXT - AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) - --# ****************** --# Nautilus extension --# ****************** -- --have_nautilus=no --AC_ARG_ENABLE(nautilus, AS_HELP_STRING([--disable-nautilus], [disable nautilus extension])) -- --if test "x$enable_nautilus" != "xno"; then -- PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED, -- [AC_DEFINE(HAVE_NAUTILUS, 1, [Define if nautilus is available]) -- have_nautilus=yes], have_nautilus=no) -- if test "x$have_nautilus" = xno -a "x$enable_nautilus" = xyes; then -- AC_MSG_ERROR([nautilus support requested but libraries not found]) -- fi --fi -- --AC_SUBST(NAUTILUS_LIBS) --AC_SUBST(NAUTILUS_CFLAGS) --AC_SUBST(NAUTILUS_EXTENSION_DIR) -- --AM_CONDITIONAL(ENABLE_NAUTILUS, [test "$have_nautilus" = "yes"]) -- - # ************************************* - # ************************************* - -@@ -242,10 +197,7 @@ src/gdu/Makefile - src/gdu/gdu.pc - src/gdu-gtk/Makefile - src/gdu-gtk/gdu-gtk.pc --src/palimpsest/Makefile - src/notification/Makefile --src/format-tool/Makefile --src/nautilus-extension/Makefile - po/Makefile.in - data/Makefile - data/gdu-notification-daemon.desktop.in.in -@@ -257,7 +209,6 @@ data/icons/32x32/Makefile - data/icons/48x48/Makefile - data/icons/256x256/Makefile - data/icons/scalable/Makefile --help/Makefile - doc/Makefile - doc/version.xml - ]) -@@ -283,8 +234,6 @@ echo " - - Maintainer mode: ${USE_MAINTAINER_MODE} - Building api docs: ${enable_gtk_doc} -- Nautilus extension: ${have_nautilus} - - GNOME Keyring support: ${have_gnome_keyring} -- Remote Access: ${have_remote_access} - " -diff --git a/data/Makefile.am b/data/Makefile.am -index 785368d..631be17 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -2,10 +2,6 @@ NULL = - - SUBDIRS = icons - --desktopdir = $(datadir)/applications --desktop_in_files = palimpsest.desktop.in --desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -- - autostartdir = $(sysconfdir)/xdg/autostart - autostart_in_files = gdu-notification-daemon.desktop.in - autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -@@ -18,12 +14,10 @@ gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in - distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper - - EXTRA_DIST = \ -- $(desktop_in_files) \ - $(autostart_in_files) \ - $(NULL) - - CLEANFILES = \ -- $(desktop_DATA) \ - $(autostart_DATA) \ - gdu-notification-daemon.desktop.in \ - gdu-notification-daemon.desktop.in.in \ -diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am -index f62ef2d..324b5be 100644 ---- a/data/icons/16x16/Makefile.am -+++ b/data/icons/16x16/Makefile.am -@@ -2,7 +2,6 @@ NULL = - - icondir = $(datadir)/icons/hicolor/16x16/apps - icon_DATA = \ -- palimpsest.png \ - gdu-eject.png \ - gdu-detach.png \ - gdu-mount.png \ -diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am -index c0b4c4d..b56491d 100644 ---- a/data/icons/22x22/Makefile.am -+++ b/data/icons/22x22/Makefile.am -@@ -2,7 +2,6 @@ NULL = - - icondir = $(datadir)/icons/hicolor/22x22/apps - icon_DATA = \ -- palimpsest.png \ - gdu-eject.png \ - gdu-detach.png \ - gdu-mount.png \ -diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am -index 4dc6898..d465ffe 100644 ---- a/data/icons/24x24/Makefile.am -+++ b/data/icons/24x24/Makefile.am -@@ -5,7 +5,6 @@ NULL = - - icondir = $(datadir)/icons/hicolor/24x24/apps - icon_DATA = \ -- palimpsest.png \ - $(NULL) - - EXTRA_DIST = \ -diff --git a/data/icons/256x256/Makefile.am b/data/icons/256x256/Makefile.am -index dc7e73a..14c8dea 100644 ---- a/data/icons/256x256/Makefile.am -+++ b/data/icons/256x256/Makefile.am -@@ -2,7 +2,6 @@ NULL = - - icondir = $(datadir)/icons/hicolor/256x256/apps - icon_DATA = \ -- palimpsest.png \ - $(NULL) - - EXTRA_DIST = \ -diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am -index 9a2bc76..ad18728 100644 ---- a/data/icons/32x32/Makefile.am -+++ b/data/icons/32x32/Makefile.am -@@ -2,7 +2,6 @@ NULL = - - icondir = $(datadir)/icons/hicolor/32x32/apps - icon_DATA = \ -- palimpsest.png \ - $(NULL) - - EXTRA_DIST = \ -diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am -index 349b8ce..c3164be 100644 ---- a/data/icons/48x48/Makefile.am -+++ b/data/icons/48x48/Makefile.am -@@ -2,7 +2,6 @@ NULL = - - icondir = $(datadir)/icons/hicolor/48x48/apps - icon_DATA = \ -- palimpsest.png \ - gdu-eject.png \ - gdu-detach.png \ - gdu-mount.png \ -diff --git a/src/Makefile.am b/src/Makefile.am -index bab902f..19667a8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,8 +1,4 @@ --SUBDIRS = gdu gdu-gtk palimpsest notification format-tool -- --if ENABLE_NAUTILUS --SUBDIRS += nautilus-extension --endif -+SUBDIRS = gdu gdu-gtk notification - - clean-local : - rm -f *~ --- -1.7.8.5 - diff --git a/gnome-base/libgdu/files/libgdu-3.0.2-optional-avahi.patch b/gnome-base/libgdu/files/libgdu-3.0.2-optional-avahi.patch deleted file mode 100644 index bf627b91d982..000000000000 --- a/gnome-base/libgdu/files/libgdu-3.0.2-optional-avahi.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 518716ca99ce82bcf6732e1a69c9d19b878f48ea Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Thu, 12 Apr 2012 03:13:25 -0400 -Subject: [PATCH] Make avahi support optional - ---- - configure.ac | 21 ++++++++++++++++++++- - src/gdu-gtk/gdu-connect-to-server-dialog.c | 7 +++++++ - 2 files changed, 27 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7dc3630..aa487fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -149,7 +149,26 @@ PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED]) - PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) - PKG_CHECK_MODULES(UDISKS, [udisks >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION]) - PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14]) --PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED]) -+ -+# ************* -+# Avahi -+# ************* -+ -+have_avahi_ui=no -+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching])) -+ -+if test "x$enable_avahi_ui" != "xno"; then -+ PKG_CHECK_MODULES(AVAHI_UI, avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED, -+ [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 is available]) -+ have_avahi_ui=yes], have_avahi_ui=no) -+ if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then -+ AC_MSG_ERROR([avahi-ui-gtk3 support requested but libraries not found]) -+ fi -+fi -+ -+AC_SUBST(AVAHI_UI_LIBS) -+AC_SUBST(AVAHI_UI_CFLAGS) -+AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"]) - - # ************* - # GNOME Keyring -diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c -index e4c1a83..a715bb7 100644 ---- a/src/gdu-gtk/gdu-connect-to-server-dialog.c -+++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c -@@ -24,7 +24,10 @@ - - #include "config.h" - #include <glib/gi18n-lib.h> -+ -+#ifdef HAVE_AVAHI_UI - #include <avahi-ui/avahi-ui.h> -+#endif - - #include "gdu-connect-to-server-dialog.h" - -@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address (GduConnectToServerDialog *dialog) - - /* ---------------------------------------------------------------------------------------------------- */ - -+#ifdef HAVE_AVAHI_UI - static void - on_dns_sd_clicked (GtkButton *button, - gpointer user_data) -@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button, - - gtk_widget_destroy (service_dialog); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -217,6 +222,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object) - GTK_STOCK_CONNECT, - GTK_RESPONSE_OK); - -+#ifdef HAVE_AVAHI_UI - button = gtk_button_new_with_mnemonic (_("_Browse...")); - image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); -@@ -234,6 +240,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object) - "clicked", - G_CALLBACK (on_dns_sd_clicked), - dialog); -+#endif - - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - --- -1.7.8.5 - diff --git a/gnome-base/libgdu/libgdu-3.0.2.ebuild b/gnome-base/libgdu/libgdu-3.0.2.ebuild deleted file mode 100644 index ceb1fa8bdfe4..000000000000 --- a/gnome-base/libgdu/libgdu-3.0.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgdu/libgdu-3.0.2.ebuild,v 1.11 2012/10/28 15:52:33 armin76 Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -GNOME_ORG_MODULE="gnome-disk-utility" - -inherit autotools eutils gnome2 - -DESCRIPTION="GNOME Disk Utility libraries" -HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="avahi doc gnome-keyring" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86" - -CDEPEND=" - >=dev-libs/glib-2.22:2 - >=dev-libs/dbus-glib-0.74 - >=x11-libs/gtk+-2.90.7:3 - =sys-fs/udisks-1.0*:0 - >=dev-libs/libatasmart-0.14 - >=x11-libs/libnotify-0.6.1 - - avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) - gnome-keyring? ( gnome-base/libgnome-keyring ) -" -RDEPEND="${CDEPEND} - !<=sys-apps/gnome-disk-utility-3.0.2-r200 - !=sys-apps/gnome-disk-utility-3.0.2-r300" -# libgdu was part of gnome-disk-utility until 3.0.2-r{200,300} -DEPEND="${CDEPEND} - sys-devel/gettext - gnome-base/gnome-common - app-text/docbook-xml-dtd:4.1.2 - app-text/gnome-doc-utils - - virtual/pkgconfig - >=dev-util/intltool-0.35 - >=dev-util/gtk-doc-am-1.13 - - doc? ( >=dev-util/gtk-doc-1.3 )" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - $(use_enable avahi avahi-ui) - $(use_enable gnome-keyring)" - DOCS="AUTHORS NEWS README TODO" -} - -src_prepare() { - local f=data/gdu-notification-daemon.desktop.in.in.in - sed -i -e '/^OnlyShowIn/d' ${f} || die - echo 'NotShowIn=KDE;' >> ${f} - - # gold underlinking detection - epatch "${FILESDIR}"/${P}-gold.patch - - # Palimpsest and Nautilus plugin are provided by sys-apps/gnome-disk-utility - epatch "${FILESDIR}/${PN}-3.0.2-no-palimpsest-nautilus.patch" - - # Keep avahi optional, upstream bug #631986 - epatch "${FILESDIR}/${PN}-3.0.2-optional-avahi.patch" - intltoolize --force --copy --automake || die - eautoreconf - - gnome2_src_prepare -} diff --git a/gnome-base/libgdu/metadata.xml b/gnome-base/libgdu/metadata.xml deleted file mode 100644 index dad9001338dc..000000000000 --- a/gnome-base/libgdu/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>gnome</herd> -</pkgmetadata> |