summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2009-01-03 15:15:28 +0000
committerChristoph Mende <angelos@gentoo.org>2009-01-03 15:15:28 +0000
commit1b5c3318ed2fab6046a5e443ee049f5bcfd37c75 (patch)
treed9a839dd599d13988c4e46f25639774fbc896e7e /media-video/dvdstyler
parentppc stable #252656 (diff)
downloadgentoo-2-1b5c3318ed2fab6046a5e443ee049f5bcfd37c75.tar.gz
gentoo-2-1b5c3318ed2fab6046a5e443ee049f5bcfd37c75.tar.bz2
gentoo-2-1b5c3318ed2fab6046a5e443ee049f5bcfd37c75.zip
Bumped to EAPI2, changed netpbm dependency to include [jpeg], fixed wxGTK dependency
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'media-video/dvdstyler')
-rw-r--r--media-video/dvdstyler/ChangeLog9
-rw-r--r--media-video/dvdstyler/dvdstyler-1.5.1.ebuild17
-rw-r--r--media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild17
3 files changed, 23 insertions, 20 deletions
diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index a516f20a4e35..29335f5a90bc 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/dvdstyler
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.30 2008/04/01 15:17:39 dragonheart Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.31 2009/01/03 15:15:28 angelos Exp $
+
+ 03 Jan 2009; Christoph Mende <angelos@gentoo.org> dvdstyler-1.5.1.ebuild,
+ dvdstyler-1.5.1_p2.ebuild:
+ Bumped to EAPI2, changed netpbm dependency to include [jpeg], fixed wxGTK
+ dependency
01 Apr 2008; Daniel Black <dragonheart@gentoo.org>
dvdstyler-1.5-r1.ebuild, dvdstyler-1.5.1.ebuild,
diff --git a/media-video/dvdstyler/dvdstyler-1.5.1.ebuild b/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
index 9e7f04835120..57ef686b9a21 100644
--- a/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1.ebuild,v 1.2 2008/04/01 15:17:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1.ebuild,v 1.3 2009/01/03 15:15:28 angelos Exp $
+EAPI=2
inherit wxwidgets
MY_P=DVDStyler-${PV}
@@ -19,11 +20,10 @@ RDEPEND="app-cdr/dvd+rw-tools
>=media-video/dvdauthor-0.6.10
media-video/mpgtx
>=media-video/mjpegtools-1.8.0
- =x11-libs/wxGTK-2.6*
- media-libs/netpbm
+ x11-libs/wxGTK:2.6
+ media-libs/netpbm[jpeg]
>=media-libs/wxsvg-1.0_beta7
virtual/cdrtools
- virtual/libc
gnome? ( >=gnome-base/libgnomeui-2.0 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -31,17 +31,16 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${MY_P}
-src_compile() {
+src_configure() {
export WX_GTK_VER="2.6"
need-wxwidgets gtk2
echo -e "all:\n\ninstall:"> install.win32/Makefile.in
myconf="${myconf} --with-wx-config=${WX_CONFIG}"
- econf ${myconf} || die "econf failed!"
- emake || die "emake failed!"
+ econf ${myconf}
}
src_install() {
- emake DESTDIR="${D}" install || die "failed to install"
+ emake DESTDIR="${D}" install || die "emake install failed"
rm "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
}
diff --git a/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild b/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
index 3963ccb5b565..a5a7745b38ce 100644
--- a/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild,v 1.2 2008/04/01 15:17:39 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild,v 1.3 2009/01/03 15:15:28 angelos Exp $
+EAPI=2
inherit wxwidgets
MY_P=DVDStyler-${PV/_p/_}
@@ -19,11 +20,10 @@ RDEPEND="app-cdr/dvd+rw-tools
>=media-video/dvdauthor-0.6.10
media-video/mpgtx
>=media-video/mjpegtools-1.8.0
- =x11-libs/wxGTK-2.6*
- media-libs/netpbm
+ x11-libs/wxGTK:2.6
+ media-libs/netpbm[jpeg]
>=media-libs/wxsvg-1.0_beta7
virtual/cdrtools
- virtual/libc
gnome? ( >=gnome-base/libgnomeui-2.0 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -31,16 +31,15 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${MY_P}
-src_compile() {
+src_configure() {
export WX_GTK_VER="2.6"
need-wxwidgets gtk2
myconf="${myconf} --with-wx-config=${WX_CONFIG}"
- econf ${myconf} || die "econf failed!"
- emake || die "emake failed!"
+ econf ${myconf}
}
src_install() {
- emake DESTDIR="${D}" install || die "failed to install"
+ emake DESTDIR="${D}" install || die "emake install failed"
rm "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
}