old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 6 insertions, 81 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index e1fec6ec03ff..362bc47fff6d 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.240 2014/03/18 18:22:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.241 2014/03/18 18:23:29 ssuominen Exp $
+
+  18 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch,
+  -xfdesktop-4.11.3.ebuild:
+  old
 
 *xfdesktop-4.11.4 (18 Mar 2014)
 
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch b/xfce-base/xfdesktop/files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch
deleted file mode 100644
index 159a3afdfdbf..000000000000
--- a/xfce-base/xfdesktop/files/xfdesktop-4.11.3-always-pull-in-dbus-glib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-common/xfdesktop-thumbnailer.c, src/xfdesktop-file-utils.c and 'src/xfdesktop-file-utils.h
-always use #include <dbus/dbus-glib.h> but configure.ac doesn't check for it if
-configured with flags --disable-file-icons --disable-thunarx, causing $(DBUS_CFLAGS)
-to be unset and build to fail on a missing -I/usr/include/dbus-1.0
-
-http://bugzilla.xfce.org/show_bug.cgi?id=10745
-
---- configure.ac
-+++ configure.ac
-@@ -87,6 +87,7 @@
- XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
-+XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
-                   [libxfce4util_minimum_version])
- XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],
-@@ -124,14 +125,6 @@
- fi
- 
- if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
--    dnl here i shall abuse the XDT_CHECK_PACKAGE macro
--    XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
--echo "*** Optional package dbus-glib-1 was either not found on your system"
--echo "*** or is too old.  Please install or upgrade to at least version"
--echo "*** dbus_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
--echo "*** if you installed the new version of the package in a nonstandard"
--echo "*** prefix.  File/launcher icons will be disabled."
--])
-     enable_file_icons="no"
-     if test "x$DBUS_VERSION" != "x"; then
-         enable_file_icons="yes"
diff --git a/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild b/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild
deleted file mode 100644
index 11929f2aa551..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.11.3.ebuild,v 1.2 2014/03/12 19:01:39 ssuominen Exp $
-
-EAPI=5
-EAUTORECONF=1
-inherit xfconf
-
-DESCRIPTION="Desktop manager for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify thunar"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.24:2
-	x11-libs/libSM
-	>=x11-libs/libwnck-2.30:1
-	x11-libs/libX11
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.3
-	>=xfce-base/libxfce4ui-4.11
-	>=xfce-base/libxfce4util-4.11
-	>=xfce-base/xfconf-4.10
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	thunar? ( >=xfce-base/thunar-1.6[dbus] )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-always-pull-in-dbus-glib.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}