Update this ancient ebuild to not use /usr/X11R6 anymore. Use toolchain-funcs.eclass to pass correct CC. Convert from "einstall" to "emake install". Missing x11-misc/gccmakedep DEPEND.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 42 insertions, 47 deletions

diff --git a/x11-plugins/wmsound/ChangeLog b/x11-plugins/wmsound/ChangeLog
index a62b4e22745e..fb629305d4c8 100644
--- a/x11-plugins/wmsound/ChangeLog
+++ b/x11-plugins/wmsound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmsound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.11 2012/06/14 18:44:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/ChangeLog,v 1.12 2012/06/14 19:15:02 ssuominen Exp $
+
+  14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> wmsound-0.9.5.ebuild:
+  Update this ancient ebuild to not use /usr/X11R6 anymore. Use
+  toolchain-funcs.eclass to pass correct CC. Convert from "einstall" to "emake
+  install". Missing x11-misc/gccmakedep DEPEND.
 
   14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> wmsound-0.9.5.ebuild:
   x11-libs/libPropList rename to x11-libs/libproplist
diff --git a/x11-plugins/wmsound/Manifest b/x11-plugins/wmsound/Manifest
index 0071281b64b9..cda4db9975ef 100644
--- a/x11-plugins/wmsound/Manifest
+++ b/x11-plugins/wmsound/Manifest
@@ -4,17 +4,17 @@ Hash: SHA1
 AUX wmsound-ComplexProgramTargetNoMan.patch 304 RMD160 896ad6e7f9b664aed2bfaad0cbf8b8365f285668 SHA1 9a5cc41c4ca29e1bd8ebb9b78fca4aad6c0fed8c SHA256 c55a5b1c413140bb9e5660dcfcc3277dae2b6a3be6bdd1671bacd297ffb12a82
 AUX wmsound-config.patch 2466 RMD160 7cae6793b7f01426d326ce4510aacf0e661dff64 SHA1 90e41547114ca630a0c9ffcf85298090510f5912 SHA256 778cd878ea6146480737bea355d0f47463a1875c172c09b8bb0232645d32e02e
 DIST wmsound-0.9.5.tar.gz 23098 RMD160 70be0e11d17c8ca989c73073cf8bb2f8ff2a38f7 SHA1 435d60c99ade4539a94a15f58a6e5f122d746720 SHA256 9f479d7a00030e410f21ce9b489de5c7bf4daac64ff710924440ac1d112da1c2
-EBUILD wmsound-0.9.5.ebuild 1309 RMD160 ec15ad2feaa9d559bede1f3fa21246ba1a5eeab6 SHA1 49ff101fe2981d965a332b77369ee03b2a7408e8 SHA256 5574790248a9da61f5b31551d52bc8ab89add32eff1a81cecdb86f36d1c0869e
-MISC ChangeLog 1610 RMD160 172335985239adfa7e12b30babae375d4ffc57c2 SHA1 b2ce2c6f76025b74532b62800ded3d615d92ec86 SHA256 79752c2db6f9eb14ae53b1c6cf0e1000938508cec2d79108b13a9a02ec8164fa
+EBUILD wmsound-0.9.5.ebuild 1191 RMD160 35633e68e85a85c2d29fbc3ca45983fb1fb207e9 SHA1 b02a5a451b9d92764dd81ecf06612b49042e8e76 SHA256 584a60c265a457a366aa4edce39b720ef2a216b404e0ecaa12d58310c801cc07
+MISC ChangeLog 1878 RMD160 1339d7ebd06b6fcef1db7fa2e8f4aec7ce530516 SHA1 28a149661be5fb440f4d3b522ae0482e6de294bd SHA256 918feefcc3acc3f0d0ba5f41256aadedf1f31c827a048e930a7eb7f30fc04229
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2jAAAAoJEEdUh39IaPFNHq8H/1Wk7gB7vgXWrU5nPULfalr5
-TP33LT6YlNUSfEExIVqyB2VJRXPoMwYYfPvz8/HNZrXXv/Q+YsP6+E2djNGuchEk
-r+gTCSU0o38/M9YoVQ6jh0Qo+VRu1mr1s593xjO076jgXu2dC0tC2wbBUoo+WAaw
-CUh19/GzDJiGwnItAD5SvwROcJaJU0vGHcB/F1sTHcG0dMpVNCVnAT1kLiwSSWDM
-ogoxK2EfDQCkEUJrpcQZH6EOQcsQsp+6h84G5s8tjinjca/6xZxyrPu9HRaXLJiM
-kPRhybrTP/jHNtRrugRaf4of9nBg8HJJTPCee6x670o5OyPdADTB15po8U4u/Y4=
-=G7Dg
+iQEcBAEBAgAGBQJP2jc9AAoJEEdUh39IaPFNqnIH/ih4s4sE5+nBODYLoJCdoMo8
+EdThz5gXCortR1JhpF8e34lCrq5+OrPezYGHZ+j/eRxdl0+FdGHeXv0QOfSAE8bG
+R7YL3O39JVQ1UxKs5qtic8A2yVTyLb9EMiKNmi/bcaKD+YIeoHaY1KSiX0iz6j53
+x/cNJ2MVbW3ko/X8oV1qqsMaZbXPGBPkVwAG8dz08EDbc0jhRxd6JdX1N8YKavi1
+bVmaV4V5uWH7Jm32LJFymVC96zW6ISpszQPvTRYZ9ARoc5NCfUZtMfQg1Wa+IDyK
+7Et4dYf65c1IBa+XuTen8JA5BdfjEGPCxvOqjdYh+xhOqFtvuQ4T/YHuFss6mxc=
+=xkNj
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmsound/wmsound-0.9.5.ebuild b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
index 93fdefdc1f70..be0288613d62 100644
--- a/x11-plugins/wmsound/wmsound-0.9.5.ebuild
+++ b/x11-plugins/wmsound/wmsound-0.9.5.ebuild
@@ -1,56 +1,46 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.10 2012/06/14 18:44:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsound/wmsound-0.9.5.ebuild,v 1.11 2012/06/14 19:15:02 ssuominen Exp $
 
-inherit eutils
-
-IUSE=""
+EAPI=4
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="WindowMaker sound server"
-SRC_URI="http://largo.windowmaker.org/files/${P}.tar.gz"
 HOMEPAGE="http://largo.windowmaker.org/"
+SRC_URI="http://largo.windowmaker.org/files/${P}.tar.gz"
 
-RDEPEND=">=x11-wm/windowmaker-0.80.2-r1
+RDEPEND="media-sound/wmsound-data
 	x11-libs/libproplist
-	>=media-sound/wmsound-data-1.0.0"
-
+	x11-wm/windowmaker"
 DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
 	x11-misc/imake"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-src_unpack()
-{
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/wmsound-config.patch"
-	epatch "${FILESDIR}/wmsound-ComplexProgramTargetNoMan.patch"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE=""
 
-	#Fix compilation with --as-needed.
-	sed -i 's:-lPropList $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList:' src/Imakefile
-	sed -i 's:-lPropList $(XLIB) $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList $(XLIB):' utils/Imakefile
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-config.patch \
+		"${FILESDIR}"/${PN}-ComplexProgramTargetNoMan.patch
+
+	# Fix building with -Wl,--as-needed
+	sed -i \
+		-e 's:-lPropList $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList:' \
+		src/Imakefile || die
+	sed -i \
+		-e 's:-lPropList $(XLIB) $(WMSOUNDLIB):$(WMSOUNDLIB) -lPropList	$(XLIB):' \
+		utils/Imakefile || die
 }
 
-src_compile()
-{
-	export PATH="${PATH}:/usr/X11R6/bin"
-
-	cd "${S}"
-	xmkmf -a
-	emake CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}" || die "make failed"
+src_compile() {
+	xmkmf -a || die
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" LDOPTIONS="${LDFLAGS}"
 }
 
-src_install()
-{
-	cd "${S}"
-	einstall PREFIX="${D}/usr" USRLIBDIR="${D}/usr/X11R6/lib" || die "make install failed"
+src_install() {
+	emake PREFIX="${D}/usr" USRLIBDIR="${D}/usr/$(get_libdir)" install
 	dodoc AUTHORS BUGS ChangeLog
 }
-
-pkg_postinst()
-{
-	einfo "WMSound currently supports 8 or 16 bit .wav files."
-}