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

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 26 insertions, 32 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/Manifest b/app-dicts/gnome-dictionary/Manifest
index 1bf96fc7cbe2..60f9f6b0c1fc 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -3,14 +3,18 @@ Hash: SHA256
 
 DIST gnome-dictionary-3.4.0.tar.xz 2155012 SHA256 70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af SHA512 c44fa58786e71303e3819132b748de9e1e62fcde4d1183655c97f62afad95726bf2862822d95a59f583a0941777a3bc20c5f28b38464f6ddcf57b8519e08fd88 WHIRLPOOL 7d397187dfa944b11ffef85eddb4d255f5274f53a80dd3f818094ca196c6475482d4acfe06c643695a53e6054d1ecb578640ff255a5a4f55f1d373ccb16f837b
 DIST gnome-dictionary-3.6.0.tar.xz 2141008 SHA256 1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9 SHA512 7478661750030004e5c0ce205ae9e2f112ad1e95c32b8aaadec3f7994b690f580b7aa05b68e485fa5924d75d686e6d2769f82d8561727e5e6aa62032109aa2ab WHIRLPOOL f147a50617a67b395a02609e6e03934712da5da32eb31609837cec2684357269f610692a5894690d09428fa392ecd9f93db56f9349e1e7dc78958b901e01dbfd
-EBUILD gnome-dictionary-3.4.0.ebuild 1063 SHA256 2e5809e8db89e4c74828bf5f7b0ce292cd8caf7407a5ce43c037b672df9757a4 SHA512 c1ef35a90cc0065a1208863e759ffda483fd42f924947889cbfd641edd9412ffc67204a0dbf706b9cbe3e5b4aac8c5846c506ba19504d824b32e82ad0e706455 WHIRLPOOL c040b615a1b7ffcf53d01e6568e16169ede318b802f0df1a725a0fc5f686d65a84eb3cd08bc93bdf4ea6e2d3bff1a2c4deddbda98a93bc30a9f0d921248333fc
-EBUILD gnome-dictionary-3.6.0.ebuild 1332 SHA256 a4e9c883556d54e5ee534a267e37adae929c59a034cdd4852a5dae1bc05ebc4f SHA512 6a342b09a3409720e5e75b957e6c788f42654efe1609d37d990855198ec546bf5b5d9746478099f89611e04f0f594815c3901bc82edc263b92b9fd9fb8df24ce WHIRLPOOL 619026421fba5ec2e7bd865b3b1fef3b2b74c2acaecea1124e64803f8ad6b0c1633ceac0658a12d2362f74c645356678246156de83526a9b34fa081b56be78e2
-MISC ChangeLog 621 SHA256 8f1bb820430531969da8e8f46bfb063cd1f0a10573873227acf4587ec900ee5b SHA512 58f4c64f5007b60ae1e338103eecde7689a6c39b2398c8425dee4f096934df61cc9d164dfe6fa55a5d045a716775545a1773575d1bd9da6840d42ef02af96698 WHIRLPOOL 0108ca622869831d9bc1ff0f4d10de809c50c3f31ce2032177c1d35d7c3b1e1c3cc940736ebadf4364398c43fdb391eec20450f601832308a729eb0171e0a270
+EBUILD gnome-dictionary-3.4.0.ebuild 1066 SHA256 4c9c21aa4369bd5a5b07e59aa97bb82ef51710013d4dcfc273538d47d419594f SHA512 9359732c0ea6cd500dc4e7e689dfb2e70c54731c8001196a4b4c4ce36d8c19f13992f55a28d841c4c59aaa0385fd82c5ebc9db2076ad93b65e721891d8394490 WHIRLPOOL 8a9b3dca67db603f5bbec64d1e6be30dfcff1c6a15fac9b0a78c1fd593d139e17a91a259ec015705df73ad47782a71d0ce3cd285de3e525dbd13acb129d30ce0
+EBUILD gnome-dictionary-3.6.0.ebuild 1080 SHA256 0de1ba9ccfb5785ee71b15a24d506d285c933c97d20262075f06ee0cb4be6faa SHA512 ae3c037e601cef705fd014362a846d4a185263afbec024a0ee01b7715ad0fe5283e0d1bef9d3f34f705f5520d7342cbfdd7e72b8475283aad6bd120a90998063 WHIRLPOOL a292de7befab180ffecd1549e3d4f443c0dfd2316c3b92c9f4c38466b4d7b7609dedc579e4ba3fedd4b52f0942ab2612a15aa5c882955d732fa86d4d2c1f7acd
+MISC ChangeLog 803 SHA256 14ce37225a1af214be0fcc8409c9afbe1502e6a1430c07c1a1480e97096fcaa2 SHA512 af907717902d93f50fbbca7f22710ba6e4484f2003b7b16b787a067e5f3758c387468d89f3c12d7332701949ea8516b335c940fee61c99786734c1237788c9f4 WHIRLPOOL ded244be64e2921290b457fe4ab4f8e08730e2dce18e2e8b444996a74ee820aaa3299a93cdd830e248546e2bd917d57e6fff846547ca0f0f8163b073579956be
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDN41EACgkQ1fmVwcYIWAb+5gCgkQJmuSYZAGc9q66tERdwtC6/
-tUYAoOBhX0yd+GA3izxqmPSLr96fgmFi
-=aVYH
+iQEcBAEBCAAGBQJQziEZAAoJEJ0WA1zPCt1hNfsIAK6U2S82prwahfg5BALHhwTt
+7brrCN0xU/TbZ9dRLa/pH7fjf7pgb3XUbcqGsAXG802AGiqa0hqL2W78N7YI9ELY
+8/zKLiQqhmeSB+vyN6GXkBi7ww2xCtdlccHc+k1ZJKSfe2lLfwpfbyqHM8Uk+96A
+9+748x1hIwMe6yCE1H8p8P3v1qhRlfgaDqZXI0hbJwwYnuz844sMNBbT0/3z+TPv
+CGkuTKDfPL30y9IacuCad68ZU9QLTILv1OrpFKN015f5JsZb7fq2yC3pc0l/zTqI
+xg3AvX3sXQvxAY5p4o457GPQNJD4lJykAKn2C5LHoi4qh+NObcmwUNezhMjyJNg=
+=THdx
 -----END PGP SIGNATURE-----
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
 }