Fix reversed deps and move G2CONF inside pkg_setup.

(Portage version: 2.1.5_rc7)

3 files changed, 53 insertions, 32 deletions

diff --git a/app-cdr/graveman/ChangeLog b/app-cdr/graveman/ChangeLog
index f5e442354aa0..57004de60bdb 100644
--- a/app-cdr/graveman/ChangeLog
+++ b/app-cdr/graveman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/graveman
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/ChangeLog,v 1.46 2007/06/14 20:08:16 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/ChangeLog,v 1.47 2008/05/10 03:42:55 drac Exp $
+
+  10 May 2008; Samuli Suominen <drac@gentoo.org> +files/desktop-entry.patch,
+  graveman-0.3.12_p5-r1.ebuild:
+  Fix reversed deps and move G2CONF inside pkg_setup.
 
   14 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   -graveman-0.3.12_p5.ebuild, graveman-0.3.12_p5-r1.ebuild:
diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch
new file mode 100644
index 000000000000..4a683d2c84ec
--- /dev/null
+++ b/app-cdr/graveman/files/desktop-entry.patch
@@ -0,0 +1,17 @@
+diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in
+--- graveman-0.3.12-5.orig/desktop/graveman.desktop.in	2005-05-24 00:07:08.000000000 +0300
++++ graveman-0.3.12-5/desktop/graveman.desktop.in	2008-05-10 06:33:32.000000000 +0300
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Graveman
+ Name[cs]=Graveman
+ Name[de]=Graveman
+@@ -48,5 +47,5 @@
+ Exec=graveman
+ Terminal=false
+ Type=Application
+-Icon=graveman48.png
+-Categories=Application;Utility;
++Icon=graveman48
++Categories=Utility;
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild
index ce3ecfde85c8..97ea9ceb60c8 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild
@@ -1,8 +1,8 @@
-# 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/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild,v 1.6 2007/06/14 20:08:16 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/graveman/graveman-0.3.12_p5-r1.ebuild,v 1.7 2008/05/10 03:42:55 drac Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
 HOMEPAGE="http://graveman.tuxfamily.org/"
@@ -13,43 +13,43 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="debug dvdr flac mp3 nls vorbis"
 
-DEPEND=">=x11-libs/gtk+-2.4
+RDEPEND=">=x11-libs/gtk+-2.4
 	>=dev-libs/glib-2.4
 	>=gnome-base/libglade-2.4
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig
-	flac? ( >=media-libs/flac-1.1.0 )
-	nls? ( sys-devel/gettext )
-	mp3? ( >=media-libs/libid3tag-0.15
-		>=media-libs/libmad-0.15 )
-	vorbis? ( >=media-libs/libogg-1.0
-		>=media-libs/libvorbis-1.0 )"
-RDEPEND="${DEPEND}
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libid3tag
+		media-libs/libmad
+		media-sound/sox )
+	vorbis? ( media-libs/libogg
+		media-libs/libvorbis
+		media-sound/sox )
 	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.9
+	app-cdr/cdrdao
 	media-libs/libmng
-	dvdr? ( >=app-cdr/dvd+rw-tools-5.20 )
-	vorbis? ( >=media-sound/sox-12.17.0 )
-	mp3? ( >=media-sound/sox-12.17.0 )
+	dvdr? ( app-cdr/dvd+rw-tools )
 	nls? ( virtual/libintl )"
-
-G2CONF="${G2CONF} \
-	$(use_enable flac) \
-	$(use_enable mp3) \
-	$(use_enable vorbis ogg) \
-	$(use_enable debug)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig
+	dev-util/intltool"
 
 S=${WORKDIR}/${P/_p/-}
 
+DOCS="AUTHORS ChangeLog NEWS README* THANKS"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable flac) $(use_enable mp3)
+	$(use_enable vorbis ogg) $(use_enable debug)"
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/joliet-long.patch
-	epatch ${FILESDIR}/rename.patch
-	epatch ${FILESDIR}/fix-menu.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/joliet-long.patch \
+		"${FILESDIR}"/rename.patch \
+		"${FILESDIR}"/desktop-entry.patch
+
 	if use mp3 || use vorbis; then
-		epatch ${FILESDIR}/sox.patch
+		epatch "${FILESDIR}"/sox.patch
 	fi
 }
-DOCS="AUTHORS ChangeLog INSTALL NEWS README* THANKS"
-USE_DESTDIR="1"