[proaudio] [2682] media-sound/supercollider: 99999999 -> 9999, fix multilib strict issue, thanks to Gavin Pryke for testing.

[subversion@xxxxxxxxxxxxx]

Revision: 2682
Author:   lilrc
Date:     2013-04-20 21:28:57 +0200 (Sat, 20 Apr 2013)
Log Message:
-----------
media-sound/supercollider: 99999999 -> 9999, fix multilib strict issue, thanks to Gavin Pryke for testing.

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/supercollider/ChangeLog
    trunk/overlays/proaudio/media-sound/supercollider/Manifest
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-9999.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild

Modified: trunk/overlays/proaudio/media-sound/supercollider/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/ChangeLog	2013-04-20 14:25:18 UTC (rev 2681)
+++ trunk/overlays/proaudio/media-sound/supercollider/ChangeLog	2013-04-20 19:28:57 UTC (rev 2682)
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*supercollider-9999 (20 Apr 2013)
+
+  20 Apr 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  supercollider-3.6.3.ebuild, +supercollider-9999.ebuild,
+  -supercollider-99999999.ebuild:
+  Re-version live ebuild to 9999 instead of 99999999.
+  Fix issue when multilib strict is set. Thanks to Gavin Pryke for testing the
+  ebuild.
+
 *supercollider-3.6.3 (19 Apr 2013)
 
   19 Apr 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>

Modified: trunk/overlays/proaudio/media-sound/supercollider/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/Manifest	2013-04-20 14:25:18 UTC (rev 2681)
+++ trunk/overlays/proaudio/media-sound/supercollider/Manifest	2013-04-20 19:28:57 UTC (rev 2682)
@@ -1,6 +1,6 @@
 AUX README.gentoo 2443 SHA256 a817a4b6fe4adb0184400f6b8b35b39b0af50378caa56fce603fddeb8deb52ee SHA512 e742739887866a49d5f814860b407f4cc1aba8f19b54de7c4cdaf99c40dd8af4de38c9e76d32f561b830ea772f06d50f7452a72a0c659a1079ff22bc2e85ad4f WHIRLPOOL 2ce1cc3ed5140e21746bf74cf23fc761fbe915adafa34e3d746c3d7544ee4090bd667c1865bdc6f1e7aeee2890f4cae2be6c53853df3d30122f7a768bf8ae2fe
 DIST SuperCollider-3.6.3-Source-linux.tar.bz2 7333680 SHA256 9bec4455d673f9a1ab687229a7246cfe85147ff184727efea7a1abdd32f91aac SHA512 8bd70c1525b1a7cb9cf2a065007f45c479df2eeffa28e92f3265502391ccfd886ad6b72d8fdf5a05e6dce74a77dfee7e8aca6568c997e615d02ca4557b88227f WHIRLPOOL 6ca9a34a588135c69d4f5cffc1569fd26450157055e4f47ce4b8c2e8ebdd8363a11245eff9b0a3e6093aea55d7c6996c0b2b9ea1a946e7c6e5a96cbaa26fb32f
-EBUILD supercollider-3.6.3.ebuild 3706 SHA256 ccd7818a0f81362e5167702f416dd1fb8cb520844d455f73b32b3406bda24786 SHA512 bd0f086f70b42fe73a3c75bdcf2b1bcd21423cfdf801331ced0f9322897abb99be51d8940d858eebb7e476f278534f5970d62cb42a2096d5f911a4aa76de9efa WHIRLPOOL f36c9ea3e816c11bf15a71dba94e46da3291e8ba08c0a069e4a5ef2543488fef99a386e08c392a3c4f02bc9aea523ddca3cce569e7f43bc1e0028e77c05f07c2
-EBUILD supercollider-99999999.ebuild 3596 SHA256 29a319a25515459869c0fd4303e6642b2f07ecf2685f9cb03baf205103f5c7cd SHA512 6919946c8d78f6edbbfce69a9b5f3d0c45254780383762f80c8a81b59d06ac6e003b5e12d0a753bc1dd0cd1e5ff821341761aced4482e82d25aee0c578dc55e4 WHIRLPOOL 8d9fe67c9c0df65238ea106d8f01a4c6d75c3bf90044c2e7144b9e9fdcdbb353d630016a5fb693f6ce9287abbc5f555e2f423e0581b21934a1fa2522065c6ec5
-MISC ChangeLog 1502 SHA256 671ab5fcae7049625ba677ba662b830e6da8b8ac39331dd70ac3ff9e95e34149 SHA512 8bea76ed99187e2c9b9f784f4699f7c9677ecca3e0b0af7767353e248d0d08343111c2dcd394acd79a572223acb7fd38927d27bf6baad3d58067718df0a486b4 WHIRLPOOL 034df4a7e6e56063bfda9e238c72a11cf9b76e70c6986bf0de191b755f60fe0b67ff4cab53b646f1cdee50ccefe7421e65299f157746610989dd018cc00790fb
+EBUILD supercollider-3.6.3.ebuild 3815 SHA256 bf21fe6141ae1f5ef940623d528fcacd248b8882f2cc39ab7549d8b488d0f08e SHA512 55923dfef5fbf6e428a522b1ce12a9697c7b740af38b6622935d26b2fcee20b1f7c73913713533964e55ae0866e3638b47277dc4db31fac66779a887cbbf2346 WHIRLPOOL 771553b3bf7afefb970158fac11b38ffa23d40583753b6e760a795c6223deb4d519ea36a24964d67933566b8eaf883a858e627b32c78e77f71ffc12c394c9bbd
+EBUILD supercollider-9999.ebuild 3705 SHA256 2839b2fe5cda9bf0eeddb8f0703203c247f4a2bd2df01c0bbc0dafdacbbdbdfb SHA512 705ef8bb9200508515bc15215723f0d26bec6e28fff9bf6223637d504e5deaf8636a3171fda3c9370ada1b220326129fec46261456fe078fdc202926f99e2ecb WHIRLPOOL eec4bc3e5597311e2415d7d93ea19623432d8fb10b46dd7a5ca33c87727a5489bd7be4e3f3f08e74baf355fba671bcf5644f53939395b2127375ab2099f6e08a
+MISC ChangeLog 1838 SHA256 1f600658756e6a1a4576b860be4f7c25f7c8d111d27352fb269c3975516db381 SHA512 2fc4eeec202d4c3e4467633620c49514f223c8c974011b3a214bf21edbe847f35afc91f0dbe9ba4ec30cdc6100568e0cf554127eda4f2c34bcf32662714cb6a6 WHIRLPOOL bdd26b662859c19725e476c44397fe45b34c643a4af1a383935ec3dbda08cae1ae5886061c4a266aa56cb22af6cfc09632b41c8f7efee181d9f515f5c45cd168
 MISC metadata.xml 931 SHA256 adf9c574616ffcf93a1a39baccc67568243923daae19ea57db3e0d5dab2e890e SHA512 857a7454377edc2cdaa6be55a5bd94ef5acc43a7db1f99d1713500b178447a53504fc22997cf8beccf87360821ca8937d280603219c92c2922599fcafcd0c69e WHIRLPOOL c8513cf14875acd12f3bfe8c47e87b041013365000f575cbe1bb66c4be1dfcfdc671a2583ba64caab6ca26cc81acf553db7c7136eecffae3fba7ed36d2726592

Modified: trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild	2013-04-20 14:25:18 UTC (rev 2681)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-3.6.3.ebuild	2013-04-20 19:28:57 UTC (rev 2682)
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit cmake-utils eutils exteutils versionator
+inherit cmake-utils eutils exteutils multilib versionator
 
 MY_PN="SuperCollider"
 MY_P="${MY_PN}-${PV}"
@@ -103,6 +103,9 @@
 src_install() {
 	cmake-utils_src_install
 
+	# Do not violate multilib strict
+	mv "${ED}/usr/lib" "${ED}/usr/$(get_libdir)" || die "mv failed"
+
 	use emacs && newdoc editors/scel/README README.emacs
 	use gedit && newdoc editors/sced/README README.gedit
 	use vim && newdoc editors/scvim/README README.vim

Copied: trunk/overlays/proaudio/media-sound/supercollider/supercollider-9999.ebuild (from rev 2677, trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-9999.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-9999.ebuild	2013-04-20 19:28:57 UTC (rev 2682)
@@ -0,0 +1,115 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit cmake-utils eutils exteutils git-2 multilib versionator
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="http://supercollider.sourceforge.net";
+EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
+EGIT_HAS_SUBMODULES="1"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="+avahi coreaudio curl debug doc emacs +fftw gedit +gpl3 ide jack portaudio qt4 server +sndfile sse sse4 static-libs system-boost system-yaml test vim wiimote"
+REQUIRED_USE="
+	ide? ( qt4 )
+	^^ ( coreaudio jack portaudio )"
+
+# Both alsa and readline will be automatically checked in cmake but
+# there are no options for theese. Thus the functionality cannot be
+# controlled through USE flags. Therefore hard-enabled.
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.0
+	media-libs/alsa-lib
+	>=sys-libs/readline-5.0
+	x11-libs/libXt
+	avahi? ( net-dns/avahi )
+	fftw? ( >=sci-libs/fftw-3.0 )
+	portaudio? ( media-libs/portaudio )
+	qt4? (
+		>=dev-qt/qtcore-4.7
+		>=dev-qt/qtgui-4.7
+		>=dev-qt/qtwebkit-4.7
+	)
+	sndfile? ( >=media-libs/libsndfile-1.0.16 )
+	system-boost? ( dev-libs/boost )
+	system-yaml? ( dev-cpp/yaml-cpp )
+	wiimote? ( app-misc/cwiid )"
+DEPEND="${RDEPEND}
+	dev-libs/icu
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	gedit? ( app-editors/gedit )
+	vim? ( app-editors/vim )"
+
+DOCS=( AUTHORS README_LINUX.txt "${FILESDIR}/README.gentoo" )
+
+pkg_pretend() {
+	if use test; then
+		ewarn "You are trying to install ${PN} with tests enabled. This will most"
+		ewarn "probably fail. However, if it succeeds please let us know at"
+		ewarn "proaudio@xxxxxxxxxxxxxxxxxxx. Please also do contact us if you know how"
+		ewarn "to get the tests working."
+	fi
+}
+
+src_prepare() {
+	esed_check -i -e "s|SuperCollider|${PF}|" "${S}/platform/linux/CMakeLists.txt"
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+	local mycmakeargs=(
+		$(cmake-utils_use_no avahi AVAHI)
+		$(cmake-utils_use curl CURL)
+		$(cmake-utils_use debug SC_MEMORY_DEBUGGING)
+		$(cmake-utils_use debug SN_MEMORY_DEBUGGING)
+		$(cmake-utils_use debug GC_SANITYCHECK)
+		$(cmake-utils_use doc INSTALL_HELP)
+		$(cmake-utils_use emacs SC_EL)
+		$(cmake-utils_use !fftw FFT_GREEN)
+		$(cmake-utils_use gedit SC_ED)
+		$(cmake-utils_use_no gpl3 GPL3)
+		$(cmake-utils_use ide SC_IDE)
+		$(cmake-utils_use_no sndfile SNDFILE)
+		$(cmake-utils_use qt4 SC_QT)
+		$(cmake-utils_use server SCLANG_SERVER)
+		$(cmake-utils_use sse SSE)
+		$(cmake-utils_use sse4 SSE41)
+		$(cmake-utils_use sse4 SSE42)
+		$(cmake-utils_use !static-libs LIBSCSYNTH)
+		$(cmake-utils_use system-boost SYSTEM_BOOST)
+		$(cmake-utils_use system-yaml SYSTEM_YAMLCPP)
+		$(cmake-utils_use test ENABLE_TESTSUITE)
+		$(cmake-utils_use vim SC_VIM)
+		$(cmake-utils_use wiimote SC_WII)
+	)
+	use coreaudio && mycmakeargs+=( "AUDIOAPI=coreaudio" )
+	use jack && mycmakeargs+=( "AUDIOAPI=jack" )
+	use portaudio && mycmakeargs+=( "AUDIOAPI=portaudio" )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Do not violate multilib strict
+	mv "${ED}/usr/lib" "${ED}/usr/$(get_libdir)" || die "mv failed"
+
+	use emacs && newdoc editors/scel/README README.emacs
+	use gedit && newdoc editors/sced/README README.gedit
+	use vim && newdoc editors/scvim/README README.vim
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Notice: SuperCollider is not very intuitive to get up and running."
+	einfo "The best course of action to make sure that the installation was"
+	einfo "successful and get you started with using SuperCollider is to take"
+	einfo "a look through /usr/share/doc/${PF}/README-gentoo.txt.gz"
+	einfo
+}

Deleted: trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild	2013-04-20 14:25:18 UTC (rev 2681)
+++ trunk/overlays/proaudio/media-sound/supercollider/supercollider-99999999.ebuild	2013-04-20 19:28:57 UTC (rev 2682)
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit cmake-utils eutils exteutils git-2 versionator
-
-DESCRIPTION="An environment and a programming language for real time audio synthesis."
-HOMEPAGE="http://supercollider.sourceforge.net";
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
-EGIT_HAS_SUBMODULES="1"
-
-LICENSE="GPL-2 gpl3? ( GPL-3 )"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="+avahi coreaudio curl debug doc emacs +fftw gedit +gpl3 ide jack portaudio qt4 server +sndfile sse sse4 static-libs system-boost system-yaml test vim wiimote"
-REQUIRED_USE="
-	ide? ( qt4 )
-	^^ ( coreaudio jack portaudio )"
-
-# Both alsa and readline will be automatically checked in cmake but
-# there are no options for theese. Thus the functionality cannot be
-# controlled through USE flags. Therefore hard-enabled.
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.100.0
-	media-libs/alsa-lib
-	>=sys-libs/readline-5.0
-	x11-libs/libXt
-	avahi? ( net-dns/avahi )
-	fftw? ( >=sci-libs/fftw-3.0 )
-	portaudio? ( media-libs/portaudio )
-	qt4? (
-		>=dev-qt/qtcore-4.7
-		>=dev-qt/qtgui-4.7
-		>=dev-qt/qtwebkit-4.7
-	)
-	sndfile? ( >=media-libs/libsndfile-1.0.16 )
-	system-boost? ( dev-libs/boost )
-	system-yaml? ( dev-cpp/yaml-cpp )
-	wiimote? ( app-misc/cwiid )"
-DEPEND="${RDEPEND}
-	dev-libs/icu
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	gedit? ( app-editors/gedit )
-	vim? ( app-editors/vim )"
-
-DOCS=( AUTHORS README_LINUX.txt "${FILESDIR}/README.gentoo" )
-
-pkg_pretend() {
-	if use test; then
-		ewarn "You are trying to install ${PN} with tests enabled. This will most"
-		ewarn "probably fail. However, if it succeeds please let us know at"
-		ewarn "proaudio@xxxxxxxxxxxxxxxxxxx. Please also do contact us if you know how"
-		ewarn "to get the tests working."
-	fi
-}
-
-src_prepare() {
-	esed_check -i -e "s|SuperCollider|${PF}|" "${S}/platform/linux/CMakeLists.txt"
-}
-
-src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-	local mycmakeargs=(
-		$(cmake-utils_use_no avahi AVAHI)
-		$(cmake-utils_use curl CURL)
-		$(cmake-utils_use debug SC_MEMORY_DEBUGGING)
-		$(cmake-utils_use debug SN_MEMORY_DEBUGGING)
-		$(cmake-utils_use debug GC_SANITYCHECK)
-		$(cmake-utils_use doc INSTALL_HELP)
-		$(cmake-utils_use emacs SC_EL)
-		$(cmake-utils_use !fftw FFT_GREEN)
-		$(cmake-utils_use gedit SC_ED)
-		$(cmake-utils_use_no gpl3 GPL3)
-		$(cmake-utils_use ide SC_IDE)
-		$(cmake-utils_use_no sndfile SNDFILE)
-		$(cmake-utils_use qt4 SC_QT)
-		$(cmake-utils_use server SCLANG_SERVER)
-		$(cmake-utils_use sse SSE)
-		$(cmake-utils_use sse4 SSE41)
-		$(cmake-utils_use sse4 SSE42)
-		$(cmake-utils_use !static-libs LIBSCSYNTH)
-		$(cmake-utils_use system-boost SYSTEM_BOOST)
-		$(cmake-utils_use system-yaml SYSTEM_YAMLCPP)
-		$(cmake-utils_use test ENABLE_TESTSUITE)
-		$(cmake-utils_use vim SC_VIM)
-		$(cmake-utils_use wiimote SC_WII)
-	)
-	use coreaudio && mycmakeargs+=( "AUDIOAPI=coreaudio" )
-	use jack && mycmakeargs+=( "AUDIOAPI=jack" )
-	use portaudio && mycmakeargs+=( "AUDIOAPI=portaudio" )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use emacs && newdoc editors/scel/README README.emacs
-	use gedit && newdoc editors/sced/README README.gedit
-	use vim && newdoc editors/scvim/README README.vim
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Notice: SuperCollider is not very intuitive to get up and running."
-	einfo "The best course of action to make sure that the installation was"
-	einfo "successful and get you started with using SuperCollider is to take"
-	einfo "a look through /usr/share/doc/${PF}/README-gentoo.txt.gz"
-	einfo
-}