diff options
Diffstat (limited to 'media-gfx/pornview')
| -rw-r--r-- | media-gfx/pornview/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/pornview/pornview-0.2.0_pre1-r1.ebuild | 58 | ||||
| -rw-r--r-- | media-gfx/pornview/pornview-0.2.0_pre1.ebuild | 62 |
3 files changed, 34 insertions, 95 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/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 -} |