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, 16 insertions, 26 deletions

diff --git a/app-dicts/gnome-dictionary/ChangeLog b/app-dicts/gnome-dictionary/ChangeLog
index 356deb7b7ec3..815c374aa7ce 100644
--- a/app-dicts/gnome-dictionary/ChangeLog
+++ b/app-dicts/gnome-dictionary/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/gnome-dictionary
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gnome-dictionary/ChangeLog,v 1.2 2012/12/16 15:05:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gnome-dictionary/ChangeLog,v 1.3 2012/12/16 19:29:28 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-dictionary-3.4.0.ebuild, gnome-dictionary-3.6.0.ebuild:
+  Update license, EAPI5-ize and de-9999-ize ebuild.
 
 *gnome-dictionary-3.6.0 (16 Dec 2012)
 
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild
index 31f4665bc627..a2a23c987d23 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.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-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild,v 1.1 2012/05/05 07:24:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild,v 1.2 2012/12/16 19:29:28 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="Dictionary utility for GNOME 3"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0"
 IUSE="doc ipv6"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.6.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.6.0.ebuild
index b399fa8a6fa3..af8acfacd054 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.6.0.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.6.0.ebuild
@@ -1,32 +1,24 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gnome-dictionary/gnome-dictionary-3.6.0.ebuild,v 1.1 2012/12/16 15:05:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gnome-dictionary/gnome-dictionary-3.6.0.ebuild,v 1.2 2012/12/16 19:29:28 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Dictionary utility for GNOME 3"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-SLOT="0"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="0/6" # subslot = suffix of libgdict-1.0.so
 IUSE="ipv6"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	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.28:2
-	x11-libs/cairo
+	x11-libs/cairo:=
 	>=x11-libs/gtk+-3:3
 	x11-libs/pango
 "
@@ -42,15 +34,9 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.15 )"
-fi
-
 src_configure() {
-	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="${G2CONF} $(use_enable ipv6)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	G2CONF="${G2CONF}
+		$(use_enable ipv6)
+		ITSTOOL=$(type -P true)"
 	gnome2_src_configure
 }