Fix build with GCC 4.7 (bug #414033), port to EAPI 4, and do the static-libs

dance.

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

4 files changed, 89 insertions, 15 deletions

diff --git a/media-sound/linuxsampler/ChangeLog b/media-sound/linuxsampler/ChangeLog
index 05cdf048e6db..c3952ed791b4 100644
--- a/media-sound/linuxsampler/ChangeLog
+++ b/media-sound/linuxsampler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/linuxsampler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/ChangeLog,v 1.15 2012/05/05 08:33:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/ChangeLog,v 1.16 2012/09/16 18:27:45 dirtyepic Exp $
+
+*linuxsampler-1.0.0-r1 (17 Sep 2012)
+
+  17 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> +linuxsampler-1.0.0-r1.ebuild,
+  +files/linuxsampler-1.0.0-gcc47.patch:
+  Fix build with GCC 4.7 (bug #414033), port to EAPI 4, and do the static-libs
+  dance.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> linuxsampler-0.5.1.ebuild,
   linuxsampler-1.0.0.ebuild:
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index dc2d8e6b990e..518bc6a5da08 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX linuxsampler-0.5.1-gcc43.patch 1258 RMD160 4e17571be94a73e8cf3bd36bc33e3bfea6f59684 SHA1 bcbfe14d7a0f00e09269d2b264d6f7ac17723107 SHA256 948b0f11181d90ac894c8d34c14187efb6e1bddc7024a344ec59cc8af9944465
-AUX linuxsampler-0.5.1-libtool22.patch 828 RMD160 a7c811ad2e04686bf550f0c0a31d8613c880baa2 SHA1 39c7cce3a0d1cc446cd351c8ac10fbea0f696215 SHA256 e5ab332f44dcfce5ef7238388bafc86dc97ab744dc91146bfef81f243fcd49e0
-AUX linuxsampler-0.5.1-pkgconfiginit.patch 389 RMD160 5140576b463ad73c2424ff07fea90081e83c5d37 SHA1 854e08bf8bc85d451a534b76f861e7c36edffd5c SHA256 78dc73457d8976dde888eef8aa1265a018b6634fc012b3f2305b5bd09dc041a2
-DIST linuxsampler-0.5.1.tar.bz2 614500 RMD160 ea964c5033b3d44c1b5b72cb2447496cbd736992 SHA1 ceecf9751c20cd8e05c3c0056bbf7fb14ecb33e6 SHA256 e0d42f98813abf187b636f52d3fe3d5c1add228a2e783bdda409ebae1c7f901f
-DIST linuxsampler-1.0.0.tar.bz2 701591 RMD160 22d00cbc0760bc541e0b0c3f9e6885a2c3ce5144 SHA1 445ed786215c5bede3faef13fa82493b9d50d702 SHA256 bf4f4f83b9ab706e8e8b017aafb560c363bb7663413aeae46d49f1f56110c9cf
-EBUILD linuxsampler-0.5.1.ebuild 1323 RMD160 e25c1d9828efdbc1d918f031ebbb3c563123f9ec SHA1 76db118ecfb232aa20c625bde1c1a19961db932e SHA256 f6d9ba65b3caffbff395c16e0eb1fa0dae71c259126c5e7c883503b56a6efe03
-EBUILD linuxsampler-1.0.0.ebuild 1116 RMD160 170a87d5040a52ab32af09efd809beafa3850ac0 SHA1 b9a50d5a3d4a28ac3753ea66b22795dcdd1f5bef SHA256 c240b0d0dea9ef9eff812d42fb07d17683d0e91b0970b576b4af9c8d54329e24
-MISC ChangeLog 2712 RMD160 0f1ab4d0a179ac62c5fb38f182e9633297a8c2cd SHA1 91952cbff4ce8f9275e97940f8212db82e10ffb0 SHA256 db56efe4defc374644764d0c12695cb926276d5e60ccab6da9396c53695a683e
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+AUX linuxsampler-0.5.1-gcc43.patch 1258 SHA256 948b0f11181d90ac894c8d34c14187efb6e1bddc7024a344ec59cc8af9944465 SHA512 bdebb9d4e2732604e140c5870b5bfff9976cfa829e079fbd0346cf0b1f6a1b7623cd0b4bd62d671edbf155e88fc92a2ec93e1c3856c6d049710d11ab20e555a6 WHIRLPOOL af71e201be08d71e069e86830c2930c4a82393fa63083dc7a000e39184bd11b3febecf6627a61f61a427c6ff4007579e94d41d7ecc64b4204fc9999e7aeeadb4
+AUX linuxsampler-0.5.1-libtool22.patch 828 SHA256 e5ab332f44dcfce5ef7238388bafc86dc97ab744dc91146bfef81f243fcd49e0 SHA512 a622f4f6f1f56235e7a07e26fbb475657345e65ee8a7df7d626fd423376db7ab2aff9b3a55e99379e1cafdbb1bc4e8d90182cef12bae09fa9982a6e997f9eda3 WHIRLPOOL 8a3f032fabebe536b8014cacd98752538e86796648c45c4edcca3750dbc40603365325f5326d94db31b52442bbaf65d4fa759f95c68ed0a4a653286fbc10a9ca
+AUX linuxsampler-0.5.1-pkgconfiginit.patch 389 SHA256 78dc73457d8976dde888eef8aa1265a018b6634fc012b3f2305b5bd09dc041a2 SHA512 e6198cf159fd325268a46ceb99a67bfc132a7553fbabf198b60e94c0c8cdaebc7720fa0bd9c6fc6202c593f8c9425b103b423dd94b76e92d360829db98adf33f WHIRLPOOL 66c6b384323bf94e9c54e4966eca978106a21daf5e507bd771273a82fc8923492a9a5bccd56eb892c1fc63dce2ee43b79dbb6f762a5bb54d5e22eb0c4480f0bb
+AUX linuxsampler-1.0.0-gcc47.patch 467 SHA256 6283b3fa5bbc87beafa2430cb62887059e44cb3c92c2fb486330bbb3eb920346 SHA512 a2d047848d8f7bb520d3ab5a8cc4f1ef40d5da61e2aeeb5de2447da1e516da33b4f7872c343d76422d4dcb18395b0261d947f7750ebcf566114904aad257f9bd WHIRLPOOL 0db215ffe99a2548d5ccca26abdeaef18b72f60fcc7988240829c16f91c1854ffe81c82bea932e6f5089e2e0ef496af0aa509356dd92f40297bce102f5335f32
+DIST linuxsampler-0.5.1.tar.bz2 614500 SHA256 e0d42f98813abf187b636f52d3fe3d5c1add228a2e783bdda409ebae1c7f901f
+DIST linuxsampler-1.0.0.tar.bz2 701591 SHA256 bf4f4f83b9ab706e8e8b017aafb560c363bb7663413aeae46d49f1f56110c9cf SHA512 50b27ff16ef0f393e0808d992ca58f8a4ec12ce909bf3a461502e7e2a2bcfcbfb1558dd07a5ff5af2cbf26bc5f7b878a736005a8e90e4d5e92ca9b868e9bc204 WHIRLPOOL e7668fb4a1c802411de89fb73bdbca78150a8fc6386c42d9c3b9f8c7c1d4576260ef6c89e283f1fbcbcf397515d565e5e13f1e5286a07b6cb8240bb26e437bf6
+EBUILD linuxsampler-0.5.1.ebuild 1323 SHA256 f6d9ba65b3caffbff395c16e0eb1fa0dae71c259126c5e7c883503b56a6efe03 SHA512 a1299ca68aa4eaf9e042c610efa54a9866eaf2f555cdd6448c7548562abc06e15707d340beee826501a348bf6ac1894bb2bae8fc71001b70e2077f09c89bd242 WHIRLPOOL 0ba6f8148b455af039eb9988e4274c5f28a241aa5af729965fb5635dfdc38c34bea42828db6d33877b0d10df43d5c603bfc8aabfa9f3b336a29f651256d23f41
+EBUILD linuxsampler-1.0.0-r1.ebuild 1215 SHA256 246880190842743724f91e6947c245ca7d010add45957d014ed7b84228ebeea2 SHA512 3b3ced68b3b2e5772a118e2b76d19ea95f375bd8c961383e65855aac9920c6ffc3f72c2c6d36aa7f294de06938654b6e7d8d44698eea3f727555d4a6aeae9a5d WHIRLPOOL f31975711b47126beee6de6b1b4621fc1b1f9d07f22b743fd2b875ed2a8e746173cf30b1a5d08219369210380feb7ded598764e680bfbd1f565573ea298b2844
+EBUILD linuxsampler-1.0.0.ebuild 1116 SHA256 c240b0d0dea9ef9eff812d42fb07d17683d0e91b0970b576b4af9c8d54329e24 SHA512 84fc3ddb6f16fad6654f95046b82ea07c1442e84802f38df16fd1630eda49b846956bb891f83e608dfc293f26411086e102b6635bdaa9fc3fa3b18435cfd4789 WHIRLPOOL 3606003a7a8e3ccfc8a0066b5079a14abcd06b6876e5c201d16ca79cc0fbd7fc06be770327fd28c4609c50131c7aa5174aac846c33ada202fc9c39e6ebb6f5f6
+MISC ChangeLog 2962 SHA256 8944652aca18e435e95250ca1e4f71845452cfe601977c3ea8650c1b19d99171 SHA512 0b126f6f7ec9b07757aa92c60034b5960e6fc19ec1e7d13f61d2953917d931f18b8854355c430a0dc76c3c5cb5326dd3717f9d8730dcfab7f9ae90d5518955a4 WHIRLPOOL 1d5f7b1b691c07734dcb594b58d3f92298758711096f57bcc80704a9e2a999743597c15c46da4dc99f90f0083e9356103e2dce5bbe4add730a3bff84e2c60a23
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k5hUACgkQfXuS5UK5QB1URQP+M76JYfzVhEqjDmPv/ZRJafuz
-pP8g4AGR8TMkOOadrWqNRV7k6K6wTmRlAmEw9TOPeu5J6w5Zvs3P1pp4vrcdQxhW
-/71brzGTbS2Po4RycHqUWCd1cna/XSkohwJEtrOcScE3m1Urwvax+wEzs55sdRQV
-E9D9A/RkLC791ORcDxY=
-=K1e3
+iEYEAREIAAYFAlBXGcEACgkQiqiDRvmkBmJyggCfRJSh10Au09q63vr0NdqfzVvV
+IAEAoKmsQByRNzG4dgdZ3vPSZXeWQqxw
+=rufq
 -----END PGP SIGNATURE-----
diff --git a/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch b/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch
new file mode 100644
index 000000000000..e46fb243b6ce
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/414033
+
+--- a/src/common/Pool.h
++++ b/src/common/Pool.h
+@@ -393,7 +393,7 @@ class RTList : public RTListBase<T> {
+         inline Iterator allocAppend() {
+             if (pPool->poolIsEmpty()) return RTListBase<T>::begin();
+             Iterator element = pPool->alloc();
+-            append(element);
++            this->append(element);
+             #if CONFIG_DEVMODE
+             element.list = this;
+             #endif // CONFIG_DEVMODE
diff --git a/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild b/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d2f48e6bb49f
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild,v 1.1 2012/09/16 18:27:45 dirtyepic Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features."
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc jack sqlite static-libs"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
+	>=media-libs/libgig-3.3.0
+	media-libs/alsa-lib
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	econf --enable-alsa-driver \
+		--disable-arts-driver \
+		$(use_enable jack jack-driver) \
+		$(use_enable sqlite instruments-db) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		emake docs
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+
+	prune_libtool_files
+}