gnome-extra/gnome-utils & friends: moved to gx86; sync -9999 with gx86

3 files changed, 9 insertions, 52 deletions

diff --git a/app-admin/gnome-system-log/Manifest b/app-admin/gnome-system-log/Manifest
index 83aca0cb..bcd9a86a 100644
--- a/app-admin/gnome-system-log/Manifest
+++ b/app-admin/gnome-system-log/Manifest
@@ -1,3 +1 @@
-DIST gnome-system-log-3.4.1.tar.xz 930200 RMD160 7b0b81130ca24c2493e956faa9f0599b9c0a28be SHA1 7affd90613672afb3cead4c5e02482ad5edce527 SHA256 288bb4db72d5e86874198f3a879a89cd0ddec373db9838d8ea772df1c5267736
-EBUILD gnome-system-log-3.4.1.ebuild 927 RMD160 d75c0c97b78ce899ffdaef95da569c43202bc975 SHA1 842b4691e9a4a3e0e100190bb2bb7c5c4ddd5b42 SHA256 10c07907c4c4090ce13bb401fe602025d3880c4b9590b3fa15cdb732d6286482
-EBUILD gnome-system-log-9999.ebuild 927 RMD160 d75c0c97b78ce899ffdaef95da569c43202bc975 SHA1 842b4691e9a4a3e0e100190bb2bb7c5c4ddd5b42 SHA256 10c07907c4c4090ce13bb401fe602025d3880c4b9590b3fa15cdb732d6286482
+EBUILD gnome-system-log-9999.ebuild 988 RMD160 b45b7333ad27fb7086e527c6278a6b2dc3312b98 SHA1 7f5910b60cf4136d9d4d0b297389a6478af3d18e SHA256 3d45abe7335d360ea2b5cd145a7fae020d434d961e8ea187d05511bca87a4b80
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild
deleted file mode 100644
index f6ee6aa9..00000000
--- a/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="System log viewer for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	
-	gnome-base/libgtop:2"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	DOCS="NEWS TODO"
-	G2CONF="--disable-schemas-compile
-		--enable-zlib"
-}
diff --git a/app-admin/gnome-system-log/gnome-system-log-9999.ebuild b/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
index f6ee6aa9..e0413fd5 100644
--- a/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="System log viewer for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
@@ -24,20 +24,22 @@ else
 fi
 
 COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
+	sys-libs/zlib
 	>=x11-libs/gtk+-3.0.0:3
-	
-	gnome-base/libgtop:2"
+	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig"
 
 pkg_setup() {
 	DOCS="NEWS TODO"
-	G2CONF="--disable-schemas-compile
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		--enable-zlib"
 }