Old upower needed for 3.10, drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 102 deletions

diff --git a/gnome-extra/gnome-packagekit/ChangeLog b/gnome-extra/gnome-packagekit/ChangeLog
index fc309fe1c324..3762f989574a 100644
--- a/gnome-extra/gnome-packagekit/ChangeLog
+++ b/gnome-extra/gnome-packagekit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-packagekit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.19 2014/05/31 22:26:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.20 2014/06/01 08:26:56 pacho Exp $
+
+  01 Jun 2014; Pacho Ramos <pacho@gentoo.org> -gnome-packagekit-3.12.1.ebuild,
+  gnome-packagekit-3.10.1.ebuild:
+  Old upower needed for 3.10, drop old
 
   31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   gnome-packagekit-3.10.1.ebuild:
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild
index 19bb1f7016c6..01faf7bc2550 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild,v 1.2 2014/05/31 22:26:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild,v 1.3 2014/06/01 08:26:56 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ RDEPEND="
 	>=app-admin/packagekit-gtk-0.7.2
 	>=media-libs/libcanberra-0.10[gtk3]
 	>=sys-apps/dbus-1.1.2
-	|| ( >=sys-power/upower-0.9.0 sys-power/upower-pm-utils )
+	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
 
 	media-libs/fontconfig
 	x11-libs/libX11
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.1.ebuild
deleted file mode 100644
index da07157a111f..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.1.ebuild,v 1.1 2014/04/27 17:14:50 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="http://www.packagekit.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls systemd test udev"
-
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.91.0:3
-	>=x11-libs/libnotify-0.7.0:=
-	x11-libs/pango
-	>=dev-libs/dbus-glib-0.73
-
-	>=app-admin/packagekit-base-0.7.2[udev]
-	>=app-admin/packagekit-gtk-0.7.2
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	systemd? ( >=sys-apps/systemd-42 )
-	!systemd? ( sys-auth/consolekit )
-	udev? ( >=virtual/udev-171[gudev] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
-# gtk-doc is generating a useless file, don't need it
-
-# UPSTREAM:
-# misuse of CPPFLAGS/CXXFLAGS ?
-# see if tests can forget about display (use eclass for that ?)
-# intltool and gettext only with +nls
-
-src_prepare() {
-	# Regenerate marshalers for <glib-2.31 compat
-	rm -v src/gpk-marshal.{c,h} || die
-
-	# * disable tests with graphical dialogs and that require packagekitd
-	#   to be run with the dummy backend and installed .ui files
-	# * disable tests that fails every time packagekit developers make a
-	#   tiny change to headers
-	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
-		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_error_func/d' \
-		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
-		-e '/g_test_add_func.*gpk_test_task_func/d' \
-		-i src/gpk-self-test.c || die
-
-	# Disable stupid flags
-	# FIXME: touching configure.ac triggers maintainer-mode
-	sed -e '/CPPFLAGS="$CPPFLAGS -g"/d' -i configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--enable-compile-warnings=yes \
-		--enable-iso-c \
-		$(use_enable nls) \
-		$(use_enable systemd) \
-		$(use_enable test tests) \
-		$(use_enable udev gudev) \
-		ITSTOOL="$(type -P true)"
-}
-
-src_test() {
-	# FIXME: this should be handled at eclass level
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DISPLAY
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}