[proaudio] [2680] media-sound/fastbreeder: update for distutils-r1, workaround collision with khagan

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 2680
Author:   gavlee
Date:     2013-04-20 16:25:15 +0200 (Sat, 20 Apr 2013)
Log Message:
-----------
media-sound/fastbreeder: update for distutils-r1, workaround collision with khagan

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/fastbreeder/ChangeLog
    trunk/overlays/proaudio/media-sound/fastbreeder/Manifest
    trunk/overlays/proaudio/media-sound/fastbreeder/files/fastbreeder-1.0.1-SConstruct.patch
    trunk/overlays/proaudio/media-sound/fastbreeder/metadata.xml

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r2.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r1.ebuild
    trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1.ebuild

Modified: trunk/overlays/proaudio/media-sound/fastbreeder/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/ChangeLog	2013-04-20 14:25:14 UTC (rev 2679)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/ChangeLog	2013-04-20 14:25:15 UTC (rev 2680)
@@ -1,7 +1,15 @@
 # ChangeLog for media-sound/fastbreeder
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+*fastbreeder-1.0.1-r2 (20 Apr 2013)
+
+  20 Apr 2013; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  -fastbreeder-1.0.1.ebuild, -fastbreeder-1.0.1-r1.ebuild,
+  +fastbreeder-1.0.1-r2.ebuild, files/fastbreeder-1.0.1-SConstruct.patch,
+  metadata.xml:
+  update for distutils-r1, workaround collision with khagan
+
 *fastbreeder-1.0.1-r1 (22 Oct 2010)
 
   22 Oct 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>

Modified: trunk/overlays/proaudio/media-sound/fastbreeder/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/Manifest	2013-04-20 14:25:14 UTC (rev 2679)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/Manifest	2013-04-20 14:25:15 UTC (rev 2680)
@@ -1,6 +1,5 @@
-AUX fastbreeder-1.0.1-SConstruct.patch 972 RMD160 1635c783a5980b7b3363ca256794624a649aada9 SHA1 b76e0256d68d027dd239b02bb2de979bea63e216 SHA256 67b8687dd9bd0b0b70bb1f7d3acaa380563d90ca96a0644d6e1c628742196128
-DIST fastbreeder-1.0.1.tar.gz 488668 RMD160 87a80b944cc6e1c056137b9c6a30b4f47da0cfbb SHA1 93a5cd2e8d8912cd8e2c945304dcfce2e5f45a29 SHA256 5855e672355d87530f09ee28e95778b99b9e9fe12c5a929e793bb6cbd6413e02
-EBUILD fastbreeder-1.0.1-r1.ebuild 992 RMD160 51e74d14de1d1d0d0cdfabff2165bc1e6c0d13e4 SHA1 495d13bb8b7df639e129881196d3aa83eff5e4a0 SHA256 9969d8330e27d6f15c5f86c4089bace141abf509e46448005cda1d28fae603a3
-EBUILD fastbreeder-1.0.1.ebuild 1193 RMD160 3b99f7faeb29dd186b75be13eac6b6a385447349 SHA1 60fa3223ae9ece68ae119de80bdf1ebcdfbed373 SHA256 7285566b5d2f05d9d9ef853db84c4d70f1212d2e35dad24aa3a08bf9d7d02001
-MISC ChangeLog 565 RMD160 2acba98ccfe428343c7e1fc1f1c9e974cab5d99a SHA1 2f781bae681749c7b4b2780d1bdeca915e28b3bd SHA256 27079f63d99f58c25d858636cb0a102831c17a94ce07cc55163d8d70494f4024
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX fastbreeder-1.0.1-SConstruct.patch 932 SHA256 c757dd7b5d8b05a27a4f31823e17f4a4cc4c880dbb84d5313e4bbb16bbb23379 SHA512 8cf5356f4152360b94cb5fe3412aac3b3f327bacecc1181497a8a6b8ef392e1a51a6a43391adba66bfdc9b8b6a3d8a1d227d642c0d1dedd288f700da9a0ea014 WHIRLPOOL f7482c03e65ff6ed478447665cdc6b93af18ccaaaf2e34e46e8956dff61f47a46a249e06f7b6f91e1b9f5074e3a51dd61ce6d608f0ad1d17bc0231117fc80cf8
+DIST fastbreeder-1.0.1.tar.gz 488668 SHA256 5855e672355d87530f09ee28e95778b99b9e9fe12c5a929e793bb6cbd6413e02 SHA512 39e29d51bc186700865fde8f30243420730c279de2016ec674942cb78968724b027264340bca0a711ba094f7dcb2409b12b54dcf5096395df24e26a76df922f5 WHIRLPOOL 5c8c3dd600d5583210b0560095c77a63b7a208535fb9ae0a1422789fb1251597ccc4a04ee383e2e03188cccf301a2a7299f13235e10da953e1816a3053fe8e0f
+EBUILD fastbreeder-1.0.1-r2.ebuild 1080 SHA256 e7c16832a6d59314593e381c59cbfec9457544029ba3a6ac0193c5fa4afb5cb4 SHA512 ffe54db4d1f981db328c91875d06d384c98395fffbd36cce5ee545266c5f702a9b033d1136a1c2010636546cdfa9f6ad45ede462b00b8159f0db42557c7814d7 WHIRLPOOL b59c2e839189f2abe484de178a7f72ac2a89b40dcefe67386a08d1d1ed5b7497cab14554f8aa3340afe8ab96f6f389973f0d4b85f09938d8cb9709268667474e
+MISC ChangeLog 877 SHA256 ebf34fa88c00d0b39d6279e130a2cfc8d580af1aa31f0fe713fb7bc31a9039e7 SHA512 2b51f8813ca99c43568a4509a85cdbc54dfc1ba8d4e7669497d43f783c82ea4f82bcbc01977b1d6a9d6401bde78d673136e32e4054bbcfa8d8a8ace39b4637f8 WHIRLPOOL 654122e43ce6cb1f1e2516b0ab798b39425b59f8c33efe3b089c09f0271db3061a53c2f7224d1d61380d2ce776b0105a293964fd68ff80ab9c106391a81b1b46
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Deleted: trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r1.ebuild	2013-04-20 14:25:14 UTC (rev 2679)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r1.ebuild	2013-04-20 14:25:15 UTC (rev 2680)
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="tk"
-
-inherit eutils python toolchain-funcs scons-utils
-
-DESCRIPTION="An experimental genetic programming synthesiser."
-HOMEPAGE="http://www.pawfal.org/Software/fastbreeder/";
-SRC_URI="http://www.pawfal.org/Software/${PN}/files/${P}.tar.gz";
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND=">=media-libs/liblo-0.26
-		>=media-sound/jack-audio-connection-kit-0.116.2"
-DEPEND="${RDEPEND}"
-
-src_prepare () {
-	# patch for respecting toolchain flags
-	epatch "${FILESDIR}/${P}-SConstruct.patch"
-}
-
-src_compile() {
-	tc-export CXX
-	escons || die "escons failed"
-}
-
-src_install() {
-	# this could be better, using scons to install is a pain in the *
-	insinto	"$(python_get_sitedir)"
-	doins scripts/osc.py scripts/gpy.py || die
-	dobin fastbreederserver scripts/fastbreeder || die
-	dodoc README
-}

Added: trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r2.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1-r2.ebuild	2013-04-20 14:25:15 UTC (rev 2680)
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_7} )
+PYTHON_REQ_USE="tk"
+inherit base scons-utils python-r1 toolchain-funcs
+
+DESCRIPTION="An experimental genetic programming synthesiser."
+HOMEPAGE="http://www.pawfal.org/Software/fastbreeder/";
+SRC_URI="http://www.pawfal.org/Software/${PN}/files/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/PyOSC[${PYTHON_USEDEP}]
+	>=media-libs/liblo-0.26
+	>=media-sound/jack-audio-connection-kit-0.116.2"
+RDEPEND="${DEPEND}"
+
+RESTRICT="mirror"
+
+DOCS=( README )
+
+PATCHES=( "${FILESDIR}"/${P}-SConstruct.patch )
+
+src_compile() {
+	tc-export CXX
+	escons
+}
+
+src_install() {
+	install_fastbreeder() {
+		# osc.py not installed to workaround conflict with media-sound/khagan,
+		# provided instead by dev-python/PyOSC
+		python_domodule scripts/gpy.py
+		python_doscript	scripts/fastbreeder
+	}
+
+	python_foreach_impl install_fastbreeder
+
+	dobin fastbreederserver
+
+	base_src_install_docs
+}

Deleted: trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1.ebuild	2013-04-20 14:25:14 UTC (rev 2679)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/fastbreeder-1.0.1.ebuild	2013-04-20 14:25:15 UTC (rev 2680)
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils python
-
-DESCRIPTION="An experimental genetic programming synthesiser."
-HOMEPAGE="http://www.pawfal.org/Software/fastbreeder/";
-SRC_URI="http://www.pawfal.org/Software/${PN}/files/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug"
-RESTRICT="mirror"
-
-RDEPEND=">=media-libs/liblo-0.26
-		>=dev-lang/python-2.6[tk]
-		>=media-sound/jack-audio-connection-kit-0.116.2"
-DEPEND="dev-util/scons
-		${RDEPEND}"
-
-src_prepare () {
-	# compiler flags need attention
-	local dbg
-	if use debug; then dbg="-ggdb"; fi
-	sed -i -e "s:-pipe -Wall -O3 -ggdb:${CXXFLAGS} ${dbg} -Wall:g" \
-		"${S}/SConstruct" || die "sed of SConstruct failed"
-}
-
-src_compile() {
-	scons || die "scons configure failed"
-}
-
-src_install() {
-	# after trying to patch SConstruct to install to /usr it was figured
-	# that although this is ugly, it gets the job done.
-	insinto	"$(python_get_sitedir)"
-	doins "${WORKDIR}/${P}/scripts/osc.py"
-	doins "${WORKDIR}/${P}/scripts/gpy.py"
-	dobin "${WORKDIR}/${P}/fastbreederserver"
-	dobin "${WORKDIR}/${P}/scripts/fastbreeder"
-	dodoc README
-}

Modified: trunk/overlays/proaudio/media-sound/fastbreeder/files/fastbreeder-1.0.1-SConstruct.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/files/fastbreeder-1.0.1-SConstruct.patch	2013-04-20 14:25:14 UTC (rev 2679)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/files/fastbreeder-1.0.1-SConstruct.patch	2013-04-20 14:25:15 UTC (rev 2680)
@@ -7,13 +7,12 @@
  Target       = "fastbreederserver"
  PyTarget    = ["scripts/fastbreeder", "scripts/gpy.py", "scripts/osc.py"]
  Install      = "/usr/local/bin"
-@@ -23,7 +26,17 @@
+@@ -23,7 +26,16 @@
  				src/FastBreeder.cpp \
  				src/main.cpp")					
  
 -env = Environment(CCFLAGS = '-pipe -Wall -O3 -ggdb -ffast-math -Wno-unused  -fPIC')
-+#env = Environment(CCFLAGS = '-pipe -Wall -O3 -ggdb -ffast-math -Wno-unused  -fPIC')
-+env = Environment()
++env = Environment(CXXFLAGS = '-Wall -O3 -ggdb -ffast-math -fPIC')
 +
 +if os.environ.has_key('CXX'):
 +	env['CXX'] = os.environ['CXX']

Modified: trunk/overlays/proaudio/media-sound/fastbreeder/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/fastbreeder/metadata.xml	2013-04-20 14:25:14 UTC (rev 2679)
+++ trunk/overlays/proaudio/media-sound/fastbreeder/metadata.xml	2013-04-20 14:25:15 UTC (rev 2680)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>proaudio@xxxxxxxxxxxxx</email>
 		<name>pro-audio overlay team</name>


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/