Punt overshadowed, unused, copy with problematic sys-power/upower dependencies.

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

3 files changed, 6 insertions, 144 deletions

diff --git a/gnome-extra/gnome-packagekit/ChangeLog b/gnome-extra/gnome-packagekit/ChangeLog
index 6df9e7b153c6..ca004c2346f9 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.21 2014/07/24 18:40:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.22 2014/09/19 17:33:34 ssuominen Exp $
+
+  19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -gnome-packagekit-3.10.1.ebuild:
+  old
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   gnome-packagekit-3.10.1.ebuild, gnome-packagekit-3.12.2.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
deleted file mode 100644
index b3c6b28dc9ec..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.10.1.ebuild
+++ /dev/null
@@ -1,138 +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.10.1.ebuild,v 1.4 2014/07/24 18:40:10 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} python3_{2,3} )
-
-inherit eutils gnome2 python-r1 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"
-
-# FIXME: add PYTHON_USEDEP on packagekit-base when available
-# 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
-	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	systemd? ( >=sys-apps/systemd-42 )
-	!systemd? ( sys-auth/consolekit )
-	udev? ( virtual/libgudev:= )
-"
-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
-	# * disable tests that fails every time packagekit developers make a
-	#   tiny change to headers
-	sed -e '/gpk_enum_test (test)/d' \
-		-e '/gpk_error_test (test)/d' \
-		-e '/gpk_modal_dialog_test (test)/d' \
-		-e '/gpk_task_test (test)/d' \
-		-i src/gpk-self-test.c || die
-
-	# Leave python build to us
-	sed '/python.*\\/d' -i Makefile.am Makefile.in || die
-
-	# Disable stupid flags
-	# FIXME: touching configure.ac triggers maintainer-mode
-	sed -e '/CPPFLAGS="$CPPFLAGS -g"/d' -i configure || die
-
-	mkdir -p "${S}_default" || die
-	prepare_python() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_python
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	myconf="
-		--localstatedir=/var
-		--enable-compile-warnings=yes
-		--enable-iso-c
-		--disable-strict
-		$(use_enable nls)
-		$(use_enable systemd)
-		$(use_enable test tests)
-		$(use_enable udev gudev)
-		ITSTOOL=$(type -P true)"
-
-	cd "${S}_default" || die
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf}
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure ${myconf}
-}
-
-src_compile() {
-	cd "${S}_default" || die
-	gnome2_src_compile
-	build_python() {
-		cd "${BUILD_DIR}"/python || die
-		default
-	}
-	python_foreach_impl build_python
-}
-
-src_test() {
-	unset DISPLAY
-	cd "${S}_default" || die
-	# out-of-tree tests of documentation fail
-	Xemake check -C src
-}
-
-src_install() {
-	dodoc AUTHORS MAINTAINERS NEWS README TODO
-
-	cd "${S}_default" || die
-	gnome2_src_install
-
-	install_python() {
-		cd "${BUILD_DIR}"/python || die
-		emake install DESTDIR="${D}" VPATH="${S}/python/packagekit:${BUILD_DIR}" || die
-	}
-	python_foreach_impl install_python
-}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
index 5978c4034444..da6fd63d0085 100644
--- a/gnome-extra/gnome-packagekit/metadata.xml
+++ b/gnome-extra/gnome-packagekit/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
-		<pkg>sys-auth/consolekit</pkg> for rebooting</flag>
-  </use>
+<herd>gnome</herd>
 </pkgmetadata>