Remove invalid USE static. Move pkgconfig to DEPEND from RDEPEND. Install .desktop file to correct directory.

Package-Manager: portage-2.1.5_rc5

4 files changed, 36 insertions, 98 deletions

diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog
index 89f10389e33d..6d30f324f384 100644
--- a/media-gfx/pornview/ChangeLog
+++ b/media-gfx/pornview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/pornview
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.31 2007/05/13 19:49:08 bangert Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.32 2008/04/21 14:51:42 drac Exp $
+
+  21 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -pornview-0.2.0_pre1.ebuild, pornview-0.2.0_pre1-r1.ebuild:
+  Remove invalid USE static. Move pkgconfig to DEPEND from RDEPEND. Install
+  .desktop file to correct directory.
 
   13 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   fix herd
diff --git a/media-gfx/pornview/Manifest b/media-gfx/pornview/Manifest
index 4e7a1f8cf958..77fdf155b0c4 100644
--- a/media-gfx/pornview/Manifest
+++ b/media-gfx/pornview/Manifest
@@ -2,7 +2,6 @@ AUX gtkxine.diff 676 RMD160 fc0e592c1108d3de18bbf8e6021a9fce2b2156d1 SHA1 6838d6
 AUX pornview-0.2.0_pre1-4.diff 1613 RMD160 ff0ee5a7c4abb9a8ab77fec31dba0af2cae4c56e SHA1 ab1f851e71cc66f05adecea4d34f9513c30809c3 SHA256 2880da98fde9caad8c422558d9f85b30eaa854a85444417e8336430b673fa121
 AUX traypatch.diff 15710 RMD160 5cdc5e7ad329eeac0a9359b1e0536f28b0d146ea SHA1 09a2bb140c672e499d2267dca0524d5f07a6ba13 SHA256 828f175a4942b795b131e4aa56966b1261a4899beb2e8a2f22ca137e533fffd7
 DIST pornview-0.2.0pre1.tar.gz 608864 RMD160 03a9d01235fafbfb9825da43e79fbfb66a2ecbfa SHA1 3a26412affac6e211da928cc471a4b1bbc55b2a0 SHA256 66502f936f743489dcff14e429a80e4670a60221187c34f58f87530229874fb9
-EBUILD pornview-0.2.0_pre1-r1.ebuild 1215 RMD160 dbe99531738260b45b503eaf906204474d3f2461 SHA1 cb152037dccbd3b7a31df8ded5c88cbaa27f12fc SHA256 9c204da0dd9ccb5a70f05d65babfbe6c4dd3aa6acf6a31f294120d985e3555a7
-EBUILD pornview-0.2.0_pre1.ebuild 1630 RMD160 60f5c7b35e0d8cb43fecdbec7b7e799f8895d878 SHA1 97896554eea6c7b5bb46104afc444c689a1147b0 SHA256 a0a4bb65277bd6a79a9d5a55f90844d640ea6bbaa4ce4c426b495464f9298733
-MISC ChangeLog 3572 RMD160 6d1af269fecf3cad70a1806d1837a627559c6f53 SHA1 0fc7223e882184fbf9c6bf38fa829421d0b50c1f SHA256 dab95863e3f1830c33a59fb52da890bba1b6dbff7f7c0f70bce6aa27963c1455
+EBUILD pornview-0.2.0_pre1-r1.ebuild 1215 RMD160 9aa9daf7a0cbef1e82ae9c1981341a1667047859 SHA1 8f8f2af479a13f6e40b2225ff439bf8ae8c21725 SHA256 b211f131145b635b31a73b16ff7cd682795f758c1d20cea1873c6b6a51f3a364
+MISC ChangeLog 3795 RMD160 38c3db449fc20233fa98c1ceb490946e813825e5 SHA1 cb5ec32e81c7888cff338a01fb986aa0d39ba93f SHA256 9777960c122893443da68da6cd599ffabb7f6c71c31d6d77952a5f9a53162979
 MISC metadata.xml 224 RMD160 0205a791be455cc2f0e431f9a51c9b1eecc9a42f SHA1 3ecfb3b313bd690ef75876aa22b6d07eff29d8b0 SHA256 86b3339d98bcf668311512e51a0826f35ca7787c099e6351c75690e20825b8fd
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild
index dca90a3a5c8c..d5bdd9185d6d 100644
--- a/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild
+++ b/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild
@@ -1,53 +1,49 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild,v 1.3 2007/01/19 15:30:46 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild,v 1.4 2008/04/21 14:51:42 drac Exp $
 
-inherit eutils
-
-IUSE="jpeg mplayer nls static"
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Image viewer/manager with optional support for MPEG movies."
 HOMEPAGE="http://pornview.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="jpeg nls mplayer"
 
-DEPEND="media-libs/libpng
+RDEPEND="media-libs/libpng
 	mplayer? ( media-video/mplayer )
 	jpeg? ( media-libs/jpeg )
-	>=x11-libs/gtk+-2.0
+	>=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
+S=${WORKDIR}/${P/_/}
 
-S="${WORKDIR}/${P/_/}"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-4.diff \
+		"${FILESDIR}"/traypatch.diff
+}
 
 src_compile() {
-	local myflags
+	local myconf="--with-gtk2"
 
-	myflags="${myflags} --with-gtk2"
+	use mplayer && myconf="${myconf} --enable-mplayer"
+	use jpeg || myconf="${myconf} --disable-exif"
+	use nls || myconf="${myconf} --disable-nls"
 
-	if use mplayer; then
-	  myflags="${myflags} --enable-mplayer"
-	fi
-
-	use jpeg || myflags="${myflags} --disable-exif"
-
-	use nls || myflags="${myflags} --disable-nls"
-
-	use static && myflags="${myflags} --enable-static"
-
-	epatch ${FILESDIR}/${P}-4.diff || die
-	epatch ${FILESDIR}/traypatch.diff || die
-
-	econf ${myflags} || die "./configure failed"
-
-	emake || die "make failed"
+	tc-export CC
+	econf ${myconf}
+	emake || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-
+	emake DESTDIR="${D}" desktopdir="/usr/share/applications" \
+		install || die "emake install failed."
 	dodoc AUTHORS NEWS README
 }
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1.ebuild
deleted file mode 100644
index 9a3216f752f0..000000000000
--- a/media-gfx/pornview/pornview-0.2.0_pre1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1.ebuild,v 1.18 2007/01/19 15:30:46 masterdriverz Exp $
-
-inherit eutils
-
-IUSE="jpeg mplayer nls static xine"
-
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies."
-HOMEPAGE="http://pornview.sourceforge.net"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/libpng
-	mplayer? ( media-video/mplayer )
-	jpeg? ( media-libs/jpeg )
-	>=x11-libs/gtk+-2.0
-	xine? ( =media-libs/xine-lib-1* )
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig"
-
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
-
-S="${WORKDIR}/${P/_/}"
-
-src_compile() {
-	local myflags
-	# --with-normal-paned     Use standard gtk+ paned
-
-	# This is considered experimental but appears to work fine
-	use gtk2 && myflags="${myflags} --with-gtk2"
-
-	use jpeg || myflags="${myflags} --disable-exif"
-
-	# mplayer and xine movie support cannot be installed at the same
-	# time so prefer xine support over mplayer if both are available
-	if use xine; then
-		myflags="${myflags} --enable-xine"
-	elif use mplayer; then
-		myflags="${myflags} --disable-xinetest --enable-mplayer"
-	else
-		myflags="${myflags} --disable-xinetest"
-	fi
-
-	use nls || myflags="${myflags} --disable-nls"
-
-	use static && myflags="${myflags} --enable-static"
-
-	epatch ${FILESDIR}/${P}-4.diff || die
-	epatch ${FILESDIR}/gtkxine.diff || die
-
-	econf ${myflags} || die "./configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS NEWS README
-}