Switch to EAPI 4 and fdo-mime instead of gnome2 eclass. Restrict test and remove debug USE flag as both do not work properly.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

3 files changed, 30 insertions, 19 deletions

diff --git a/app-text/epdfview/ChangeLog b/app-text/epdfview/ChangeLog
index 8bf5d938b813..5a81ac3556aa 100644
--- a/app-text/epdfview/ChangeLog
+++ b/app-text/epdfview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/epdfview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.40 2011/08/07 12:54:29 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.41 2011/08/07 17:04:16 billie Exp $
+
+  07 Aug 2011; Daniel Pielmeier <billie@gentoo.org> epdfview-0.1.8.ebuild:
+  Switch to EAPI 4 and fdo-mime instead of gnome2 eclass. Restrict test and
+  remove debug USE flag as both do not work properly.
 
 *epdfview-0.1.8 (07 Aug 2011)
 
diff --git a/app-text/epdfview/Manifest b/app-text/epdfview/Manifest
index 800d6a25c5ec..78120f70a26e 100644
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@@ -11,13 +11,13 @@ DIST epdfview-0.1.7.tar.bz2 443609 RMD160 485399d1982a3f8128322ee7e13d46225573ba
 DIST epdfview-0.1.8.tar.bz2 466270 RMD160 f9444fe278863fdbb545543957a8777e1129ffed SHA1 72da8958f58cf7ec55b55541f2e67895b402df3f SHA256 948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0
 EBUILD epdfview-0.1.6-r1.ebuild 1108 RMD160 a813a18445b1c17cf475e6144208bc7236a62272 SHA1 ad179989765f3ed7f61cd0c9f1a61d39e3a54697 SHA256 590131dcd86376f829fc2769a1d5068d03788408c9272885177a7a150bbbc2fe
 EBUILD epdfview-0.1.7-r2.ebuild 1392 RMD160 bf22e22e09fa95167f8941d853e4161c66947619 SHA1 a2752995472546efb438c615ea2ac3077971c5c3 SHA256 5776dcfd5b8362548645566ea4a02580c8dcd1e4f0b3e292e26b063ec4a8e417
-EBUILD epdfview-0.1.8.ebuild 1276 RMD160 ba1bb8655ecd55b28889296460fccc085b38f646 SHA1 cd5d2c4b74b3074936ce2473dcc969e0bb470a86 SHA256 4cc99bb1646f4b4786b7a8facb730fbb1c1c52f46ff5e357dbdf2e1f1a10f783
-MISC ChangeLog 5804 RMD160 b0a67e6109bbdb5116d2f54f4783560ffb0343cf SHA1 3b32a7f75edc4286f6408ca046d174407b0fce76 SHA256 afb9cd46d0244a04b79aad433df5e792ec91e8a0ed0b3b96915ff367a79fa1b5
+EBUILD epdfview-0.1.8.ebuild 1360 RMD160 598706fb5b4ba90ed9c520ae9f92fa51bbc3c288 SHA1 184cd96da62910e78cbe6b6caf53e4a22645fdd1 SHA256 d30737e99ceb74f85f549ce39c80b157b66f7a9b29d7bbfbbd8036ca3f2499ba
+MISC ChangeLog 6010 RMD160 b5bfdf52befa187ac9fa731d6366c749ffbd607a SHA1 4ead9e157e6b22d37b4a60ab90e4f69e7082dc7d SHA256 ef554ac8696d545ae47b46deaad5dcfc6538b03ad47242fb037bd4aae6c6ab28
 MISC metadata.xml 163 RMD160 ba353b61c2868f08c1a5ab7fd17ba07e23803ada SHA1 2c739f5b77738ff409261fc42afe98d34184dd59 SHA256 594509291d2b412ff651880da503140d0e9a954ecf778878edabb1875682b6b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4+iyUACgkQlcuUeyFa0U2u6wCfSgafSejnvwYjlBlx0hbA3YoB
-kWkAoIL+BUJRfV7JmJMwO4vw061NAoDj
-=07AI
+iEYEAREIAAYFAk4+xaUACgkQlcuUeyFa0U10bQCcDbJCJCp0MOKAr99tuwcrAHMe
+2ioAn0LChZ9VZIKc1E2VbmNsYuMOpuXB
+=9nZM
 -----END PGP SIGNATURE-----
diff --git a/app-text/epdfview/epdfview-0.1.8.ebuild b/app-text/epdfview/epdfview-0.1.8.ebuild
index 8e9370d99357..eb72d6cd6295 100644
--- a/app-text/epdfview/epdfview-0.1.8.ebuild
+++ b/app-text/epdfview/epdfview-0.1.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.1 2011/08/07 12:54:29 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.2 2011/08/07 17:04:16 billie Exp $
 
-EAPI=2
-inherit gnome2
+EAPI=4
+inherit fdo-mime
 
 DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
 HOMEPAGE="http://trac.emma-soft.com/epdfview/"
@@ -12,7 +12,7 @@ SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cups debug nls test"
+IUSE="cups nls test"
 
 RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
 	>=x11-libs/pango-1.28.4
@@ -24,24 +24,21 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 	userland_GNU? ( >=sys-apps/findutils-4.4 )"
 
-pkg_setup() {
-	G2CONF="--disable-dependency-tracking
-		$(use_enable nls)
-		$(use_with cups)"
-
-	DOCS="AUTHORS NEWS README THANKS"
-}
+RESTRICT="test"
 
 src_prepare() {
 	sed -i \
 		-e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
 		data/epdfview.desktop || die
+}
 
-	gnome2_src_prepare
+src_configure() {
+	econf $(use_with cups) \
+		$(use_enable nls)
 }
 
 src_install() {
-	gnome2_src_install
+	default
 
 	local res
 	for res in 24 32 48; do
@@ -49,3 +46,13 @@ src_install() {
 		newins data/icon_epdfview-${res}.png epdfview.png || die
 	done
 }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}