Update license, EAPI5-ize and de-9999-ize ebuild.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 15 insertions, 23 deletions

diff --git a/app-admin/gnome-system-log/ChangeLog b/app-admin/gnome-system-log/ChangeLog
index 3964f70ded99..8c4e6f49bc5e 100644
--- a/app-admin/gnome-system-log/ChangeLog
+++ b/app-admin/gnome-system-log/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gnome-system-log
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-log/ChangeLog,v 1.2 2012/12/16 13:52:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-log/ChangeLog,v 1.3 2012/12/16 18:57:02 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-system-log-3.4.1.ebuild, gnome-system-log-3.6.1.ebuild:
+  Update license, EAPI5-ize and de-9999-ize ebuild.
 
 *gnome-system-log-3.6.1 (16 Dec 2012)
 
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
index 7cc4796b7107..2b98dbc81804 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild,v 1.1 2012/05/05 06:57:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-log/gnome-system-log-3.4.1.ebuild,v 1.2 2012/12/16 18:57:02 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="System log viewer for GNOME 3"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.6.1.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.6.1.ebuild
index ea1c9155bbfd..9f7713197b90 100644
--- a/app-admin/gnome-system-log/gnome-system-log-3.6.1.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-3.6.1.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-log/gnome-system-log-3.6.1.ebuild,v 1.1 2012/12/16 13:52:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-log/gnome-system-log-3.6.1.ebuild,v 1.2 2012/12/16 18:57:02 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 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="https://live.gnome.org/GnomeUtils"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
 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
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND=">=dev-libs/glib-2.31:2
-	sys-libs/zlib
+	sys-libs/zlib:=
 	>=x11-libs/gtk+-3.4:3
 	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
@@ -36,14 +29,9 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig"
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools"
-fi
-
 src_configure() {
-	DOCS="NEWS TODO"
-	G2CONF="${G2CONF} --enable-zlib"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	G2CONF="${G2CONF}
+		--enable-zlib
+		ITSTOOL=$(type -P true)"
 	gnome2_src_configure
 }