summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/gnomebaker/ChangeLog7
-rw-r--r--app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild16
-rw-r--r--app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild58
3 files changed, 13 insertions, 68 deletions
diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index c1a98bb72538..41f64f2adc06 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,11 @@
# 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.64 2012/05/03 07:51:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.65 2012/10/25 18:28:40 eva Exp $
+
+ 25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -gnomebaker-0.6.4.ebuild,
+ gnomebaker-0.6.4-r1.ebuild:
+ Re-add mistakenly dropped gstreamer slots. Move G2CONF to src_prepare, it
+ needs not to be defined for binpkg. Drop old revision.
03 May 2012; Jeff Horelick <jdhore@gentoo.org> gnomebaker-0.6.4.ebuild,
gnomebaker-0.6.4-r1.ebuild:
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
index 510aa16ce646..b20124bf783f 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.6 2012/05/03 07:51:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild,v 1.7 2012/10/25 18:28:40 eva Exp $
EAPI=4
GCONF_DEBUG=no
@@ -19,28 +19,26 @@ COMMON_DEPEND="app-cdr/cdrdao
dev-libs/libxml2
>=gnome-base/libglade-2
>=gnome-base/libgnomeui-2
- =media-libs/gstreamer-0.10*
+ >=media-libs/gstreamer-0.10:0.10
virtual/cdrtools
x11-libs/cairo
x11-libs/gtk+:2
dvdr? ( app-cdr/dvd+rw-tools )
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* )"
+ >=media-libs/gst-plugins-good-0.10:0.10
+ flac? ( >=media-plugins/gst-plugins-flac-0.10:0.10 )
+ mp3? ( >=media-plugins/gst-plugins-mad-0.10:0.10 )
+ vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10:0.10 )"
DEPEND="${COMMON_DEPEND}
app-text/rarian
dev-util/intltool
virtual/pkgconfig
sys-devel/gettext"
-pkg_setup() {
+src_prepare() {
G2CONF="$(use_enable libnotify)"
-}
-src_prepare() {
epatch \
"${FILESDIR}"/${P}-libnotify-0.7.patch \
"${FILESDIR}"/${P}-ldadd.patch \
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
deleted file mode 100644
index f831c6727e63..000000000000
--- a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.ebuild,v 1.9 2012/05/03 07:51:48 jdhore Exp $
-
-EAPI=3
-GCONF_DEBUG=no
-inherit eutils gnome2
-
-DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
-HOMEPAGE="http://sourceforge.net/projects/gnomebaker"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE="dvdr flac libnotify mp3 vorbis"
-
-RDEPEND=">=x11-libs/gtk+-2.8:2
- >=gnome-base/libgnomeui-2.8.1
- >=dev-libs/libxml2-2.4:2
- >=gnome-base/libglade-2.4.2:2.0
- >=media-libs/gstreamer-0.10:0.10
- x11-libs/cairo
- app-cdr/cdrdao
- virtual/cdrtools
- dvdr? ( app-cdr/dvd+rw-tools )
- flac? ( >=media-plugins/gst-plugins-flac-0.10:0.10
- media-libs/gst-plugins-good:0.10 )
- libnotify? ( x11-libs/libnotify )
- mp3? ( >=media-plugins/gst-plugins-mad-0.10:0.10
- media-libs/gst-plugins-good:0.10 )
- vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10:0.10
- >=media-libs/libogg-1.1.2
- media-libs/gst-plugins-good:0.10 )"
-DEPEND="${RDEPEND}
- app-text/rarian
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-dependency-tracking
- $(use_enable libnotify)"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_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
-}