summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-02-25 00:02:44 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-02-25 00:02:44 +0000
commit6399a3a141fe3a67e58ca59a712ed359f958f2cd (patch)
treebbfa16d4dfaf6d1929d7361e8e4e63f4115cf22d /app-cdr
parentVersion bump. Fix missing deps for eautoreconf (bug #405663, thanks to Piotr ... (diff)
downloadgentoo-2-6399a3a141fe3a67e58ca59a712ed359f958f2cd.tar.gz
gentoo-2-6399a3a141fe3a67e58ca59a712ed359f958f2cd.tar.bz2
gentoo-2-6399a3a141fe3a67e58ca59a712ed359f958f2cd.zip
ppc64/x86 stable wrt #399921, majorish ebuild cleanup
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/gnomebaker/ChangeLog6
-rw-r--r--app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild45
2 files changed, 27 insertions, 24 deletions
diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index 10651fdcc459..43622e9ca4f8 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/gnomebaker
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.61 2012/02/24 20:09:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.62 2012/02/25 00:02:44 ssuominen Exp $
+
+ 25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+ gnomebaker-0.6.4-r1.ebuild:
+ ppc64/x86 stable wrt #399921
24 Feb 2012; Brent Baude <ranger@gentoo.org> gnomebaker-0.6.4-r1.ebuild:
Marking gnomebaker-0.6.4-r1 ppc for bug 399921
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
index 727932e5a326..e80c40d542ec 100644
--- a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild,v 1.3 2012/02/24 20:09:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild,v 1.4 2012/02/25 00:02:44 ssuominen Exp $
EAPI=4
GCONF_DEBUG=no
@@ -12,44 +12,42 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="dvdr flac libnotify mp3 vorbis"
-RDEPEND="x11-libs/gtk+:2
- gnome-base/libgnomeui
- dev-libs/libxml2:2
- gnome-base/libglade:2.0
- media-libs/gstreamer:0.10
- x11-libs/cairo
- app-cdr/cdrdao
+COMMON_DEPEND="app-cdr/cdrdao
+ dev-libs/libxml2
+ >=gnome-base/libglade-2
+ >=gnome-base/libgnomeui-2
+ =media-libs/gstreamer-0.10*
virtual/cdrtools
+ x11-libs/cairo
+ x11-libs/gtk+:2
dvdr? ( app-cdr/dvd+rw-tools )
- flac? ( media-plugins/gst-plugins-flac
- media-libs/gst-plugins-good )
- libnotify? ( x11-libs/libnotify )
- mp3? ( media-plugins/gst-plugins-mad
- media-libs/gst-plugins-good )
- vorbis? ( media-plugins/gst-plugins-vorbis
- media-libs/libogg
- media-libs/gst-plugins-good )"
-DEPEND="${RDEPEND}
+ libnotify? ( x11-libs/libnotify )"
+RDEPEND="${COMMON_DEPEND}
+ =media-libs/gst-plugins-good-0.10*
+ flac? ( =media-plugins/gst-plugins-flac-0.10* )
+ mp3? ( =media-plugins/gst-plugins-mad-0.10* )
+ vorbis? ( =media-plugins/gst-plugins-vorbis-0.10* )"
+DEPEND="${COMMON_DEPEND}
app-text/rarian
dev-util/intltool
dev-util/pkgconfig
sys-devel/gettext"
pkg_setup() {
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- $(use_enable libnotify)"
+ G2CONF="$(use_enable libnotify)"
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+ epatch \
+ "${FILESDIR}"/${P}-libnotify-0.7.patch \
"${FILESDIR}"/${P}-ldadd.patch \
"${FILESDIR}"/${P}-seldata.patch \
"${FILESDIR}"/${P}-mimetype.patch \
"${FILESDIR}"/${P}-implicits.patch
+
gnome2_src_prepare
}
@@ -58,5 +56,6 @@ src_install() {
gnomebakerdocdir=/usr/share/doc/${P} \
docdir=/usr/share/gnome/help/${PN}/C \
gnomemenudir=/usr/share/applications
- rm -rf "${D}"/usr/share/doc/${P}/*.make "${D}"/var
+
+ rm -rf "${ED}"/usr/share/doc/${P}/*.make "${ED}"/var
}