Install more documentation and replace cdrtools depend from virtual to app-cdr wrt #263058

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 40 insertions, 24 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index b2ea9aa41c5c..fced2b0eeb0a 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/xcdroast
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.63 2009/03/01 23:48:08 patrick Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.64 2009/05/08 13:43:53 ssuominen Exp $
+
+  08 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xcdroast-0.98_alpha16.ebuild:
+  Install more documentation and replace cdrtools depend from virtual to
+  app-cdr wrt #263058
 
 *xcdroast-0.98_alpha16 (01 Mar 2009)
 
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 99184d8ed333..fd74e8758ac9 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -11,6 +11,6 @@ DIST xcdroast-0.98_alpha15_new_configure.tar.gz 82301 RMD160 125c5a48462bac3515c
 DIST xcdroast-0.98alpha15.tar.gz 3282794 RMD160 9198f67659023ce8f508fa2c331df9d9c8b81a8f SHA1 f354ea9ffe918c4ec11312d5537e6e245730fecc SHA256 40be77142b23fa62265a23e473bd3af43df6ab01332ea991a5ef3069530b28d8
 DIST xcdroast-0.98alpha16.tar.gz 3563666 RMD160 d0d63b6387d9aeace5aaef8ee935b6c6d4836259 SHA1 bbb3184a7e2bfd80d931698002dc9f74f136241d SHA256 a2b96bb9799b5880befe2d01c5e6a0b63110dd61f59384935b750e72bc73984d
 EBUILD xcdroast-0.98_alpha15-r5.ebuild 1608 RMD160 c2b1997516c39f4f3a7a732df45005acd5e4f8e1 SHA1 f9f5d8f7a199cbf8af69011b97873817e09a47cb SHA256 ad3d6906cddf7dbaf123fba6301df23216ef4df98902d05495f7a77d7b15de81
-EBUILD xcdroast-0.98_alpha16.ebuild 1262 RMD160 0c45497179936ec419ab892e70c13c9bc31697ee SHA1 49eeacd6e039da03579caa578bd537352447ccb1 SHA256 a7e0c47cd135b2ee9a7b4416b4bac55a30215e0231660dcc31cf62720fbf80eb
-MISC ChangeLog 10540 RMD160 ec375b88fccf01346a747e31a6e1aacc8ba8b10c SHA1 de313a48cfdb346fe419d4d76e5f4a9c3575faa4 SHA256 ebf4476daec8911a71434552bdc5af4a978b85003d3303afaee932a1244f76ac
+EBUILD xcdroast-0.98_alpha16.ebuild 1400 RMD160 c1a68fd9e98ff3f3067e34b1014830924b7960e9 SHA1 a3fac38324b45100fdc68f2af873f31ca03cdfb8 SHA256 73d8d187d9f5a76219e1710da1de7d6bae282f94f7ee5d9d4e51d5442381d322
+MISC ChangeLog 10724 RMD160 7de6188ade1a1eb793c176d5531f939cc45e3675 SHA1 4dc1891d3da548714ebbb4d64cea9621489f8224 SHA256 bec6e6d72ac3fa1edebad99ee7ac9bc483eb0aec7d626ef60aeca47fa1442295
 MISC metadata.xml 247 RMD160 7a2b92c08eec2dc74474226529601870161ced75 SHA1 30e2f8e33a1a0ccd255272d40b84fadfe13c90d5 SHA256 4e1e94075219a6cc8cde9d7249eeacbb64f0ec101401aa58aec45e5ad901f2ed
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild
index b67005f1d43a..e9c12fe2ebfc 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild,v 1.2 2009/03/05 16:04:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild,v 1.3 2009/05/08 13:43:53 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit gnome2-utils eutils
 
 DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
 HOMEPAGE="http://www.xcdroast.org/"
@@ -13,42 +14,52 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="nls"
 
-RDEPEND=">=x11-libs/gtk+-2
-	virtual/cdrtools"
+RDEPEND=">=x11-libs/gtk+-2:2
+	app-cdr/cdrtools"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${P/_/}
 
-src_unpack() {
-	unpack ${P/_/}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}/io_compile.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/io_compile.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable nls) \
 		--enable-gtk2 \
-		--disable-dependency-tracking || die
+		--disable-dependency-tracking \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc
+}
 
-	make PREFIX=/usr || die
+src_compile() {
+	emake PREFIX=/usr || die "emake failed"
 }
 
 src_install() {
-	make PREFIX=/usr DESTDIR="${D}" install || die
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
 
-	cd "${S}"/doc
-	dodoc DOCUMENTATION FAQ README* TRANSLATION.HOWTO
+	dodoc AUTHORS ChangeLog README doc/* doc/manual/README.txt
 
-	# 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/doc/${PF}/manual
+	doins doc/manual/xcdroast-manual.pdf
 
 	insinto /usr/share/icons/hicolor/48x48/apps
-	newins "${S}"/xpms/xcdricon.xpm xcdroast.xpm
+	newins xpms/xcdricon.xpm xcdroast.xpm
 
 	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}