Migrate to eqmake. Patch by Davide Pesavento in bug #204835.

Package-Manager: portage-2.1.4

5 files changed, 29 insertions, 79 deletions

diff --git a/media-sound/amarokfs/ChangeLog b/media-sound/amarokfs/ChangeLog
index a94185e27a1d..b58a926b1c1e 100644
--- a/media-sound/amarokfs/ChangeLog
+++ b/media-sound/amarokfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarokfs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/ChangeLog,v 1.11 2007/08/16 00:13:09 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/ChangeLog,v 1.12 2008/01/13 20:25:23 flameeyes Exp $
+
+  13 Jan 2008; Diego Pettenò <flameeyes@gentoo.org> -amarokfs-0.4.2.ebuild,
+  amarokfs-0.5.ebuild:
+  Migrate to eqmake. Patch by Davide Pesavento in bug #204835.
 
   16 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> amarokfs-0.5.ebuild:
   ppc stable, bug #187076
diff --git a/media-sound/amarokfs/Manifest b/media-sound/amarokfs/Manifest
index fe20dc350aea..bddcb3d7be33 100644
--- a/media-sound/amarokfs/Manifest
+++ b/media-sound/amarokfs/Manifest
@@ -1,28 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarokfs-0.5-FixMountPointIdQuery.patch 1224 RMD160 bc1a10edc5cf28ee4c5fb5a297172ec763f1aacf SHA1 2359311f7bd3045ec192639cac9fbf016113a715 SHA256 99dee9a02c6c44d1fee8c153f3a41742347df8afce52ac0e81648668336bcbd1
 MD5 3bee0236b1b43a5410839c7345213828 files/amarokfs-0.5-FixMountPointIdQuery.patch 1224
 RMD160 bc1a10edc5cf28ee4c5fb5a297172ec763f1aacf files/amarokfs-0.5-FixMountPointIdQuery.patch 1224
 SHA256 99dee9a02c6c44d1fee8c153f3a41742347df8afce52ac0e81648668336bcbd1 files/amarokfs-0.5-FixMountPointIdQuery.patch 1224
 DIST 52641-amarokFS-0.5.tar.gz 373310 RMD160 ea2052c4114c1db21e5f727bd9d3c96caddd97d4 SHA1 367b59ee271ad367b45f0b705feb94f2cb7d3fa0 SHA256 52ee9b21d18b7d76999b25c1de3077d3f2ae774b18b8eca3d9605ceaf340cafc
-DIST 52641-amarokFS-qt3-0.4.2.tar.gz 206259 RMD160 653e4554c85524ff71e8170c68c7347c2691e7aa SHA1 1def465f142670cb3349e3ef832931d621b32533 SHA256 285ea7c284272b55783e6d4c5809568e57155a960035864a3490aae859fa199e
-EBUILD amarokfs-0.4.2.ebuild 1479 RMD160 a689fa370d7e259cef0158c45dcc4fb4cde2440e SHA1 1559fc9c4434aa65162e1a9d20e7ccc5074848d3 SHA256 5efc2b24382d7f037a4fb0302ae0040d70abf890dac60520ff24008cd1ebd83c
-MD5 6dae740e22e13b72c2b5f8ec2d8e280c amarokfs-0.4.2.ebuild 1479
-RMD160 a689fa370d7e259cef0158c45dcc4fb4cde2440e amarokfs-0.4.2.ebuild 1479
-SHA256 5efc2b24382d7f037a4fb0302ae0040d70abf890dac60520ff24008cd1ebd83c amarokfs-0.4.2.ebuild 1479
-EBUILD amarokfs-0.5.ebuild 1530 RMD160 f25216d788a21624efead61a66ce2c2ef9203b73 SHA1 332fb7a7e490590e41ec6fd9121dcd13bafea28a SHA256 7feccde7dc62fec5252fb980c21819a2a242ef87a1667871afe60e097729c39d
-MD5 d7b4579f9233a5b38870144670703838 amarokfs-0.5.ebuild 1530
-RMD160 f25216d788a21624efead61a66ce2c2ef9203b73 amarokfs-0.5.ebuild 1530
-SHA256 7feccde7dc62fec5252fb980c21819a2a242ef87a1667871afe60e097729c39d amarokfs-0.5.ebuild 1530
-MISC ChangeLog 1613 RMD160 96f24283da9201d21b34485c9d7315aaba7a787a SHA1 f1c6bca21c3da02d22eaae6012c0815803accd63 SHA256 e94af082f21224cb6971de4ba3442e8d2b3bc2fa039bbb01c1dea9ad7183d1fd
-MD5 4126226ef8e32261202c759475e485c4 ChangeLog 1613
-RMD160 96f24283da9201d21b34485c9d7315aaba7a787a ChangeLog 1613
-SHA256 e94af082f21224cb6971de4ba3442e8d2b3bc2fa039bbb01c1dea9ad7183d1fd ChangeLog 1613
+EBUILD amarokfs-0.5.ebuild 1365 RMD160 75bcc121397668267e25265380f18fdd9be70f01 SHA1 55b06703a4485b558195af5b833079a636dfb470 SHA256 1f52afc0b8afb162a4e2484381332b168c52715ae0ba85a7d114ea81565dbfac
+MD5 8d6c4b08ecac33ebdafb483bd6ac69fc amarokfs-0.5.ebuild 1365
+RMD160 75bcc121397668267e25265380f18fdd9be70f01 amarokfs-0.5.ebuild 1365
+SHA256 1f52afc0b8afb162a4e2484381332b168c52715ae0ba85a7d114ea81565dbfac amarokfs-0.5.ebuild 1365
+MISC ChangeLog 1776 RMD160 fe2b660ed8c154c052eb44597e6531b467d59d96 SHA1 1bb9ab54527f331b93b5ebf07196fdb03ee58bdc SHA256 9422e2b60f24984d5fb4c130dfbfb96bffd272cf9c3d51ddd2998a8e90bf4359
+MD5 dc0bf8c17e895ec3b04d96f4a3b91c62 ChangeLog 1776
+RMD160 fe2b660ed8c154c052eb44597e6531b467d59d96 ChangeLog 1776
+SHA256 9422e2b60f24984d5fb4c130dfbfb96bffd272cf9c3d51ddd2998a8e90bf4359 ChangeLog 1776
 MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
 SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata.xml 175
-MD5 586414d88740bb2893acfa347ba1c015 files/digest-amarokfs-0.4.2 274
-RMD160 fc5c300e62be6525ba97ca0d4eacf966499b0c86 files/digest-amarokfs-0.4.2 274
-SHA256 9cbafa838a87aca023a3b0c81a689d6122e784ab89bbcb6765c5d6c8235b8a88 files/digest-amarokfs-0.4.2 274
 MD5 fc4dc2cb0d2c0f421820dca0fc4c49ab files/digest-amarokfs-0.5 256
 RMD160 87bb5a870c9b0e34531853d1dcfba4031d084c7b files/digest-amarokfs-0.5 256
 SHA256 f5342da28218aeb47c0ab7a1de8416c64c133cb23c38efbcd71dc770b3413cb7 files/digest-amarokfs-0.5 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHinO5AiZjviIA2XgRAgovAJ9zfB40SkRNhrxp88SVaEvN8gKougCgzHRM
+4mncmoWPoiBjrOh6rTBDHh0=
+=ksbD
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarokfs/amarokfs-0.4.2.ebuild b/media-sound/amarokfs/amarokfs-0.4.2.ebuild
deleted file mode 100644
index 345e65bde4eb..000000000000
--- a/media-sound/amarokfs/amarokfs-0.4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/amarokfs-0.4.2.ebuild,v 1.5 2007/04/28 15:36:04 carlo Exp $
-
-inherit qt3 kde-functions toolchain-funcs
-
-MY_PN="${PN/fs/FS}"
-MY_P="${MY_PN}-qt3-${PV}"
-
-DESCRIPTION="A full screen frontend for Amarok."
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=52641"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/52641-${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-IUSE=""
-
-RDEPEND="media-sound/amarok"
-DEPEND=""
-
-need-kde 3.5
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e 's:/usr/local/:/usr/:' "${S}"/*.{pro,cpp} || die "sed for /usr/local failed."
-	sed -i -e "s:Icon=.*:Icon=${MY_PN}:" "${S}/${MY_PN}.desktop" || die "fix desktop file failed."
-	sed -i -e 's:/usr/share/icons/:\0hicolor/128x128/apps/:' "${S}/${MY_PN}-xml.pro" || die "fix icon installation failed"
-	sed -i -e '/qDebug/s:" + \(func\|query\):%s", \1.data():' "${S}"/*.cpp || die "fix for qDebug() calls failed."
-}
-
-src_compile() {
-	${QTDIR}/bin/qmake QMAKE="${QTDIR}/bin/qmake" || die "qmake failed"
-	sed -i -e '/strip/d' Makefile || die "fix stripping failed."
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		CXX="$(tc-getCXX) ${CXXFLAGS}" \
-		LINK="$(tc-getCXX) ${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake -j1 INSTALL_ROOT="${D}" install || die "emake install failed"
-}
diff --git a/media-sound/amarokfs/amarokfs-0.5.ebuild b/media-sound/amarokfs/amarokfs-0.5.ebuild
index db026ba5b780..080f29a4c9b5 100644
--- a/media-sound/amarokfs/amarokfs-0.5.ebuild
+++ b/media-sound/amarokfs/amarokfs-0.5.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/media-sound/amarokfs/amarokfs-0.5.ebuild,v 1.7 2007/08/16 00:13:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarokfs/amarokfs-0.5.ebuild,v 1.8 2008/01/13 20:25:23 flameeyes Exp $
 
-inherit qt3 kde-functions toolchain-funcs
+inherit qt3 kde-functions
 
 MY_PN="${PN/fs/FS}"
 MY_P="${MY_PN}-${PV}"
@@ -37,13 +37,9 @@ src_unpack() {
 }
 
 src_compile() {
-	${QTDIR}/bin/qmake QMAKE="${QTDIR}/bin/qmake" || die "qmake failed"
+	eqmake3 amarokFS-xml.pro
 	sed -i -e '/strip/d' Makefile || die "fix stripping failed."
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		CXX="$(tc-getCXX) ${CXXFLAGS}" \
-		LINK="$(tc-getCXX) ${LDFLAGS}" \
-		|| die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/media-sound/amarokfs/files/digest-amarokfs-0.4.2 b/media-sound/amarokfs/files/digest-amarokfs-0.4.2
deleted file mode 100644
index 17bc665a5943..000000000000
--- a/media-sound/amarokfs/files/digest-amarokfs-0.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94d955be8f7a0454d341ae8501d00318 52641-amarokFS-qt3-0.4.2.tar.gz 206259
-RMD160 653e4554c85524ff71e8170c68c7347c2691e7aa 52641-amarokFS-qt3-0.4.2.tar.gz 206259
-SHA256 285ea7c284272b55783e6d4c5809568e57155a960035864a3490aae859fa199e 52641-amarokFS-qt3-0.4.2.tar.gz 206259