amd64 stable, rewrite ebuild

Package-Manager: portage-2.1.4

3 files changed, 23 insertions, 44 deletions

diff --git a/media-sound/muse/ChangeLog b/media-sound/muse/ChangeLog
index a1096506e090..a6acbb259a0f 100644
--- a/media-sound/muse/ChangeLog
+++ b/media-sound/muse/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for media-sound/muse
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.21 2008/02/01 09:15:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/ChangeLog,v 1.22 2008/02/01 10:38:54 drac Exp $
 
-  01 Feb 2008; Christian Faulhammer <opfer@gentoo.org> muse-0.9.2.ebuild:
-  quote variables
+  01 Feb 2008; Samuli Suominen <drac@gentoo.org> muse-0.9.2.ebuild:
+  amd64 stable wrt #205452
 
   31 Jan 2008; Christian Faulhammer <opfer@gentoo.org> muse-0.9.2.ebuild:
   stable x86, bug 205452
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
index 27f63e7418b2..11c556568aed 100644
--- a/media-sound/muse/Manifest
+++ b/media-sound/muse/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX muse-0.9.1-include.patch 549 RMD160 cbc66f883b8fd1e00908e428aeee2f12b8ab6723 SHA1 041601df40a0ee616560d137fd9be44028f8f41e SHA256 4dac0dc6e390bcc9781604ba12bc1ab098b91ab75d59c58ad875dc3fc36dbc74
 AUX muse-0.9.1-miscfixes.patch 1914 RMD160 b08c6c71cecfa4da3a801837a7dcd35b4d356f1b SHA1 e7cd6ef804b23c2a8a76c14f858dc7c271d9bb85 SHA256 811b7c10049e0473f9407e478e6b9ed0bf1d06dc7cd005251c24bd126f220f72
 AUX muse-0.9.2-asneeded.patch 280 RMD160 2ab8ad01862b7dbeacfa16f78ac24d6743e0688a SHA1 24f01a41ff2c48244ac67e20ff07900f6a229045 SHA256 82100d43cc1ae62b913eb115de05a0c9c4d44c19475f432c41bc8183852c68ed
 DIST MuSE-0.9.1.tar.gz 1406110 RMD160 10d12c3876955bfeb530b7e371c5e11689109d53 SHA1 eced4b179bb29a5229221dae25d1278e29bba467 SHA256 3163bda598dbe452661ef8c5316a25672a0c501bfe17d4f5007f051fc5e7939d
 DIST MuSE-0.9.2.tar.gz 1420411 RMD160 05e156c44abbf48f26b30f6204c4524a760606d2 SHA1 b953f19a29ead39cc1723d07b5bf10ad1453afb2 SHA256 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197
 EBUILD muse-0.9.1.ebuild 1320 RMD160 9c3af7b3eadc29b2ee661ac238ee8625a0e99a10 SHA1 12a9ee7c80ef50bf9aaa5e0e43134ba9c7b399ac SHA256 f08d37235153b3a815cf2e39ce9fb3801bb573fb169bef0f9240f1ec454f2e9f
-EBUILD muse-0.9.2.ebuild 1244 RMD160 04ee9954f02e980b787c97973a1553c4e7828f34 SHA1 dfdebceb0967734ca770e58e6e9f4e4fa2425cdb SHA256 246c7ed8ac3e50dae9d55d176727328f0c22788348251c83264b2a4035195cea
-MISC ChangeLog 2774 RMD160 4762cfdd978508718e98fe16aa70175ea9c353f3 SHA1 88b17f26811529b46a7ee940144b8c7824c4dd3f SHA256 eb07585e074bc2b40aa17db789c64bd3e94486a377eb055c47647a5a5bcb8aec
+EBUILD muse-0.9.2.ebuild 1038 RMD160 b58673829a381594da4afe3d265ae14b42cbbcb7 SHA1 6898f70e6c07409bf0357badc168ac5dfc47b873 SHA256 9c7232e2c5c2ec17b3f33b4c919b4f4ded4e5766aa63e1ec4760db5318a7426d
+MISC ChangeLog 2776 RMD160 9cd05b07a02e656d07b235cbed51f88ca5d0fd67 SHA1 af0f4b8dfb3b74ff00004904bbf718274bf49279 SHA256 d0f504b9a485c22b8c1010346f10a532b1fb106b5a32c2289b955753bb693d0f
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHouNaNQqtfCuFneMRAhKFAJ4iXlxmcHcSIyIcVb13daJXhx4N3ACfexOZ
-cQNHd4s13ti9+BeLB/D8n8M=
-=wW5Y
------END PGP SIGNATURE-----
diff --git a/media-sound/muse/muse-0.9.2.ebuild b/media-sound/muse/muse-0.9.2.ebuild
index 3f8e47c945d5..a826b0105f07 100644
--- a/media-sound/muse/muse-0.9.2.ebuild
+++ b/media-sound/muse/muse-0.9.2.ebuild
@@ -1,55 +1,44 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.2.ebuild,v 1.4 2008/02/01 09:15:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muse/muse-0.9.2.ebuild,v 1.5 2008/02/01 10:38:54 drac Exp $
 
 inherit eutils
 
-MY_P=${PN/muse/MuSE}-${PV}
-S=${WORKDIR}/${MY_P}
+MY_P=${P/muse/MuSE}
 
 DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
+HOMEPAGE="http://muse.dyne.org"
 SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
-HOMEPAGE="http://muse.dyne.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="gtk debug"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="debug gtk"
 
-DEPEND="media-sound/lame
+RDEPEND="media-sound/lame
 	media-libs/libvorbis
 	media-libs/libsndfile
 	media-libs/libogg
-	sys-libs/zlib
-	sys-apps/sed
-	gtk? ( =x11-libs/gtk+-2*
-	>=dev-libs/glib-2 )"
+	gtk? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gtk gtk2) \
-		|| die "econf failed"
-
-	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -fpermissive" \
-		|| die "emake failed"
+	econf $(use_enable debug) $(use_enable gtk gtk2)
+	emake CXXFLAGS="${CXXFLAGS} -fpermissive" CFLAGS="${CFLAGS}" \
+		|| die "emake failed."
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"/usr/doc
-	dodoc AUTHORS ChangeLog NEWS README TODO KNOWN-BUGS USAGE
-}
-
-pkg_postinst() {
-	elog
-	elog "You may want to have a look at /usr/share/doc/${PF}/README.gz"
-	elog "for more info."
-	elog
+	emake DESTDIR="${D}" docsdir="/usr/share/doc/${PF}" \
+		install || die "emake install failed."
+	prepalldocs
 }