Update to EAPI5, modernize ebuild.

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

3 files changed, 34 insertions, 42 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 14fa11801f27..b9624db6edac 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.253 2012/12/16 13:02:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.254 2012/12/16 18:23:25 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> evince-3.6.1.ebuild:
+  Update to EAPI5, modernize ebuild.
 
 *evince-3.6.1 (16 Dec 2012)
 
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 170cd641dbce..d56659acb087 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -21,13 +21,17 @@ DIST evince-3.4.0.tar.xz 6162936 SHA256 02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90
 DIST evince-3.6.1.tar.xz 6449724 SHA256 1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5 SHA512 5664dce6d9c7fca3e4f4acdc0756afda04794cb937c024723ed75a59a0893cb706cec58bf7f141ee4305223cc55e92a04a191f3f32261c4c5e9026c79e5c5cbf WHIRLPOOL d9b5e9ead61439388b0894d608f51c7a8479bd4d2008892f892756e52558908dbcd02a7b12194e3c295fffb2dd2f4358ba37f565a688ca16c109edc243522ee7
 EBUILD evince-2.32.0-r4.ebuild 4319 SHA256 72280788e153673573e57a3784fb44adb42e8f5de65cab3c350a5141743f67eb SHA512 d6e403e1b53046a8918f62034db738cc4017a8283d4af87ee9b37c7c3fa6a001c61d21a63d68b92ad7987f3b7d9623e33427f005bbb31083c839c87335e86389 WHIRLPOOL 787e3eaacd94a983677856dd5bd342013f28454ffffc0905cec7c45f47c93e34a6a6cd397cb1ae40664d7cc162e975cb7c78c54ded083a25076548875785d6f1
 EBUILD evince-3.4.0.ebuild 3368 SHA256 74d3939a33f20c5e488dcd080208647e2232014946d10cfc5c2ea9fbbe6899c5 SHA512 da5ef467585bc4f2f65500a792eea92165a51958043a9a1212e586484a9ad2839a4cf5aeca2e389601bc9cccf42dab42938c33e966b53ba143ffe3fdec1168ac WHIRLPOOL a60fa9b6c87931334df7202f2772c731262032c7f0fdb42716aa1a0b3bff29ea7cef341a26176c94abee43049fe8273f0c3b2eeb8cfda6fe3b2eb10114a7184d
-EBUILD evince-3.6.1.ebuild 3075 SHA256 2787100beb92ffaa35fcfce456a4f7bf4640926a7d75ffdb67a9d7d1b46e5ad3 SHA512 0864c8995f4316e376e335b800fd69b093aa6b6510c27dff6da9ac3e2927be20a8c7ad861b34d94c11f3598c44eb5606adef18d2c05c08949f5d9326ed8a9954 WHIRLPOOL d668a7fecf09155df2532c60595dfbac350df60592ed494e0d87658ef10cc71223026b1f421543de79fa3f3a18e69daab6551a520c79720f0b30736f20f55df8
-MISC ChangeLog 38488 SHA256 913eb991d37924a6e626d3558c863eeb4e5af0cf31789b56cd96b04322ec2f08 SHA512 7d9e353370661d7694672d84525d42c79b181376ab20b5b23096f0927945e265257a38fd819648fa68292aed2838fa78cadef4d96ddcd592c379bbbe2a29fd59 WHIRLPOOL 21895fc2d3bf64375fdb2e497206a9a8360f058baeb201b58e22de367e93fdadd2db5acd8cff728f91f9ad6e276c97301a001ceebe5f83faad1247fc79bf7aa7
+EBUILD evince-3.6.1.ebuild 2934 SHA256 db3b603d95c682d6db00c9b1a56e296be3487fc07526817d1329be3839bcdf80 SHA512 f73dcef17ac006c4f39b092ffa7ff3d2651f85caa038a5f0494b73f81920d6293f1938d483829611cba4943559af4438229a792e26fb24cdba546e4ffc62b42f WHIRLPOOL c3210abd56c62713f6ad0e1a522abe87ec8e0a43fb87d3c6670684677bb0ac19254e341d8b6144ddd521323a4c0fa2e3893018e44cbe0b489afcd444e5110b49
+MISC ChangeLog 38612 SHA256 763e1ad3048493dfa229c9c2a3176419bc9e684d52fc0f3fd2bf81b744016e21 SHA512 380a803ea997e727ee56b60be7251d47ca868955863274949325bd07fff0a57f0a81179249d4641b1540012f67465c32a21fdeeb3b99aaca1a87b51684c3b7f9 WHIRLPOOL 8573e50d9b8a60a0dafd5345dad910353e37cc80a5ba1f2404ffe2192fd013a38e36b297d7886743460cfd05bb86685813d35d4dd74f5380bdf2b8dd4b68a826
 MISC metadata.xml 623 SHA256 214164046bacc2b16d49a57fd245684cd036c6fe3f4296a1bc7f4db0c05f2ee5 SHA512 3fa1af7cf8b5618eae7f41eaa2238da64d670331a30ca2bfdb3f091f66c58d832aac6c4611a9e41e0c97f61f23d8199292dc9605ab4072228ff033b0a9e6c54a WHIRLPOOL d7b40636cdc66c4fa4d5e203a58e9f7e8028964505d53b2a057d5e472d54f00f022529b5c99136835dede5112a7fbff86ea50da590e38d66a3e27e5076024b91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDNxmsACgkQ1fmVwcYIWAYj1QCfSfCHB38tibxZWrz6QHWRpn1w
-owwAoLbmtPPCWEKw0+cbXL1D7rz0SS4s
-=5OBH
+iQEcBAEBCAAGBQJQzhGfAAoJEJ0WA1zPCt1hFIgH/0KML6SueUWMIT06gy4u+9h5
+EBBrqIe9/IAZ0vjujJcCMzVaKPqRiXzkifoPh598qxJef+33LRPyzNlIDaTdBAEc
+LFJJpC+iA8ufN63t2Qj1uEMOUZfRxYy9k2xKkQGCETj51WMII+F3RaAvUqN9o+Vp
+KhWzReCMHZAUXczrfWClc7fuZ8ICyxe702lKrlGFpfGX8gGaVOWcXyKNepVRc5FC
+qgAvzRlBRAiMJYI8eOtl2oFWwg2Ype8QklTcZjTzkRQQblWOhxR4vp8tw1xV989U
+3WIQixoxUE2gst97SukUJoNtu/yPBydolSsBrQ1ZcMQ1I+QrNpD7dw6B80saC34=
+=c399
 -----END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-3.6.1.ebuild b/app-text/evince/evince-3.6.1.ebuild
index 52c00569e8ec..a8460ab2b31d 100644
--- a/app-text/evince/evince-3.6.1.ebuild
+++ b/app-text/evince/evince-3.6.1.ebuild
@@ -1,28 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.6.1.ebuild,v 1.1 2012/12/16 13:02:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.6.1.ebuild,v 1.2 2012/12/16 18:23:25 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
 
-LICENSE="GPL-2+"
-SLOT="0"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
 IUSE="dbus debug djvu dvi gnome-keyring +introspection nautilus +postscript t1lib tiff xps"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 
 # Since 2.26.2, can handle poppler without cairo support. Make it optional ?
 # not mature enough
@@ -33,29 +26,29 @@ RDEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.33:2
 	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib
+	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.0.2:3[introspection?]
-	x11-libs/libX11
-	>=x11-libs/libSM-1
-	x11-libs/libICE
+	x11-libs/libX11:=
+	>=x11-libs/libSM-1:=
+	x11-libs/libICE:=
 	gnome-base/gsettings-desktop-schemas
 	|| (
 		>=x11-themes/gnome-icon-theme-2.17.1
 		>=x11-themes/hicolor-icon-theme-0.10 )
-	>=x11-libs/cairo-1.10
-	>=app-text/poppler-0.20[cairo]
-	djvu? ( >=app-text/djvu-3.5.17 )
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.20:=[cairo]
+	djvu? ( >=app-text/djvu-3.5.17:= )
 	dvi? (
 		virtual/tex-base
-		dev-libs/kpathsea
-		t1lib? ( >=media-libs/t1lib-5 ) )
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
 	introspection? ( >=dev-libs/gobject-introspection-1 )
 	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2.0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1 )
+	postscript? ( >=app-text/libspectre-0.2.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.3
@@ -64,19 +57,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig"
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		doc? ( >=dev-util/gtk-doc-1.13 )"
-fi
-
 ELTCONF="--portage"
 
 # Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
 # Releases: http://people.redhat.com/zcerza/dogtail/releases/
 RESTRICT="test"
 
-pkg_setup() {
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-tests
@@ -94,12 +81,10 @@ pkg_setup() {
 		$(use_enable postscript ps)
 		$(use_enable t1lib)
 		$(use_enable tiff)
-		$(use_enable xps)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+		$(use_enable xps)
+		ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
 
-src_prepare() {
 	# Fix .desktop file so menu item shows up
 	epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch