Fix build with asneeded, thanks to Daniel Lin <dtlin@andrew.cmu.edu>, bug #174358

Package-Manager: portage-2.1.2.3

diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index 9cd3ca6c503df8b423bd173e7dce8c5c8fd9b6d5..f0a70a10479b1155dd739df30fbebd634f6e828d 100644 (file)
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -9,14 +9,14 @@ EBUILD gmpc-0.13.0.ebuild 830 RMD160 b5cfe3cc0a4189ff4bbafca156f9129ec796540a SH
 MD5 814d87f3f37f5cf4aae48243e123bae2 gmpc-0.13.0.ebuild 830
 RMD160 b5cfe3cc0a4189ff4bbafca156f9129ec796540a gmpc-0.13.0.ebuild 830
 SHA256 9898bc30bcdaec4e4ba736aa786aa0fc6dd79c50f5c07297d3dc44e78f9f0ff3 gmpc-0.13.0.ebuild 830
-EBUILD gmpc-0.14.0.ebuild 912 RMD160 31a5f13f165caf1d5eb5b8f8627c18db3ef66247 SHA1 8334d978ec6369fbd4de6b3fc4ccf36d293ece8b SHA256 364c04d276ea810a8a82ae90c2e610ae1efe38761649596a1387c61b7ae1a433
-MD5 576deb62f356ec70baeb44aea81db537 gmpc-0.14.0.ebuild 912
-RMD160 31a5f13f165caf1d5eb5b8f8627c18db3ef66247 gmpc-0.14.0.ebuild 912
-SHA256 364c04d276ea810a8a82ae90c2e610ae1efe38761649596a1387c61b7ae1a433 gmpc-0.14.0.ebuild 912
-MISC ChangeLog 3390 RMD160 d30dc069e9eb863dc478ca13a1c205ea405201fb SHA1 395af9eb0426d7147cd36817e6db7d2c8c2ff8be SHA256 7cc07e5f4ba31648ffa88199b49f9b9140bda5195bd6422994f9b027778f5243
-MD5 f465975a5f61240bc73e6f11b3a6fc15 ChangeLog 3390
-RMD160 d30dc069e9eb863dc478ca13a1c205ea405201fb ChangeLog 3390
-SHA256 7cc07e5f4ba31648ffa88199b49f9b9140bda5195bd6422994f9b027778f5243 ChangeLog 3390
+EBUILD gmpc-0.14.0.ebuild 913 RMD160 a81d5f9dada5321fbc2090ebdf8579fc8b4906b5 SHA1 5ef9e27b3a7fb835b57e8b8ca640ba81bd6d272e SHA256 dcdef1bc5d0792e5b33d764f1d545ae0401683629b16e9c8d7a9fc1ec3258f51
+MD5 6a45654ceadd35a7e5f539d88133b4a3 gmpc-0.14.0.ebuild 913
+RMD160 a81d5f9dada5321fbc2090ebdf8579fc8b4906b5 gmpc-0.14.0.ebuild 913
+SHA256 dcdef1bc5d0792e5b33d764f1d545ae0401683629b16e9c8d7a9fc1ec3258f51 gmpc-0.14.0.ebuild 913
+MISC ChangeLog 3486 RMD160 44603cbdf4f8a18d65abbf3f620fab124d369116 SHA1 969e8c7fc7772d8614a4291a8bb62ae87ac57367 SHA256 c4c0c96dd5b7fd7f90051e239339d45e0cb69bb95f7d7b0a7413e8e8a3b8bf00
+MD5 349953530bd9abae2e78e0eea0c0b986 ChangeLog 3486
+RMD160 44603cbdf4f8a18d65abbf3f620fab124d369116 ChangeLog 3486
+SHA256 c4c0c96dd5b7fd7f90051e239339d45e0cb69bb95f7d7b0a7413e8e8a3b8bf00 ChangeLog 3486
 MISC metadata.xml 246 RMD160 071447743a333f649becb31b0dc1099e3b9899d8 SHA1 6fa188edafe93d99fded82b0a2473284febf05d2 SHA256 1f0eb72a1ad524a8416cd9925d0ea348dc142b3e02fe2b5acefba3a7866f714c
 MD5 3a05fb17d7dc8a018b36f13aea905095 metadata.xml 246
 RMD160 071447743a333f649becb31b0dc1099e3b9899d8 metadata.xml 246

diff --git a/media-sound/museseq/ChangeLog b/media-sound/museseq/ChangeLog
index 4877b2e46d84df221f8f64db46ad2d396d58d550..7f581b9965944134c52d2166ca201c2d8fc08b23 100644 (file)
--- a/media-sound/museseq/ChangeLog
+++ b/media-sound/museseq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/museseq
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.47 2007/02/22 01:18:12 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.48 2007/04/15 11:21:22 aballier Exp $
+
+  15 Apr 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/museseq-0.9_pre2-asneeded.patch, museseq-0.9_pre2.ebuild:
+  Fix build with asneeded, thanks to Daniel Lin <dtlin@andrew.cmu.edu>, bug
+  #174358
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.

diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest
index ef704d91c6c30b1072cdf658a36c17e8abf7ffe3..1ff1df0d8b98d20771d101ae3008329b0ea8d21e 100644 (file)
--- a/media-sound/museseq/Manifest
+++ b/media-sound/museseq/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX museseq-0.6.2-drumport.patch 771 RMD160 a701a83a322ebd03d4f682b3846cca0aa2cbcd6b SHA1 c05907b3b2074f7f1753f8417150cb2a5a624657 SHA256 2dc2a1b64c5dfe4bb3e27a9d36ffc45792e7b9998659af01ec2d7e3fab707b33
 MD5 49c3c1f0136766a89c7cd1ba91006bc6 files/museseq-0.6.2-drumport.patch 771
 RMD160 a701a83a322ebd03d4f682b3846cca0aa2cbcd6b files/museseq-0.6.2-drumport.patch 771
@@ -22,6 +25,10 @@ AUX museseq-0.7.2_pre5-rtctimerfix.patch 509 RMD160 fe785c892e886ef562e992773605
 MD5 5cfdb8a06e52a3113b39a238bd45c860 files/museseq-0.7.2_pre5-rtctimerfix.patch 509
 RMD160 fe785c892e886ef562e9927736055a0946b6561a files/museseq-0.7.2_pre5-rtctimerfix.patch 509
 SHA256 37333b5a59eb209546fcc345d8316830baabb7d1813e16b8832b36f8e0738850 files/museseq-0.7.2_pre5-rtctimerfix.patch 509
+AUX museseq-0.9_pre2-asneeded.patch 670 RMD160 3d259bac0b78a7bbd37b9306a8e9044652054002 SHA1 4042aa5a6a4880efb7ff94b913f79b7488682ecc SHA256 203656facd86906fa3b898c0229073110cd9189c33edf12715c8b1798d48a9bc
+MD5 5c5ccf5a0ed3c84eb12a6929e16757e1 files/museseq-0.9_pre2-asneeded.patch 670
+RMD160 3d259bac0b78a7bbd37b9306a8e9044652054002 files/museseq-0.9_pre2-asneeded.patch 670
+SHA256 203656facd86906fa3b898c0229073110cd9189c33edf12715c8b1798d48a9bc files/museseq-0.9_pre2-asneeded.patch 670
 DIST muse-0.6.2.tar.bz2 1263832 RMD160 962234e2236f28483cc9bdbc6e20ffa505a6e315 SHA1 577ca98ac62777bf2a05fd3e836752530f520c65 SHA256 ce1bb12d532a90b907511e34b531082c5694cbfc4d124194a2a313aac41b0424
 DIST muse-0.7.1fixed.tar.bz2 1644403 RMD160 3786fb60a087ebfb22728900010d067494493b0b SHA1 3c946b437d869696928926cc5dd6220dbd4454fa SHA256 baa30e5ea90508d4e54fc36faba9652a09e5c5dd364b08b2b3f57ff7e9fe1d48
 DIST muse-0.7.2pre5.tar.gz 2326657 RMD160 cbadcaf84136075613c57b471a8f4522040a7ba9 SHA1 a151f2abc9a11c4badced8f3e260c8de8154e860 SHA256 53bf88830b94522bb124afa5a07dc8a7fd362c6c06736256a2bc9fa73be8e7a1
@@ -43,14 +50,14 @@ EBUILD museseq-0.8.1-r1.ebuild 1764 RMD160 cac3bd2ec6021700613125f1c9b73684825c6
 MD5 630544fc3cd365db7b9128931a2d9161 museseq-0.8.1-r1.ebuild 1764
 RMD160 cac3bd2ec6021700613125f1c9b73684825c68fa museseq-0.8.1-r1.ebuild 1764
 SHA256 28ea4b3dfb3e9528bc41daac23e819a923dd502a99c9a9d93f102dedbb9f5587 museseq-0.8.1-r1.ebuild 1764
-EBUILD museseq-0.9_pre2.ebuild 1588 RMD160 5c69e2d0993018ba4e69a84b319a11d21a75622d SHA1 9127894b04745495f16bcf010137adbaf8fe561c SHA256 5412d8947d15c27a10f37d826a3a79efc2bb5922c1e9ce93877c9fda54162a28
-MD5 4f9b7758b060e200014dbf2039403876 museseq-0.9_pre2.ebuild 1588
-RMD160 5c69e2d0993018ba4e69a84b319a11d21a75622d museseq-0.9_pre2.ebuild 1588
-SHA256 5412d8947d15c27a10f37d826a3a79efc2bb5922c1e9ce93877c9fda54162a28 museseq-0.9_pre2.ebuild 1588
-MISC ChangeLog 7895 RMD160 b3bbee5798f4e4c6165ab7e014b518af2d102ea3 SHA1 fa023d7cd05b1e854fdac4b24156b0cc0709a1dd SHA256 788d4cfed341d548abe7333c2443461a1913c5b6fd6f6a74c17b2bba88906fe5
-MD5 b476dda80dda655e7c53c8251df202c1 ChangeLog 7895
-RMD160 b3bbee5798f4e4c6165ab7e014b518af2d102ea3 ChangeLog 7895
-SHA256 788d4cfed341d548abe7333c2443461a1913c5b6fd6f6a74c17b2bba88906fe5 ChangeLog 7895
+EBUILD museseq-0.9_pre2.ebuild 1704 RMD160 f779c2a20a3a82831d2cb4732c88aaac7ad33570 SHA1 8062fa839835e50026ca042684ea17e0142b05a8 SHA256 db9f40cb794a5d7127a67bf5e791de47d4ed488745565de2d1e21736e6557627
+MD5 abadd879f5ecd7f09f62023df4c82aea museseq-0.9_pre2.ebuild 1704
+RMD160 f779c2a20a3a82831d2cb4732c88aaac7ad33570 museseq-0.9_pre2.ebuild 1704
+SHA256 db9f40cb794a5d7127a67bf5e791de47d4ed488745565de2d1e21736e6557627 museseq-0.9_pre2.ebuild 1704
+MISC ChangeLog 8104 RMD160 c71a02d6fd8db41839912980a78e24c3e7a59cb4 SHA1 d22aa5f0ab0d756264a762305a2cfff84f21c0d9 SHA256 7e687cde138905ed5bdd1fee2f2eb781cebdafde1446adae585dd0bfa57cacf8
+MD5 8a62ccf4035db6c4308cf6f0e979aec5 ChangeLog 8104
+RMD160 c71a02d6fd8db41839912980a78e24c3e7a59cb4 ChangeLog 8104
+SHA256 7e687cde138905ed5bdd1fee2f2eb781cebdafde1446adae585dd0bfa57cacf8 ChangeLog 8104
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221
@@ -70,3 +77,10 @@ SHA256 b8e74bf2ee937b0aa2414cf3c774aca493d5045b607621d0c4eb56025f36167e files/di
 MD5 4ab30d5d08d4523de6bc36be842d8840 files/digest-museseq-0.9_pre2 241
 RMD160 6ffb48a89699d7811940ee4d4dbfc7400fe95d03 files/digest-museseq-0.9_pre2 241
 SHA256 eab9166d20929a7d57f08cfed701648c47b52066ff5617f83b3430299ffef677 files/digest-museseq-0.9_pre2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGIgpovFcC4BYPU0oRAul+AJ45y5kLCPFHwaqStJsSIxDU/dcrkQCeNoUD
+ARt27kRvBMTD1ZFPguKu9j4=
+=Mug4
+-----END PGP SIGNATURE-----

diff --git a/media-sound/museseq/files/museseq-0.9_pre2-asneeded.patch b/media-sound/museseq/files/museseq-0.9_pre2-asneeded.patch
new file mode 100644 (file)
index 0000000..6c9026c
--- /dev/null
+++ b/media-sound/museseq/files/museseq-0.9_pre2-asneeded.patch
@@ -0,0 +1,20 @@
+Index: muse-0.9pre2/muse/Makefile.in
+===================================================================
+--- muse-0.9pre2.orig/muse/Makefile.in
++++ muse-0.9pre2/muse/Makefile.in
+@@ -390,11 +390,12 @@ muse_LDADD = \
+       cliplist/libcliplist.a \
+       instruments/libinstruments.a \
+       widgets/libwidgets.a \
+-      ../synti/libsynti/libsynti.la
+-
+-muse_LDFLAGS = -fno_exceptions $(X_LIBS) $(QT_LIBS) \
++      ../synti/libsynti/libsynti.la \
++      $(X_LIBS) $(QT_LIBS) \
+       -lasound $(SNDFILE_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(FST_LIBS)
+ 
++muse_LDFLAGS = -fno_exceptions 
++
+ CLEANFILES = stamp-chown
+ DISTCLEANFILES = .muse.bin.bak
+ MAINTAINERCLEANFILES = depcomp config.guess \

diff --git a/media-sound/museseq/museseq-0.9_pre2.ebuild b/media-sound/museseq/museseq-0.9_pre2.ebuild
index 5381a01bb483f3ad609352d4665e2ebce8980ad4..e601316c146f76f604121a49955a6383718e1f1c 100644 (file)
--- a/media-sound/museseq/museseq-0.9_pre2.ebuild
+++ b/media-sound/museseq/museseq-0.9_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.9_pre2.ebuild,v 1.2 2007/01/14 00:35:09 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.9_pre2.ebuild,v 1.3 2007/04/15 11:21:22 aballier Exp $
 
 inherit kde-functions virtualx eutils
 
@@ -33,8 +33,16 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}/${P}-asneeded.patch"
+}
+
 src_compile() {
        Xeconf --disable-suid-build \
+               --disable-optimize \
                $(use_enable lash) \
                $(use_enable debug) || die "configure failed"
 
@@ -42,9 +50,9 @@ src_compile() {
 }
 
 src_install() {
-       make DESTDIR=${D} install || die "install failed"
+       make DESTDIR="${D}" install || die "install failed"
        dodoc AUTHORS ChangeLog NEWS README SECURITY README.*
-       mv ${D}/usr/bin/muse ${D}/usr/bin/museseq
+       mv "${D}/usr/bin/muse" "${D}/usr/bin/museseq"
 }
 
 pkg_postinst() {