old, quoting

Package-Manager: portage-2.1.5.5

3 files changed, 22 insertions, 81 deletions

diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index c0d26b18347b..662682068a4e 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -8,7 +8,6 @@ AUX modern_cdrtools.patch 584 RMD160 703caf45884424fcc5ddf153236cf54260ebc5c7 SH
 AUX xcdroast-0.98alpha15-dvd.patch 15532 RMD160 0a871e0f4a52477a05347c5c7184b157e4c7a8ab SHA1 c6fc10ac94fa8b9826580a4fcf4e9d5466ea41c1 SHA256 0bfe89f5a18a990b5a20fec1ee1cb3129c8268000a5b039cff47fabeb2a953ab
 DIST xcdroast-0.98_alpha15_new_configure.tar.gz 82301 RMD160 125c5a48462bac3515c93f7e9f6e428cb901d80c SHA1 be4533b3c81c2cf0bf5ac6c9943c3b57ec559927 SHA256 0e33617f9315482dd95e1228e27461e45bea4516abaebfb5b6449aedaec9de90
 DIST xcdroast-0.98alpha15.tar.gz 3282794 RMD160 9198f67659023ce8f508fa2c331df9d9c8b81a8f SHA1 f354ea9ffe918c4ec11312d5537e6e245730fecc SHA256 40be77142b23fa62265a23e473bd3af43df6ab01332ea991a5ef3069530b28d8
-EBUILD xcdroast-0.98_alpha15-r4.ebuild 1505 RMD160 1e317b1bd887b5948b60bb9b79d7d2d0eda7fcac SHA1 e00005ab2be957c5d8c7c430cfb61e21f37ad9be SHA256 3e691fad3b5a9dfb5feceded8208dc9ab37446bde384ab60926ca95ca0edd77a
-EBUILD xcdroast-0.98_alpha15-r5.ebuild 1592 RMD160 4842b2c25887faabf499bff332b1b1ff4a3bbe08 SHA1 5302bdb67eb4c87503ebb5df48ddea4a4a9a9267 SHA256 fe86057c62df171d04a217f6d3b7045292262fe29f56b2ea51e8e5aee4a97ad2
+EBUILD xcdroast-0.98_alpha15-r5.ebuild 1608 RMD160 c2b1997516c39f4f3a7a732df45005acd5e4f8e1 SHA1 f9f5d8f7a199cbf8af69011b97873817e09a47cb SHA256 ad3d6906cddf7dbaf123fba6301df23216ef4df98902d05495f7a77d7b15de81
 MISC ChangeLog 10347 RMD160 8492e578807c646ef8b4098839214c4b0fb8e45f SHA1 bb43f36f9688117e3211c5f9a0b72252ef94b058 SHA256 8fe3b6c8c79b53f55928b27ce705e976c5ae874b165d2794edf36e95b3fbf831
 MISC metadata.xml 247 RMD160 7a2b92c08eec2dc74474226529601870161ced75 SHA1 30e2f8e33a1a0ccd255272d40b84fadfe13c90d5 SHA256 4e1e94075219a6cc8cde9d7249eeacbb64f0ec101401aa58aec45e5ad901f2ed
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
deleted file mode 100644
index 72330fd78600..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild,v 1.6 2007/01/15 00:17:55 metalgod Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P/_/}
-DESCRIPTION="Old-school menu based front-end for CD and DVD writing"
-HOMEPAGE="http://www.xcdroast.org/"
-SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz
-	mirror://gentoo/${P}_new_configure.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="nls"
-
-DEPEND=">=x11-libs/gtk+-2.0.3
-	dev-util/pkgconfig"
-
-RDEPEND="virtual/cdrtools"
-
-src_unpack() {
-	unpack ${P/_/}.tar.gz
-	cd ${S}
-	unpack ${P}_new_configure.tar.gz
-
-	cd ${S}/src
-	epatch ${FILESDIR}/gtk2locale.patch
-	epatch ${FILESDIR}/modern_cdrtools.patch
-	epatch ${FILESDIR}/cdrecord_versions.patch
-	epatch ${FILESDIR}/cdrecord2wodim.patch
-	use amd64 && epatch ${FILESDIR}/64bit_gsize.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		--enable-gtk2 \
-		--disable-dependency-tracking || die
-
-	make PREFIX=/usr || die
-}
-
-src_install() {
-	make PREFIX=/usr DESTDIR=${D} install || die
-
-	cd ${S}/doc
-	dodoc DOCUMENTATION FAQ README* TRANSLATION.HOWTO
-
-	# move man pages to /usr/share/man to be LFH compliant
-	mv ${D}/usr/man ${D}/usr/share
-
-	# remove extraneous directory
-	rm ${D}/usr/etc -rf
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins ${S}/xpms/xcdricon.xpm xcdroast.xpm
-
-	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
-}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r5.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r5.ebuild
index 42ce7c182718..9e5fd2ed45b7 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r5.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r5.ebuild
@@ -1,37 +1,39 @@
-# 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/xcdroast/xcdroast-0.98_alpha15-r5.ebuild,v 1.5 2007/12/14 18:17:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r5.ebuild,v 1.6 2008/06/15 03:22:57 drac Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P/_/}
 DESCRIPTION="Old-school menu based front-end for CD and DVD writing"
 HOMEPAGE="http://www.xcdroast.org/"
 SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz
 	mirror://gentoo/${P}_new_configure.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
-DEPEND=">=x11-libs/gtk+-2.0.3
+RDEPEND=">=x11-libs/gtk+-2
+	virtual/cdrtools"
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-RDEPEND="virtual/cdrtools"
+S=${WORKDIR}/${P/_/}
 
 src_unpack() {
 	unpack ${P/_/}.tar.gz
-	cd ${S}
+	cd "${S}"
 	unpack ${P}_new_configure.tar.gz
 
-	cd ${S}/src
-	epatch ${FILESDIR}/gtk2locale.patch
-	epatch ${FILESDIR}/modern_cdrtools.patch
-	epatch ${FILESDIR}/cdrecord_versions.patch
-	epatch ${FILESDIR}/cdrecord2wodim.patch
-	epatch ${FILESDIR}/cdda2wav2icedax.patch
-	epatch ${FILESDIR}/mkisofs2genisoimage.patch
-	use amd64 && epatch ${FILESDIR}/64bit_gsize.patch
+	cd "${S}"/src
+	epatch "${FILESDIR}"/gtk2locale.patch \
+		"${FILESDIR}"/modern_cdrtools.patch \
+		"${FILESDIR}"/cdrecord_versions.patch \
+		"${FILESDIR}"/cdrecord2wodim.patch \
+		"${FILESDIR}"/cdda2wav2icedax.patch \
+		"${FILESDIR}"/mkisofs2genisoimage.patch
+	use amd64 && epatch "${FILESDIR}"/64bit_gsize.patch
 }
 
 src_compile() {
@@ -44,19 +46,19 @@ src_compile() {
 }
 
 src_install() {
-	make PREFIX=/usr DESTDIR=${D} install || die
+	make PREFIX=/usr DESTDIR="${D}" install || die
 
-	cd ${S}/doc
+	cd "${S}"/doc
 	dodoc DOCUMENTATION FAQ README* TRANSLATION.HOWTO
 
 	# move man pages to /usr/share/man to be LFH compliant
-	mv ${D}/usr/man ${D}/usr/share
+	mv "${D}"/usr/man "${D}"/usr/share
 
 	# remove extraneous directory
-	rm ${D}/usr/etc -rf
+	rm "${D}"/usr/etc -rf
 
 	insinto /usr/share/icons/hicolor/48x48/apps
-	newins ${S}/xpms/xcdricon.xpm xcdroast.xpm
+	newins "${S}"/xpms/xcdricon.xpm xcdroast.xpm
 
 	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
 }