=dev-lang/ghc-6.10.4"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/haskell-src-exts/Manifest b/dev-haskell/haskell-src-exts/Manifest
index 31bf2590e801..9c7c54a36797 100644
--- a/dev-haskell/haskell-src-exts/Manifest
+++ b/dev-haskell/haskell-src-exts/Manifest
@@ -2,4 +2,5 @@ DIST haskell-src-exts-0.2.tar.gz 59520 RMD160 4fb15828c41cce431f947dcb549b3aa579
DIST haskell-src-exts-1.11.1.tar.gz 286132 RMD160 bdf710fc358eddd8567615b68201f242a31c7ed0 SHA1 9be54f314d14d30ebcbad5aa274e57039596d627 SHA256 a6065470898741c3f16a96c871ddecd09b61c4025640e47c2efdf01f10450ecb
DIST haskell-src-exts-1.13.0.tar.gz 287426 RMD160 c0ed819e2052266743f7583e242278eef6ca0550 SHA1 fdbcdc0650c1c64f9dd0868cd0c4c3ed6c854cc7 SHA256 c42cd24a9e7055d62cfbe57ffd10fa990319b1aebd5c34964c3ee79d1dda70ce
DIST haskell-src-exts-1.13.2.tar.gz 288280 RMD160 991b363ccdfeae02a5ce72bc67e1ba60a63ea490 SHA1 aa096e28ea31a28898866fdfc93d590bed92a327 SHA256 02985e368e06603fb4dbce5f26944960c707ab69f29bdcc8a5a85ebf9ec204ef
+DIST haskell-src-exts-1.13.3.tar.gz 289796 RMD160 fd346bc9b63f14a3af8d28ac94b0413fce16ae14 SHA1 56f0b462c2c41f64f85a8b9262ae909b60d37cb3 SHA256 259186b608e616351462c3ceccd5350a6569992c987119021bf53510a5d15b7c
DIST haskell-src-exts-1.9.0.tar.gz 176438 RMD160 c8bf9ca9bf8c6eafb56e28031a316c1483112619 SHA1 e8017cbec5c287ec8b6c7b7d247e083c7502d7a2 SHA256 dedb529217dfe393f75f26b735f7dd09eea50006481f60d06e169de6f328d1da
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.3.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.3.ebuild
new file mode 100644
index 000000000000..6bd4a7e1cc40
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.3.ebuild,v 1.1 2012/05/29 09:53:56 gienah Exp $
+
+EAPI=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"
+HOMEPAGE="http://code.haskell.org/haskell-src-exts"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cpphs-1.3
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+ dev-haskell/happy"
+
+src_prepare() {
+ # test suite is broken, expects the package to be already installed.
+ # this new Setup.hs will use the package inplice for tests
+ cp "${FILESDIR}/haskell-src-exts-1.10.2-Setup.hs" "${S}/Setup.hs" \
+ || die "Could not cp Setup.hs for tests"
+
+ # remove broken tests. they will fail if you expect them to pass, and pass
+ # if you expect them to fail...
+ rm "${S}/Test/examples/Unicode"{.hs,Syntax.hs} \
+ || die "Could not rm broken tests"
+}
diff --git a/dev-haskell/pango/pango-0.12.3.ebuild b/dev-haskell/pango/pango-0.12.3.ebuild
index dffa620dc2a9..c642b39e789b 100644
--- a/dev-haskell/pango/pango-0.12.3.ebuild
+++ b/dev-haskell/pango/pango-0.12.3.ebuild
@@ -1,10 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.3.ebuild,v 1.1 2012/05/15 17:04:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.3.ebuild,v 1.2 2012/05/29 10:55:56 gienah Exp $
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
+EAPI=4
#nocabaldep is for the fancy cabal-detection feature at build-time
CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
diff --git a/dev-java/cortado/cortado-0.6.0.ebuild b/dev-java/cortado/cortado-0.6.0.ebuild
index ea3e8416c64c..b6e733c21a1a 100644
--- a/dev-java/cortado/cortado-0.6.0.ebuild
+++ b/dev-java/cortado/cortado-0.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cortado/cortado-0.6.0.ebuild,v 1.3 2012/03/04 15:16:54 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cortado/cortado-0.6.0.ebuild,v 1.4 2012/05/29 12:09:48 ago Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.xiph.org/releases/cortado/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
diff --git a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
index 1720f01c48db..1132a7e1ce76 100644
--- a/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
+++ b/dev-java/libmatthew-java/files/libmatthew-java-0.7.2-makefile-fixes.patch
@@ -1,7 +1,7 @@
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
--- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300
+++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 +0200
-@@ -6,13 +6,13 @@
+@@ -6,13 +6,12 @@
CC?=gcc
LD?=gcc
JPPFLAGS+=-C -P
@@ -13,7 +13,6 @@ diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
JVERCFLAGS+=-source 1.5
JCFLAGS+=
-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-+INCLUDES=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
LDVER?=$(shell ld -v | cut -d' ' -f1)
@@ -51,17 +50,20 @@ diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
unix-java.h: .classes
$(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream
cgi-java.h: .classes
-@@ -91,12 +85,10 @@
+@@ -91,13 +85,11 @@
+ tar zcf $@ libmatthew-java-$(MATTVER)
debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
- make .enabledebug
+- make .enabledebug
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++ $(MAKE) .enabledebug
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp
- make .disabledebug
+- make .disabledebug
- echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest
- (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class)
++ $(MAKE) .disabledebug
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
.enabledebug: cx/ath/matthew/debug/Debug.jpp
mkdir -p classes
diff --git a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
index 4cd9b4abc431..85698bf6c5fe 100644
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild,v 1.5 2012/03/09 14:21:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild,v 1.6 2012/05/29 10:06:52 naota Exp $
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-lang/clojure/clojure-1.4.0.ebuild b/dev-lang/clojure/clojure-1.4.0.ebuild
index d21e9fcd611b..2a214e6e76a2 100644
--- a/dev-lang/clojure/clojure-1.4.0.ebuild
+++ b/dev-lang/clojure/clojure-1.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.4.0.ebuild,v 1.2 2012/05/29 05:45:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/clojure/clojure-1.4.0.ebuild,v 1.3 2012/05/29 12:10:24 ago Exp $
EAPI=2
JAVA_PKG_IUSE="source test"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clojure/clojure/tarball/clojure-1.4.0 -> ${P}.tar.gz
LICENSE="EPL-1.0"
SLOT="1.4"
-KEYWORDS="~amd64 x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
IUSE=""
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-libs/icu/icu-49.1.1-r1.ebuild b/dev-libs/icu/icu-49.1.1-r1.ebuild
index 051da03a6a7b..083f068ce7c4 100644
--- a/dev-libs/icu/icu-49.1.1-r1.ebuild
+++ b/dev-libs/icu/icu-49.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.8 2012/05/26 09:54:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.9 2012/05/29 12:07:41 scarabeus Exp $
EAPI="4"
@@ -25,7 +25,7 @@ SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug doc examples static-libs"
DEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-libs/libebml/libebml-1.2.2.ebuild b/dev-libs/libebml/libebml-1.2.2.ebuild
index 4a9031895fce..6639e910fbb7 100644
--- a/dev-libs/libebml/libebml-1.2.2.ebuild
+++ b/dev-libs/libebml/libebml-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.2.2.ebuild,v 1.8 2012/03/08 14:53:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libebml/libebml-1.2.2.ebuild,v 1.9 2012/05/29 13:32:31 aballier Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="debug static-libs"
S="${WORKDIR}/${P}/make/linux"
diff --git a/dev-libs/libtar/libtar-1.2.11-r4.ebuild b/dev-libs/libtar/libtar-1.2.11-r4.ebuild
index 6a6d35d477ac..1291ff5ce19f 100644
--- a/dev-libs/libtar/libtar-1.2.11-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.11-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r4.ebuild,v 1.5 2012/03/02 21:05:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r4.ebuild,v 1.6 2012/05/29 13:40:21 aballier Exp $
EAPI=3
inherit autotools eutils multilib
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.feep.net/pub/software/libtar/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static-libs zlib"
DEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r1.ebuild b/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r1.ebuild
new file mode 100644
index 000000000000..d852246fe99a
--- /dev/null
+++ b/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SMTP-TLS/Net-SMTP-TLS-0.120.0-r1.ebuild,v 1.1 2012/05/29 11:47:51 dev-zero Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=AWESTHOLM
+MODULE_VERSION=0.12
+inherit perl-module
+
+DESCRIPTION="A SMTP client supporting TLS and AUTH"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-perl/Net-SSLeay
+ dev-perl/IO-Socket-SSL
+ virtual/perl-MIME-Base64
+ dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+SRC_TEST="do"
+
+PATCHES=( "${FILESDIR}/${PV}-multiple-attachments-fix.patch" )
diff --git a/dev-perl/Net-SMTP-TLS/files/0.120.0-multiple-attachments-fix.patch b/dev-perl/Net-SMTP-TLS/files/0.120.0-multiple-attachments-fix.patch
new file mode 100644
index 000000000000..05eac0eaa3c6
--- /dev/null
+++ b/dev-perl/Net-SMTP-TLS/files/0.120.0-multiple-attachments-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/Net/SMTP/TLS.pm b/lib/Net/SMTP/TLS.pm
+index 10f9f19..4936fe5 100644
+--- a/lib/Net/SMTP/TLS.pm
++++ b/lib/Net/SMTP/TLS.pm
+@@ -367,6 +367,7 @@ sub datasend {
+ return undef;
+ }
+ $len -= $w;
++ $offset += $w;
+ }
+ else
+ {
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
new file mode 100644
index 000000000000..a6acc6504abd
--- /dev/null
+++ b/dev-python/audioread/Manifest
@@ -0,0 +1 @@
+DIST audioread-0.6.tar.gz 12278 RMD160 3d7205c7121e65796f45b90df1c61c5da4c33b0b SHA1 5d024ffe142a1cca59231026ad32b83911d99823 SHA256 a26cce372ceb2f4136c162eb3ce6bbb56e983c7a3473f41b97e28a39ec023d09
diff --git a/dev-python/audioread/audioread-0.6.ebuild b/dev-python/audioread/audioread-0.6.ebuild
new file mode 100644
index 000000000000..c6ef17394ba9
--- /dev/null
+++ b/dev-python/audioread/audioread-0.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/audioread/audioread-0.6.ebuild,v 1.2 2012/05/29 12:39:06 sochotnicky Exp $
+
+EAPI=4
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS=""
+
+inherit distutils
+
+DESCRIPTION="Module for decoding audio files using whichever backend is available"
+HOMEPAGE="http://pypi.python.org/pypi/audioread"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="|| ( dev-python/gst-python dev-python/pymad media-video/ffmpeg )"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+ elog "You might need to enable additional USE flags in backends to"
+ elog "decode some types of audio files. Priority of backends:"
+ elog " * gstreamer"
+ elog " * mad"
+ elog " * ffmpeg"
+}
diff --git a/dev-python/audioread/metadata.xml b/dev-python/audioread/metadata.xml
new file mode 100644
index 000000000000..dc0994929b8b
--- /dev/null
+++ b/dev-python/audioread/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ sochotnicky@gentoo.org
+ Stanislav Ochotnicky
+
+
+Decode audio files using whichever backend is available. The library currently supports:
+ * Gstreamer via gst-python.
+ * MAD via the pymad bindings.
+ * FFmpeg via its command-line interface.
+ * The standard library wave and aifc modules (for WAV and AIFF files).
+
+
+
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
new file mode 100644
index 000000000000..070dd43f10a6
--- /dev/null
+++ b/dev-python/bluelet/Manifest
@@ -0,0 +1 @@
+DIST bluelet-0.1.tar.gz 9328 RMD160 f4031dd11faa510db23bccf346287c0a64df2788 SHA1 e614586d3525a326557fb3a7d47c146605339ca3 SHA256 7fe0d3034d648f19a60304d710b68a7b9ed710f0b3c6c5f7fa0c8fe3d935912b
diff --git a/dev-python/bluelet/bluelet-0.1.ebuild b/dev-python/bluelet/bluelet-0.1.ebuild
new file mode 100644
index 000000000000..ac5ab0799d83
--- /dev/null
+++ b/dev-python/bluelet/bluelet-0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bluelet/bluelet-0.1.ebuild,v 1.1 2012/05/29 12:53:18 sochotnicky Exp $
+
+EAPI=4
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Module for pure Python asynchronous I/O using coroutines"
+HOMEPAGE="http://pypi.python.org/pypi/bluelet"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
new file mode 100644
index 000000000000..76b6ede9ebdd
--- /dev/null
+++ b/dev-python/bluelet/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ sochotnicky@gentoo.org
+ Stanislav Ochotnicky
+
+
+Bluelet is a simple, pure-Python solution for writing intelligible asynchronous socket applications. It uses PEP 342 coroutines to make concurrent I/O look and act like sequential programming.
+
+In this way, it is similar to the Greenlet green-threads library and its associated packages Eventlet and Gevent. Bluelet has a simpler, 100% Python implementation that comes at the cost of flexibility and performance when compared to Greenlet-based solutions. However, it should be sufficient for many applications that don't need serious scalability; it can be thought of as a less-horrible alternative to asyncore or an asynchronous replacement for SocketServer (and more).
+
+
+
diff --git a/dev-python/django-evolution/metadata.xml b/dev-python/django-evolution/metadata.xml
index 12f56ae8b942..eb998717c56f 100644
--- a/dev-python/django-evolution/metadata.xml
+++ b/dev-python/django-evolution/metadata.xml
@@ -1,10 +1,12 @@
- python
-
- johneed@hotmail.com,della5@iinet.com.au
- Ian Delaney aka idella4 proxy maintainer
-
- tampakrap@gentoo.org
+ python
+
+ johneed@hotmail.com
+ Ian 'idella4' Delaney
+
+
+ tampakrap@gentoo.org
+
diff --git a/dev-python/django-pipeline/metadata.xml b/dev-python/django-pipeline/metadata.xml
index bfe30823be5b..eb998717c56f 100644
--- a/dev-python/django-pipeline/metadata.xml
+++ b/dev-python/django-pipeline/metadata.xml
@@ -1,10 +1,12 @@
- python
-
- della5@iinet.com.au
- Ian Delaney aka idella4 proxy maintainer
-
- tampakrap@gentoo.org
+ python
+
+ johneed@hotmail.com
+ Ian 'idella4' Delaney
+
+
+ tampakrap@gentoo.org
+
diff --git a/dev-python/py2play/py2play-0.1.10.ebuild b/dev-python/py2play/py2play-0.1.10.ebuild
index 8f60378087d9..fdfda91fceb4 100644
--- a/dev-python/py2play/py2play-0.1.10.ebuild
+++ b/dev-python/py2play/py2play-0.1.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/py2play-0.1.10.ebuild,v 1.2 2012/05/29 05:31:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/py2play-0.1.10.ebuild,v 1.3 2012/05/29 12:25:04 ago Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ SRC_URI="http://download.gna.org/slune/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
new file mode 100644
index 000000000000..54d95f6510be
--- /dev/null
+++ b/dev-python/pyacoustid/Manifest
@@ -0,0 +1 @@
+DIST pyacoustid-0.7.tar.gz 10173 RMD160 e1f48ff698d813ece1926e6d689fa1b99f056162 SHA1 5e7d9eeb89b519d9b61255f4b1af0f46d36a7f1a SHA256 ad1d15773a776d7880350062131f055e260f4c39135cfcc1cfbfdbcbfc08f2ef
diff --git a/dev-python/pyacoustid/metadata.xml b/dev-python/pyacoustid/metadata.xml
new file mode 100644
index 000000000000..e5e6214fec57
--- /dev/null
+++ b/dev-python/pyacoustid/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ sochotnicky@gentoo.org
+ Stanislav Ochotnicky
+
+
+Chromaprint and its associated Acoustid Web service make up a high-quality, open-source acoustic fingerprinting system. This package provides Python bindings for both the fingerprinting algorithm library, which is written in C but portable, and the Web service, which provides fingerprint lookups.
+
+
+
diff --git a/dev-python/pyacoustid/pyacoustid-0.7.ebuild b/dev-python/pyacoustid/pyacoustid-0.7.ebuild
new file mode 100644
index 000000000000..d5534e470cc7
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyacoustid/pyacoustid-0.7.ebuild,v 1.1 2012/05/29 12:45:23 sochotnicky Exp $
+
+EAPI=4
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Python module for Chromaprint acoustic fingerprinting and the Acoustid API"
+HOMEPAGE="http://pypi.python.org/pypi/pyacoustid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="media-libs/chromaprint
+ dev-python/audioread"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
new file mode 100644
index 000000000000..512dd34ce84d
--- /dev/null
+++ b/dev-python/pylast/Manifest
@@ -0,0 +1 @@
+DIST pylast-0.5.11.tar.gz 26146 RMD160 895a663d093cbac8f643f9872d19fa4cb024e96b SHA1 0e432279ccbed69580d313db15c1a03a7a39c42c SHA256 bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4
diff --git a/dev-python/pylast/metadata.xml b/dev-python/pylast/metadata.xml
new file mode 100644
index 000000000000..512f8cd2ae40
--- /dev/null
+++ b/dev-python/pylast/metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ sochotnicky@gentoo.org
+ Stanislav Ochotnicky
+
+
+Python interface to last.fm and other api-compatible websites
+
+Features:
+ * Simple public interface.
+ * Access to all the data exposed by the Last.fm webservices.
+ * Scrobbling support.
+ * Full object-oriented design.
+ * Proxy support.
+ * Internal caching support for some webservices calls (disabled by default).
+ * No extra dependencies but python itself.
+ * Support for other API-compatible networks like Libre.fm
+ * Python3-friendly (Starting from 0.5).
+
+
+
diff --git a/dev-python/pylast/pylast-0.5.11.ebuild b/dev-python/pylast/pylast-0.5.11.ebuild
new file mode 100644
index 000000000000..a27984aac9ca
--- /dev/null
+++ b/dev-python/pylast/pylast-0.5.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylast/pylast-0.5.11.ebuild,v 1.1 2012/05/29 12:18:08 sochotnicky Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS=""
+
+inherit distutils
+
+DESCRIPTION="Python interface to last.fm and other api-compatible websites"
+HOMEPAGE="http://code.google.com/p/pylast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pytz/pytz-2012c.ebuild b/dev-python/pytz/pytz-2012c.ebuild
index 1045a7a190c2..87dcf4816785 100644
--- a/dev-python/pytz/pytz-2012c.ebuild
+++ b/dev-python/pytz/pytz-2012c.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012c.ebuild,v 1.3 2012/05/29 05:36:58 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2012c.ebuild,v 1.4 2012/05/29 12:11:09 ago Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND="dev-python/setuptools
diff --git a/dev-python/rope/rope-0.9.3.ebuild b/dev-python/rope/rope-0.9.3.ebuild
index 68778cf19fab..539ae30bb24e 100644
--- a/dev-python/rope/rope-0.9.3.ebuild
+++ b/dev-python/rope/rope-0.9.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rope/rope-0.9.3.ebuild,v 1.8 2012/05/29 05:28:03 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rope/rope-0.9.3.ebuild,v 1.9 2012/05/29 12:07:58 ago Exp $
EAPI="3"
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="dev-python/setuptools"
diff --git a/dev-python/starcluster/Manifest b/dev-python/starcluster/Manifest
index d68905d648ee..edd2cb88ffcf 100644
--- a/dev-python/starcluster/Manifest
+++ b/dev-python/starcluster/Manifest
@@ -1 +1 @@
-DIST StarCluster-0.93.3.tar.gz 2334885 SHA256 fcda894be33ba309b1c7a94d6c28f1674c3f05ec756133138a39db2138d080d0 SHA512 f81cfc528a00f45f6e720645f44666947f1c51dd3453ac5d78b201d6c3a3cd9f6d97cb7a2802eaf04603d9a19810045ca6071722c9af884ba7e407ffc99078ea WHIRLPOOL b6bfde98f3b660211c5e08965cc6ee31fc9038ec4039ef5aa12ab9c5d474f60f66c1745fb93cce7e05cb361cff6091f60714168ffca81e4033f2fecc5d9d448f
+DIST StarCluster-0.93.3.tar.gz 2334885 RMD160 763289eaaa51d9fea2432376b09de668560060ee SHA1 a761bba3994b37ad7bacb8bfdbeb6b22c247e2e0 SHA256 fcda894be33ba309b1c7a94d6c28f1674c3f05ec756133138a39db2138d080d0
diff --git a/dev-python/starcluster/metadata.xml b/dev-python/starcluster/metadata.xml
index c28fdc4c7f92..8c672516ce14 100644
--- a/dev-python/starcluster/metadata.xml
+++ b/dev-python/starcluster/metadata.xml
@@ -1,17 +1,19 @@
- python
- tampakrap@gentoo.org
-
- johneed@hotmail.com,della5@iinet.com.au
- Ian Delaney aka idella4 proxy maintainer
-
-
- jtriley@mit.edu
- Justin Riley
-
-
+ python
+
+ tampakrap@gentoo.org
+
+
+ johneed@hotmail.com
+ Ian 'idella4' Delaney
+
+
+ jtriley@mit.edu
+ Justin Riley
+
+
diff --git a/dev-python/starcluster/starcluster-0.93.3.ebuild b/dev-python/starcluster/starcluster-0.93.3.ebuild
index 7980b6d827a2..123790725443 100644
--- a/dev-python/starcluster/starcluster-0.93.3.ebuild
+++ b/dev-python/starcluster/starcluster-0.93.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3.ebuild,v 1.1 2012/05/28 12:54:05 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/starcluster/starcluster-0.93.3.ebuild,v 1.2 2012/05/29 10:11:24 xarthisius Exp $
EAPI=4
@@ -10,12 +10,12 @@ RESTRICT_PYTHON_ABIS="3.*"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils bash-completion-r1
-MY_PN="StarCluster"
-MY_P="${MY_PN}-${PV}"
+MY_PN=StarCluster
+MY_P=${MY_PN}-${PV}
DESCRIPTION="Utility for creating / managing general purpose computing clusters"
HOMEPAGE="http://web.mit.edu/star/cluster"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3"
KEYWORDS="~amd64 ~x86"
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
dev-python/matplotlib )
dev-python/setuptools"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_compile() {
distutils_src_compile
diff --git a/dev-python/testfixtures/metadata.xml b/dev-python/testfixtures/metadata.xml
index bfe30823be5b..eb998717c56f 100644
--- a/dev-python/testfixtures/metadata.xml
+++ b/dev-python/testfixtures/metadata.xml
@@ -1,10 +1,12 @@
- python
-
- della5@iinet.com.au
- Ian Delaney aka idella4 proxy maintainer
-
- tampakrap@gentoo.org
+ python
+
+ johneed@hotmail.com
+ Ian 'idella4' Delaney
+
+
+ tampakrap@gentoo.org
+
diff --git a/dev-python/workerpool/Manifest b/dev-python/workerpool/Manifest
index a81e39408992..c4b2d415c116 100644
--- a/dev-python/workerpool/Manifest
+++ b/dev-python/workerpool/Manifest
@@ -1 +1 @@
-DIST workerpool-0.9.2.tar.gz 7747 SHA256 ab2eaf05e236140c62c7411d13ecc4ddedc365966282719a35afc53043c00f82 SHA512 d5ce36ff48b297adb40baf40a53823cc8b6e39b0c7eb880541dffb5ea1d0849e50c344e63f1ac3089d51fc1fe6e73ff2a26df03f9d68f24980222fe3ef7f01c5 WHIRLPOOL 093221fb442abe017591fa79b85abbd1824b63ec89aaf62eb87cb50975dd5164cd3a1ef36c51336e2dcb97aef3fdd18695691e73bfaaa168077172bcc5a49db3
+DIST workerpool-0.9.2.tar.gz 7747 RMD160 e7565d81be215d0c728ef7306efa3ebea0fafebd SHA1 34da871db2615a474f8332e2aa33285a2d808bb7 SHA256 ab2eaf05e236140c62c7411d13ecc4ddedc365966282719a35afc53043c00f82
diff --git a/dev-python/workerpool/metadata.xml b/dev-python/workerpool/metadata.xml
index 1d59d7ebfd4b..73319ab65d67 100644
--- a/dev-python/workerpool/metadata.xml
+++ b/dev-python/workerpool/metadata.xml
@@ -1,14 +1,16 @@
- python
- tampakrap@gentoo.org
-
- johneed@hotmail.com,della5@iinet.com.au
- Ian Delaney aka idella4 proxy maintainer
-
-
- jtriley@mit.edu
- Justin Riley
-
+ python
+
+ tampakrap@gentoo.org
+
+
+ johneed@hotmail.com
+ Ian 'idella4' Delaney
+
+
+ jtriley@mit.edu
+ Justin Riley
+
diff --git a/dev-python/workerpool/workerpool-0.9.2.ebuild b/dev-python/workerpool/workerpool-0.9.2.ebuild
index e5bc4066964f..85cf8319e5a3 100644
--- a/dev-python/workerpool/workerpool-0.9.2.ebuild
+++ b/dev-python/workerpool/workerpool-0.9.2.ebuild
@@ -1,17 +1,18 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/workerpool-0.9.2.ebuild,v 1.1 2012/05/28 12:50:14 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/workerpool-0.9.2.ebuild,v 1.2 2012/05/29 10:13:22 xarthisius Exp $
EAPI=4
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython"
DISTUTILS_SRC_TEST=nosetests
PYTHON_TESTS_RESTRICTED_ABIS="3.*"
+
inherit distutils
DESCRIPTION="Module for distributing jobs to a pool of worker threads."
HOMEPAGE="http://github.com/shazow/workerpool"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/xlutils/metadata.xml b/dev-python/xlutils/metadata.xml
index 12f56ae8b942..eb998717c56f 100644
--- a/dev-python/xlutils/metadata.xml
+++ b/dev-python/xlutils/metadata.xml
@@ -1,10 +1,12 @@
- python
-
- johneed@hotmail.com,della5@iinet.com.au
- Ian Delaney aka idella4 proxy maintainer
-
- tampakrap@gentoo.org
+ python
+
+ johneed@hotmail.com
+ Ian 'idella4' Delaney
+
+
+ tampakrap@gentoo.org
+
diff --git a/games-action/atanks/atanks-5.4.ebuild b/games-action/atanks/atanks-5.4.ebuild
index c3b4e9947690..147fe279f648 100644
--- a/games-action/atanks/atanks-5.4.ebuild
+++ b/games-action/atanks/atanks-5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.4.ebuild,v 1.1 2012/04/21 21:22:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.4.ebuild,v 1.2 2012/05/29 12:09:03 ago Exp $
EAPI=2
inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND="media-libs/allegro:0[X]"
diff --git a/games-engines/qtads/qtads-2.1.3.ebuild b/games-engines/qtads/qtads-2.1.3.ebuild
index 088fa0a66e68..0bd33c50a265 100644
--- a/games-engines/qtads/qtads-2.1.3.ebuild
+++ b/games-engines/qtads/qtads-2.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/qtads-2.1.3.ebuild,v 1.1 2012/04/12 17:53:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/qtads/qtads-2.1.3.ebuild,v 1.2 2012/05/29 12:08:31 ago Exp $
EAPI=2
inherit eutils qt4-r2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtads/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND="x11-libs/qt-gui:4
diff --git a/games-strategy/freecol/freecol-0.10.5.ebuild b/games-strategy/freecol/freecol-0.10.5.ebuild
index 562af45450a2..835029c473d7 100644
--- a/games-strategy/freecol/freecol-0.10.5.ebuild
+++ b/games-strategy/freecol/freecol-0.10.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.5.ebuild,v 1.2 2012/05/28 20:19:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.5.ebuild,v 1.3 2012/05/29 12:13:14 ago Exp $
EAPI=2
inherit base eutils java-pkg-2 java-ant-2 games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
COMMON_DEP="dev-java/jsr173
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
index 8c92c34b286d..7a4e886b4ab5 100644
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
+++ b/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.10 2012/05/21 18:59:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprint/libgnomeprint-2.18.8.ebuild,v 1.11 2012/05/29 14:24:01 aballier Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="cups doc"
RDEPEND=">=dev-libs/glib-2
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild
index 385c4cdb3847..957e72d1edd5 100644
--- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild
+++ b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild,v 1.9 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6.ebuild,v 1.10 2012/05/29 14:25:37 aballier Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND=">=x11-libs/gtk+-2.6:2
diff --git a/licenses/CVC3 b/licenses/CVC3
new file mode 100644
index 000000000000..d3cf05ca7344
--- /dev/null
+++ b/licenses/CVC3
@@ -0,0 +1,73 @@
+/*!\page LICENSE LICENSE
+
+Copyright (C) 2003-2009 by the Board of Trustees of Leland Stanford Junior
+University, New York University, and the University of Iowa, hereafter
+designated as the Copyright Owners.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+* Neither the names of the Copyright Owners nor the names of any contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT OWNERS AND CONTRIBUTORS ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Note:
+
+The following files contain code whose copyright does not belong to the
+Copyright Owners. However, separate copyright notices in these files give
+express permission to copy, use, modify, sell, or distribute the code. Please
+see the copyright notices in the individual files for details.
+
+
+src/include/fdstream.h
+src/include/hash_map.h
+src/include/hash_fun.h
+src/include/hash_set.h
+src/include/hash_table.h
+src/sat/minisat_varorder.h
+src/sat/minisat_solver.cpp
+src/sat/minisat_heap.h
+src/sat/minisat_types.h
+src/sat/minisat_solver.h
+src/sat/minisat_global.h
+
+This copy of CVC3 is also configured to use the SAT solver zchaff whose
+copyright is owned by Princeton University and is more restrictive.
+
+Specifically, it may be used for internal, noncommercial, research purposes
+only. See the copyright notice in the following files for more information.
+To build CVC3 without these files, please delete them and then run:
+
+ ./configure --disable-zchaff
+ make
+
+
+
+src/sat/xchaff_base.h
+src/sat/xchaff_dbase.h
+src/sat/xchaff_solver.h
+src/sat/xchaff_utils.h
+src/sat/xchaff_dbase.cpp
+src/sat/xchaff_solver.cpp
+src/sat/xchaff_utils.cpp
+
+
+*/
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 728ed06a1207..661a40fbb869 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,3 +1,3 @@
DIST roundcubemail-0.7.1.tar.gz 2710511 RMD160 03dccb9c4fb6bb0ca9d4a59162b307fe2f8affc3 SHA1 20d7c7203de14727f2bdcfbbc61916b7ff5a3dc2 SHA256 3b3da3f85ae64a5a7513a1fbc8b5ea97ae2c39a920f9b11daa11083dc7e3c587
DIST roundcubemail-0.7.2.tar.gz 2714219 RMD160 0e130d552dde2e575318ae7983fa72b15d5a8c16 SHA1 fdfa7fdbe7eac7244dd9c5f7ca08ef8b52afdfa5 SHA256 a29e4aded3a3b01b763e60443f5afb4cb2969365532762f4436793e8b98cea17
-DIST roundcubemail-0.8-beta.tar.gz 3308307 RMD160 f551011f62771e95af1167018a2eb1650c2c7501 SHA1 0b1795fa7e071d9b501ccb6568c78704dee57d93 SHA256 1099181878da001e189d3e4fc48f52c8aba22615f160ac64fab1e1b2eaff8346
+DIST roundcubemail-0.8-rc.tar.gz 3632035 RMD160 30986295d8f931db631dc9f0b40c9767a09454db SHA1 8b460fd19abdb13e2713b3c142e522d146d6ef51 SHA256 f109ce77699941097e0cafd101e4f0a0eb4b023750fc1e58cfcb6f2aa7d22033
diff --git a/mail-client/roundcube/roundcube-0.8_beta.ebuild b/mail-client/roundcube/roundcube-0.8_rc.ebuild
similarity index 87%
rename from mail-client/roundcube/roundcube-0.8_beta.ebuild
rename to mail-client/roundcube/roundcube-0.8_rc.ebuild
index fbb4a7aac2f7..828b4ae753b1 100644
--- a/mail-client/roundcube/roundcube-0.8_beta.ebuild
+++ b/mail-client/roundcube/roundcube-0.8_rc.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.8_beta.ebuild,v 1.1 2012/03/09 11:55:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/roundcube/roundcube-0.8_rc.ebuild,v 1.1 2012/05/29 12:58:58 radhermit Exp $
EAPI="4"
@@ -16,17 +16,16 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
# for bundled PEAR components, googiespell and utf8.class.php
LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ldap mysql postgres ssl spell +sqlite"
+IUSE="ldap +mysql postgres ssl spell"
RDEPEND="virtual/httpd-php
- >=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,postgres?,session,sqlite?,sockets,ssl?,xml,unicode]
+ >=dev-lang/php-5.3[crypt,gd,iconv,json,ldap?,postgres?,session,sockets,ssl?,xml,unicode]
mysql? (
|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )
|| ( dev-php/PEAR-MDB2_Driver_mysql dev-php/PEAR-MDB2_Driver_mysqli )
)
postgres? ( dev-php/PEAR-MDB2_Driver_pgsql )
spell? ( dev-lang/php[curl,spell] )
- sqlite? ( dev-php/PEAR-MDB2_Driver_sqlite )
>=dev-php/PEAR-MDB2-2.5.0_beta3
>=dev-php/PEAR-Mail_Mime-1.8.1
>=dev-php/PEAR-Net_SMTP-1.4.2
@@ -35,7 +34,7 @@ RDEPEND="virtual/httpd-php
need_httpd_cgi
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
src_prepare() {
cp config/db.inc.php{.dist,} || die
@@ -47,7 +46,7 @@ src_prepare() {
src_install() {
webapp_src_preinst
- dodoc CHANGELOG INSTALL README UPGRADING
+ dodoc CHANGELOG INSTALL README.md UPGRADING
insinto "${MY_HTDOCSDIR}"
doins -r [[:lower:]]* SQL
diff --git a/media-libs/game-music-emu/game-music-emu-0.5.5.ebuild b/media-libs/game-music-emu/game-music-emu-0.5.5.ebuild
index e4d69e24fc40..ce77d9e09828 100644
--- a/media-libs/game-music-emu/game-music-emu-0.5.5.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/game-music-emu/game-music-emu-0.5.5.ebuild,v 1.9 2011/07/07 03:48:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/game-music-emu/game-music-emu-0.5.5.ebuild,v 1.10 2012/05/29 13:24:09 aballier Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI="http://game-music-emu.googlecode.com/files/${P}.tbz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/media-libs/glew/glew-1.7.0.ebuild b/media-libs/glew/glew-1.7.0.ebuild
index 3276f1bfeb41..25b243051fa6 100644
--- a/media-libs/glew/glew-1.7.0.ebuild
+++ b/media-libs/glew/glew-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.7.0.ebuild,v 1.1 2011/10/01 07:11:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.7.0.ebuild,v 1.2 2012/05/29 13:57:44 aballier Exp $
EAPI=4
inherit multilib toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
RDEPEND="x11-libs/libXmu
@@ -50,6 +50,8 @@ src_prepare() {
# don't do stupid Solaris specific stuff that won't work in Prefix
cp config/Makefile.linux config/Makefile.solaris || die
+ # and let freebsd be built as on linux too
+ cp config/Makefile.linux config/Makefile.freebsd || die
}
src_compile(){
diff --git a/media-libs/libaacs/libaacs-0.4.0.ebuild b/media-libs/libaacs/libaacs-0.4.0.ebuild
index 41148c509c4b..c1f08dbe74cb 100644
--- a/media-libs/libaacs/libaacs-0.4.0.ebuild
+++ b/media-libs/libaacs/libaacs-0.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacs/libaacs-0.4.0.ebuild,v 1.1 2012/05/10 04:05:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libaacs/libaacs-0.4.0.ebuild,v 1.2 2012/05/29 13:14:17 aballier Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.videolan.org/pub/videolan/libaacs/${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
IUSE="static-libs"
RDEPEND="dev-libs/libgcrypt
diff --git a/media-libs/libbluray/libbluray-0.2.2.ebuild b/media-libs/libbluray/libbluray-0.2.2.ebuild
index 484c5b50f503..f30be38770d1 100644
--- a/media-libs/libbluray/libbluray-0.2.2.ebuild
+++ b/media-libs/libbluray/libbluray-0.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.2.2.ebuild,v 1.2 2012/05/05 08:02:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.2.2.ebuild,v 1.3 2012/05/29 13:14:34 aballier Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="aacs java static-libs utils +xml"
COMMON_DEPEND="
diff --git a/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild b/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild
index 2dbd0590e47d..40481a16cff2 100644
--- a/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild,v 1.1 2011/11/04 12:09:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-0.2.2.ebuild,v 1.2 2012/05/29 13:22:55 aballier Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc static-libs"
RDEPEND=""
diff --git a/media-libs/libmatroska/libmatroska-1.3.0.ebuild b/media-libs/libmatroska/libmatroska-1.3.0.ebuild
index 6fab24d93a84..f18431491a13 100644
--- a/media-libs/libmatroska/libmatroska-1.3.0.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-1.3.0.ebuild,v 1.1 2011/09/26 00:33:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmatroska/libmatroska-1.3.0.ebuild,v 1.2 2012/05/29 13:34:51 aballier Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
RESTRICT="test"
diff --git a/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild b/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
index 29108304b07e..48b9ab64d0cf 100644
--- a/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.6 2012/05/08 07:26:38 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.0.1-r1.ebuild,v 1.7 2012/05/29 14:10:14 aballier Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug openmp video_cards_nvidia"
RDEPEND=">=media-libs/ftgl-2.1.3_rc5
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.8.ebuild
index a55eee27ded2..451015c06352 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.8.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.8.ebuild,v 1.2 2012/05/05 08:02:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.8.ebuild,v 1.3 2012/05/29 13:29:27 aballier Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="sndfile static-libs"
RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild
index fd748513169a..7efbbc98df8e 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild,v 1.1 2012/05/16 02:37:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1-r3.ebuild,v 1.2 2012/05/29 13:53:10 aballier Exp $
EAPI=4
inherit eutils libtool
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
S=${WORKDIR}/${MY_P}
diff --git a/media-libs/sdl-image/sdl-image-1.2.12.ebuild b/media-libs/sdl-image/sdl-image-1.2.12.ebuild
index 3254b61e3c2d..b1f2e7d1f69e 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.12.ebuild,v 1.8 2012/04/01 11:11:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.12.ebuild,v 1.9 2012/05/29 13:38:45 aballier Exp $
EAPI=2
MY_P="${P/sdl-/SDL_}"
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="gif jpeg png static-libs tiff webp"
DEPEND="sys-libs/zlib
diff --git a/media-libs/zvbi/zvbi-0.2.33.ebuild b/media-libs/zvbi/zvbi-0.2.33.ebuild
index 22512757c6e3..4bfdc68405ca 100644
--- a/media-libs/zvbi/zvbi-0.2.33.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.12 2012/04/22 14:44:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/zvbi/zvbi-0.2.33.ebuild,v 1.13 2012/05/29 13:44:22 aballier Exp $
EAPI=2
inherit eutils libtool
@@ -11,7 +11,7 @@ HOMEPAGE="http://zapping.sourceforge.net"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc dvb nls static-libs v4l X"
RDEPEND=">=media-libs/libpng-1.4
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index d704b03c5e28..c56779610af9 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,7 +1,5 @@
DIST abcm2ps-5.9.24.tar.gz 254329 RMD160 26695fabb540b17bd2dee86ba18c7fa3baa11e8b SHA1 7261ea8d2442a63897f97882e788c2d2404cd8c9 SHA256 008f8cde72c09ddd1c6a61d0b1f86d0733f35b76c94b7ceaeff97d02e8bcc53f
-DIST abcm2ps-6.6.7.tar.gz 295852 RMD160 e1374d63e3257b2e82760d49b5dd0b89511d89e8 SHA1 b21ce7a6d3938c8f805e2fbae37f70437622a908 SHA256 25cf827cc3861255eaef67c74bdbfb47d14b2e52fd9b5c0277773dd83050ecc2
-DIST abcm2ps-6.6.8.tar.gz 295931 RMD160 a3160c4f8a33beb6bb2c4878dfb8a877e6023da8 SHA1 1c34cf25b9e8459afbcf5dd5e1a67dfb122a925e SHA256 747661e847fa1d7c2e18c6d4d10202e03597ccdb171f8ad94fab4d76cbc6993f
+DIST abcm2ps-6.6.15.tar.gz 296768 RMD160 87eb59c91c445527d32616a44b3d40eeff35ed37 SHA1 9bf0a388faf4d25446aa83faa05ef287dab1d2b1 SHA256 9eb34104e5d0f69bbef682733570401fa2737b8cb584569d2666e34c95760bcc
DIST abcm2ps-6.6.9.tar.gz 296114 RMD160 1758c04816c093f2d43202dfcee007a3c033044d SHA1 415d8d8e9233fc04a0ebdc6944b6fad611ba311b SHA256 fdc0990a1462059062209dde60590b9669dfefc532e2b9b8e7b8e17ee6eb91dd
-DIST abcm2ps-7.0.3.tar.gz 297636 RMD160 6b9aaadb1988c37eb2af8991f91ef83ea59223db SHA1 39fdb3b251ffcd2ed020697db6466ef690a181c0 SHA256 49f56598cc749c35c4c80a5776facd5d542c4cf059c92378b0667c29fd0b314b
-DIST abcm2ps-7.0.4.tar.gz 298668 RMD160 860d0ac2756dca796ee252b569f34085f403ffcf SHA1 86d5859f8452fc0f4161241be6be5f88ab469856 SHA256 d812420fdd984c562e6787b04ecff3ae479824c8dc17d7b87050fcca9ada6e1c
+DIST abcm2ps-7.0.10.tar.gz 301047 RMD160 814f43b335aa21d46f44b11b74550b96c28ffa7e SHA1 618aabb2a6eac18cfe53eb578bab7dc6eca153aa SHA256 d1a79c52b48171c23915f700ab7351f67fa3a68a1e8b70672956a96b24f02a92
DIST transpose_abc.pl 21045 RMD160 3ea7c36f80249a2c6e6c03eca0d9d58c054e2cfc SHA1 82a852ae790d6f379d48e4f3acc5aeba0236e575 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848
diff --git a/media-sound/abcm2ps/abcm2ps-6.6.7.ebuild b/media-sound/abcm2ps/abcm2ps-6.6.15.ebuild
similarity index 94%
rename from media-sound/abcm2ps/abcm2ps-6.6.7.ebuild
rename to media-sound/abcm2ps/abcm2ps-6.6.15.ebuild
index b10e4617423c..89983ecfd3b8 100644
--- a/media-sound/abcm2ps/abcm2ps-6.6.7.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-6.6.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.6.7.ebuild,v 1.2 2012/05/05 08:05:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.6.15.ebuild,v 1.1 2012/05/29 12:29:27 radhermit Exp $
EAPI=4
diff --git a/media-sound/abcm2ps/abcm2ps-6.6.8.ebuild b/media-sound/abcm2ps/abcm2ps-6.6.8.ebuild
deleted file mode 100644
index 73418d654476..000000000000
--- a/media-sound/abcm2ps/abcm2ps-6.6.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.6.8.ebuild,v 1.2 2012/05/05 08:05:41 mgorny Exp $
-
-EAPI=4
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
- http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- --enable-a4 \
- --enable-deco-is-roll \
- $(use_enable pango)
-}
-
-src_install() {
- dobin abcm2ps
-
- insinto /usr/share/${PN}
- doins *.fmt
-
- dodoc Changes README *.txt
-
- if use examples ; then
- docinto examples
- dodoc *.{abc,eps}
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- docinto contrib
- dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-7.0.3.ebuild b/media-sound/abcm2ps/abcm2ps-7.0.10.ebuild
similarity index 94%
rename from media-sound/abcm2ps/abcm2ps-7.0.3.ebuild
rename to media-sound/abcm2ps/abcm2ps-7.0.10.ebuild
index 01ca8d8bbd1d..965111a732f5 100644
--- a/media-sound/abcm2ps/abcm2ps-7.0.3.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-7.0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-7.0.3.ebuild,v 1.2 2012/05/05 08:05:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-7.0.10.ebuild,v 1.1 2012/05/29 12:30:56 radhermit Exp $
EAPI=4
diff --git a/media-sound/abcm2ps/abcm2ps-7.0.4.ebuild b/media-sound/abcm2ps/abcm2ps-7.0.4.ebuild
deleted file mode 100644
index 6da239f1bd7e..000000000000
--- a/media-sound/abcm2ps/abcm2ps-7.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-7.0.4.ebuild,v 1.2 2012/05/05 08:05:41 mgorny Exp $
-
-EAPI=4
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
- http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- econf \
- --enable-a4 \
- --enable-deco-is-roll \
- $(use_enable pango)
-}
-
-src_install() {
- dobin abcm2ps
-
- insinto /usr/share/${PN}
- doins *.fmt
-
- dodoc Changes README *.txt
-
- if use examples ; then
- docinto examples
- dodoc *.{abc,eps}
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- docinto contrib
- dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 5a7a77de1180..7b6911817a66 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,4 +1,2 @@
-DIST abcMIDI-2012-03-22.zip 475769 RMD160 ad089590487e13faa65a21850b12fc8aa255956c SHA1 dd096533bf68b3bffb130fbece5147b55c323491 SHA256 5dfa1fb6585f188a9df97d0ff3ea179f8f59071f1c0803dea4b78584fd763d5e
-DIST abcMIDI-2012-03-27.zip 476099 RMD160 47bbcbb36b9b6d7501ac69e52eaf2cb374f4c5aa SHA1 f0a38e812465c0a3390752cca9f3408df214c903 SHA256 fc1019259c47112f39388cf3fe9200add1ee2e5569f839b24a5776d11646468e
-DIST abcMIDI-2012-04-03.zip 478267 RMD160 1f1e1c8c195f774e25535f264e568a57ef61384f SHA1 487df3d1ae7ae74273f299994c432c7d1040c3c6 SHA256 43b81c58ef15b22938d10d1c77c82f5d3a4af92fc8e29e78e5ebecb48a230193
DIST abcMIDI-2012-04-15.zip 478454 RMD160 1054c1fd3359f3d3501b91bcc55990b8abc05dab SHA1 071665c6269509f98bbfc586a22d1a5324318a1f SHA256 d0976c4e8f7dd8b0db213b4a6b8aa1d24886341554145d8ffbfa7a3e752e5492
+DIST abcMIDI-2012-05-29.zip 478626 RMD160 8939574a5d479f35ec8b9b28cac6533eeae70f85 SHA1 4c5cc1d4e3834b66fd7e7c91327abe17cae553a6 SHA256 df3f64c1346ba2d26858ed09fa82c40ae6e369d66b9d865931c7a128eea77988
diff --git a/media-sound/abcmidi/abcmidi-2012.03.27.ebuild b/media-sound/abcmidi/abcmidi-2012.03.27.ebuild
deleted file mode 100644
index 91897095866e..000000000000
--- a/media-sound/abcmidi/abcmidi-2012.03.27.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2012.03.27.ebuild,v 1.1 2012/03/31 02:09:51 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils versionator autotools
-
-MY_P="abcMIDI-$(replace_all_version_separators '-')"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
-SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
- rm configure makefile || die
- sed -i -e "s:-O2::" configure.ac || die
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
- if use examples ; then
- docinto examples
- dodoc samples/*.abc
- fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2012.04.03.ebuild b/media-sound/abcmidi/abcmidi-2012.04.03.ebuild
deleted file mode 100644
index 83aa4fcb48c5..000000000000
--- a/media-sound/abcmidi/abcmidi-2012.04.03.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2012.04.03.ebuild,v 1.1 2012/04/04 22:26:04 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils versionator autotools
-
-MY_P="abcMIDI-$(replace_all_version_separators '-')"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
-SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
- rm configure makefile || die
- sed -i -e "s:-O2::" configure.ac || die
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
- if use examples ; then
- docinto examples
- dodoc samples/*.abc
- fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2012.03.22.ebuild b/media-sound/abcmidi/abcmidi-2012.05.29.ebuild
similarity index 91%
rename from media-sound/abcmidi/abcmidi-2012.03.22.ebuild
rename to media-sound/abcmidi/abcmidi-2012.05.29.ebuild
index 8e656927453b..16e4484e2977 100644
--- a/media-sound/abcmidi/abcmidi-2012.03.22.ebuild
+++ b/media-sound/abcmidi/abcmidi-2012.05.29.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2012.03.22.ebuild,v 1.1 2012/03/25 07:57:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2012.05.29.ebuild,v 1.1 2012/05/29 12:34:07 radhermit Exp $
EAPI="4"
@@ -18,7 +18,7 @@ IUSE="examples"
DEPEND="app-arch/unzip"
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
src_prepare() {
epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
diff --git a/media-sound/beets/beets-1.0_beta14-r1.ebuild b/media-sound/beets/beets-1.0_beta14-r1.ebuild
new file mode 100644
index 000000000000..b0135d10cb4f
--- /dev/null
+++ b/media-sound/beets/beets-1.0_beta14-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beets/beets-1.0_beta14-r1.ebuild,v 1.1 2012/05/29 14:07:09 sochotnicky Exp $
+
+EAPI="4"
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils python
+
+MY_PV=${PV/_beta/b}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks."
+SRC_URI="http://beets.googlecode.com/files/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://beets.radbox.org/"
+
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="MIT"
+IUSE="chroma lastgenre bpd replaygain web"
+
+DEPEND="dev-lang/python[sqlite]
+ dev-python/munkres
+ dev-python/python-musicbrainz-ngs
+ dev-python/unidecode
+ media-libs/mutagen
+ chroma? ( dev-python/pyacoustid )
+ lastgenre? ( dev-python/pylast )
+ bpd? ( dev-python/bluelet )
+ replaygain? ( media-sound/rgain )
+ web? ( dev-python/flask )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ python_src_prepare
+
+ # remove plugins that do not have appropriate dependencies installed
+ for flag in lastgenre bpd web;do
+ if ! use $flag ; then
+ rm -r beetsplug/$flag* || \
+ die "Unable to remove $flag plugin"
+ sed -i "s:'beetsplug.$flag',::" setup.py || \
+ die "Unable to disable $flag plugin "
+ fi
+ done
+
+ for flag in chroma replaygain;do
+ if ! use $flag ; then
+ rm beetsplug/$flag.py || die "Unable to remove $flag plugin"
+ fi
+ done
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 8bfa2cee0a6e..4a18317ecc9e 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -19,5 +19,13 @@ Because beets is designed as a library, it can do almost anything you can imagin
If beets doesn’t do what you want yet, writing your own plugin is shockingly simple if you know a little Python.
+
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index d3036ab51b19..c2b1813267a1 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,2 +1,2 @@
-DIST Csound5.17.2.tar.gz 8777963 RMD160 79bb854e722c049afd4a2e048b2332223c2a0f97 SHA1 717233f40fe516a955b9caf2ddad3b5c85634b36 SHA256 b46c7efc23831b2c611b0f77d2222a8d0055eee094d92ac3fb7eb1aa969003bb
+DIST Csound5.17.11.tar.gz 9152189 RMD160 d2bb317fcfcde12453ea83d1b1f54421cdb36570 SHA1 750beb4daadfec63084b476ddf1581a8c64df17b SHA256 a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7
DIST Csound5.17.6.tar.gz 9132954 RMD160 8b42227b149664bb0c72713818d67018bbe428ee SHA1 ee1e999e51dc3377b9409cd43cd84ce32f3bf1c8 SHA256 d161acddb4a419fc15097e4f508b7b4e09fadb25b72906cf4f485ca9415fe6d1
diff --git a/media-sound/csound/csound-5.17.11.ebuild b/media-sound/csound/csound-5.17.11.ebuild
new file mode 100644
index 000000000000..13428f7c1978
--- /dev/null
+++ b/media-sound/csound/csound-5.17.11.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.11.ebuild,v 1.1 2012/05/29 12:02:17 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+inherit eutils multilib python java-pkg-opt-2 cmake-utils toolchain-funcs versionator
+
+MY_PN="${PN/c/C}"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
++image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
+python samples static-libs stk tcl test +threads +utils vim-syntax"
+
+LANGS=" de en_GB en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND=">=media-libs/libsndfile-1.0.16
+ alsa? ( media-libs/alsa-lib )
+ csoundac? ( x11-libs/fltk:1[threads?]
+ dev-cpp/eigen:3
+ dev-libs/boost
+ =dev-lang/python-2* )
+ dssi? ( media-libs/dssi
+ media-libs/ladspa-sdk )
+ fluidsynth? ( media-sound/fluidsynth )
+ fltk? ( x11-libs/fltk:1[threads?] )
+ image? ( media-libs/libpng )
+ jack? ( media-sound/jack-audio-connection-kit )
+ java? ( >=virtual/jdk-1.5 )
+ keyboard? ( x11-libs/fltk:1[threads?] )
+ linear? ( sci-mathematics/gmm )
+ lua? (
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( dev-lang/lua )
+ )
+ osc? ( media-libs/liblo )
+ portaudio? ( media-libs/portaudio )
+ portmidi? ( media-libs/portmidi )
+ pulseaudio? ( media-sound/pulseaudio )
+ stk? ( media-libs/stk )
+ tcl? ( >=dev-lang/tcl-8.5
+ >=dev-lang/tk-8.5 )
+ utils? ( !media-sound/snd )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ chua? ( dev-libs/boost )
+ csoundac? ( dev-lang/swig )
+ nls? ( sys-devel/gettext )
+ test? ( =dev-lang/python-2* )"
+
+REQUIRED_USE="java? ( cxx )
+ linear? ( double-precision )
+ lua? ( cxx )
+ python? ( cxx )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ if use python || use test ; then
+ python_set_active_version 2
+ fi
+ use python && python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
+ epatch "${FILESDIR}"/${PN}-5.17.6-fltk.patch
+ epatch "${FILESDIR}"/${PN}-5.17.6-porttime-in-portmidi.patch
+ epatch "${FILESDIR}"/${P}-cmake.patch
+
+ sed -i -e "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \
+ tests/test.py || die
+
+ sed -i -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' CMakeLists.txt || die
+
+ if [[ $(get_libdir) == "lib64" ]] ; then
+ sed -i -e '/set(LIBRARY_INSTALL_DIR/s/lib/lib64/' CMakeLists.txt || die
+ fi
+
+ if use python ; then
+ sed -i -e "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local myconf
+
+ if use csoundac ; then
+ myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+ myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_NEW_PARSER=ON
+ $(cmake-utils_use_use alsa ALSA) \
+ $(cmake-utils_use_build beats CSBEATS) \
+ $(cmake-utils_use_build chua CHUA_OPCODES) \
+ $(cmake-utils_use_build csoundac CSOUND_AC) \
+ $(cmake-utils_use_build cxx CXX_INTERFACE) \
+ $(cmake-utils_use debug NEW_PARSER_DEBUG) \
+ $(cmake-utils_use_use double-precision DOUBLE) \
+ $(cmake-utils_use_build dssi DSSI_OPCODES) \
+ $(cmake-utils_use_build fluidsynth FLUID_OPCODES) \
+ $(cmake-utils_use_use fltk FLTK) \
+ $(cmake-utils_use_build image IMAGE_OPCODES) \
+ $(cmake-utils_use_use jack JACK) \
+ $(cmake-utils_use_build jack JACK_OPCODES) \
+ $(cmake-utils_use_build java JAVA_INTERFACE) \
+ $(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD) \
+ $(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES) \
+ $(cmake-utils_use_build lua LUA_OPCODES) \
+ $(cmake-utils_use_build lua LUA_INTERFACE) \
+ $(cmake-utils_use_use nls GETTEXT) \
+ $(cmake-utils_use_build osc OSC_OPCODES) \
+ $(cmake-utils_use_use openmp OPEN_MP) \
+ $(cmake-utils_use_use portaudio PORTAUDIO) \
+ $(cmake-utils_use_use portmidi PORTMIDI) \
+ $(cmake-utils_use_use pulseaudio PULSEAUDIO) \
+ $(cmake-utils_use_build python PYTHON_OPCODES) \
+ $(cmake-utils_use_build python PYTHON_INTERFACE) \
+ $(cmake-utils_use_build static-libs STATIC_LIBRARY) \
+ $(cmake-utils_use_build stk STK_OPCODES) \
+ $(cmake-utils_use_build tcl TCLCSOUND) \
+ $(cmake-utils_use_build threads MULTI_CORE) \
+ $(cmake-utils_use_build utils UTILITIES) \
+ ${myconf}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${S}" OPCODEDIR="${S}" OPCODEDIR64="${S}"
+ cd tests
+ ./test.py || die "tests failed"
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ dodoc AUTHORS ChangeLog readme-csound5-complete.txt
+
+ # Generate env.d file
+ if use double-precision ; then
+ echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+ else
+ echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+ fi
+ echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+ use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+ doenvd "${T}"/62${PN}
+
+ if use examples ; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ use samples && dodoc -r samples
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins installer/misc/vim/csound_{csd,orc,sco}.vim
+ insinto /usr/share/vim/vimfiles/plugin
+ doins installer/misc/vim/csound.vim
+ fi
+}
diff --git a/media-sound/csound/csound-5.17.2-r1.ebuild b/media-sound/csound/csound-5.17.2-r1.ebuild
deleted file mode 100644
index bb78e8a4ba81..000000000000
--- a/media-sound/csound/csound-5.17.2-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.2-r1.ebuild,v 1.1 2012/04/11 22:32:10 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-
-inherit eutils multilib python java-pkg-opt-2 scons-utils toolchain-funcs versionator
-
-MY_PN="${PN/c/C}"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
-HOMEPAGE="http://csounds.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
-+image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
-python samples static-libs stk tcl test +threads +utils vim-syntax vst"
-
-LANGS=" de en_GB en_US es_CO fr it ro ru"
-IUSE+="${LANGS// / linguas_}"
-
-RDEPEND=">=media-libs/libsndfile-1.0.16
- alsa? ( media-libs/alsa-lib )
- csoundac? ( x11-libs/fltk:1[threads?]
- dev-libs/boost
- =dev-lang/python-2* )
- dssi? ( media-libs/dssi
- media-libs/ladspa-sdk )
- fluidsynth? ( media-sound/fluidsynth )
- fltk? ( x11-libs/fltk:1[threads?] )
- image? ( media-libs/libpng )
- jack? ( media-sound/jack-audio-connection-kit )
- java? ( >=virtual/jdk-1.5 )
- keyboard? ( x11-libs/fltk:1[threads?] )
- linear? ( sci-mathematics/gmm )
- lua? (
- luajit? ( dev-lang/luajit:2 )
- !luajit? ( dev-lang/lua )
- )
- osc? ( media-libs/liblo )
- portaudio? ( media-libs/portaudio )
- portmidi? ( media-libs/portmidi )
- pulseaudio? ( media-sound/pulseaudio )
- stk? ( media-libs/stk )
- tcl? ( >=dev-lang/tcl-8.5
- >=dev-lang/tk-8.5 )
- utils? ( !media-sound/snd )
- vst? ( x11-libs/fltk:1[threads?]
- dev-libs/boost
- =dev-lang/python-2* )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- virtual/yacc
- chua? ( dev-libs/boost )
- csoundac? ( dev-lang/swig )
- nls? ( sys-devel/gettext )
- test? ( =dev-lang/python-2* )
- vst? ( dev-lang/swig )"
-
-REQUIRED_USE="vst? ( csoundac )
- java? ( cxx )
- linear? ( double-precision )
- lua? ( cxx )
- python? ( cxx )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-scons.patch
- epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
- epatch "${FILESDIR}"/${PN}-5.16.6-install.patch
-
- cat > custom.py <<-EOF
- platform = 'linux'
- customCPPPATH = []
- customCCFLAGS = "${CFLAGS}".split()
- customCXXFLAGS = "${CXXFLAGS}".split()
- customLIBS = []
- customLIBPATH = []
- customLINKFLAGS = "${LDFLAGS}".split()
- customSHLINKFLAGS = []
- customSWIGFLAGS = []
- EOF
-}
-
-src_compile() {
- local myconf
- [[ $(get_libdir) == "lib64" ]] && myconf+=" Lib64=1"
-
- escons \
- prefix=/usr \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- buildNewParser=1 \
- pythonVersion=$(python_get_version) \
- $(use_scons alsa useALSA) \
- $(use_scons beats buildBeats) \
- $(use_scons chua buildChuaOpcodes) \
- $(use_scons csoundac buildCsoundAC) \
- $(use_scons cxx buildInterfaces) \
- $(use_scons !debug buildRelease) \
- $(use_scons !debug noDebug) \
- $(use_scons debug NewParserDebug) \
- $(use_scons double-precision useDouble) \
- $(use_scons dssi buildDSSI) \
- $(use_scons fluidsynth buildFluidOpcodes) \
- $(use_scons fltk buildCsound5GUI) \
- $(use_scons fltk useFLTK) \
- $(use_scons image buildImageOpcodes) \
- $(use_scons jack useJack) \
- $(use_scons java buildJavaWrapper) \
- $(use_scons keyboard buildVirtual) \
- $(use_scons linear buildLinearOpcodes) \
- $(use_scons lua buildLuaOpcodes) \
- $(use_scons lua buildLuaWrapper) \
- $(use_scons luajit useLuaJIT) \
- $(use_scons nls useGettext) \
- $(use_scons osc useOSC) \
- $(use_scons openmp useOpenMP) \
- $(use_scons portaudio usePortAudio) \
- $(use_scons portmidi usePortMIDI) \
- $(use_scons pulseaudio usePulseAudio) \
- $(use_scons python buildPythonOpcodes) \
- $(use_scons python buildPythonWrapper) \
- $(use_scons !static-libs dynamicCsoundLibrary) \
- $(use_scons stk buildStkOpcodes) \
- $(use_scons tcl buildTclcsound) \
- $(use_scons !threads noFLTKThreads) \
- $(use_scons threads buildMultiCore) \
- $(use_scons utils buildUtilities) \
- $(use_scons vst buildCsoundVST) \
- ${myconf}
-}
-
-src_test() {
- export LD_LIBRARY_PATH="${S}" OPCODEDIR="${S}" OPCODEDIR64="${S}"
- cd tests
- ./test.py || die "tests failed"
-}
-
-src_install() {
- local myconf
- [[ $(get_libdir) == "lib64" ]] && myconf+=" --word64"
-
- use vim-syntax && myconf+=" --vimdir=/usr/share/vim/vimfiles"
-
- ./install.py --instdir="${D}" --prefix=/usr ${myconf} || die "install failed"
- dodoc AUTHORS ChangeLog readme-csound5-complete.txt
-
- # Generate env.d file
- if use double-precision ; then
- echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
- else
- echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
- fi
- echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
- use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
- doenvd "${T}"/62${PN}
-
- if use nls ; then
- insinto /usr/share/locale
- for lang in ${LANGS} ; do
- use linguas_${lang} && doins -r po/${lang}
- done
- fi
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- use samples && dodoc -r samples
-}
diff --git a/media-sound/csound/csound-5.17.6.ebuild b/media-sound/csound/csound-5.17.6-r1.ebuild
similarity index 89%
rename from media-sound/csound/csound-5.17.6.ebuild
rename to media-sound/csound/csound-5.17.6-r1.ebuild
index 7239e66ddd3b..07d787f28dff 100644
--- a/media-sound/csound/csound-5.17.6.ebuild
+++ b/media-sound/csound/csound-5.17.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.6.ebuild,v 1.2 2012/04/16 19:16:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.6-r1.ebuild,v 1.1 2012/05/29 12:10:21 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -19,7 +19,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
+image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
-python samples static-libs stk tcl test +threads +utils vim-syntax vst"
+python samples static-libs stk tcl test +threads +utils vim-syntax"
LANGS=" de en_GB en_US es_CO fr it ro ru"
IUSE+="${LANGS// / linguas_}"
@@ -49,39 +49,37 @@ RDEPEND=">=media-libs/libsndfile-1.0.16
stk? ( media-libs/stk )
tcl? ( >=dev-lang/tcl-8.5
>=dev-lang/tk-8.5 )
- utils? ( !media-sound/snd )
- vst? ( x11-libs/fltk:1[threads?]
- dev-libs/boost
- =dev-lang/python-2* )"
+ utils? ( !media-sound/snd )"
DEPEND="${RDEPEND}
sys-devel/flex
virtual/yacc
chua? ( dev-libs/boost )
csoundac? ( dev-lang/swig )
nls? ( sys-devel/gettext )
- test? ( =dev-lang/python-2* )
- vst? ( dev-lang/swig )"
+ test? ( =dev-lang/python-2* )"
-REQUIRED_USE="vst? ( csoundac )
- java? ( cxx )
+REQUIRED_USE="java? ( cxx )
linear? ( double-precision )
lua? ( cxx )
python? ( cxx )"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
pkg_setup() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible compiler"
fi
- python_set_active_version 2
- python_pkg_setup
+ if use python || use test ; then
+ python_set_active_version 2
+ fi
+ use python && python_pkg_setup
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
epatch "${FILESDIR}"/${P}-fltk.patch
+ epatch "${FILESDIR}"/${P}-porttime-in-portmidi.patch
sed -i -e "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \
tests/test.py || die
@@ -91,14 +89,18 @@ src_prepare() {
if [[ $(get_libdir) == "lib64" ]] ; then
sed -i -e '/set(LIBRARY_INSTALL_DIR/s/lib/lib64/' CMakeLists.txt || die
fi
+
+ if use python ; then
+ sed -i -e "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
+ fi
}
src_configure() {
local myconf
if use csoundac ; then
- use python && myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=ON"
- use lua && myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=ON"
+ myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+ myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
fi
local mycmakeargs=(
diff --git a/media-sound/csound/files/csound-5.16.6-install.patch b/media-sound/csound/files/csound-5.16.6-install.patch
deleted file mode 100644
index e715f58dedd7..000000000000
--- a/media-sound/csound/files/csound-5.16.6-install.patch
+++ /dev/null
@@ -1,222 +0,0 @@
---- Csound5.16.6/install.py
-+++ Csound5.16.6/install.py
-@@ -29,8 +29,6 @@
-
- exeFiles2 = ['brkpt', 'linseg', 'tabdes']
-
--docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound5.txt']
--
- # -----------------------------------------------------------------------------
-
- print 'Csound5 Linux installer by Istvan Varga'
-@@ -115,6 +113,8 @@
- javaDir = concatPath([libDir, '/csound/java'])
- # LISP interface
- lispDir = concatPath([libDir, '/csound/lisp'])
-+# luaCsnd.so
-+luaDir = concatPath([libDir, '/csound/lua'])
- # STK raw wave files
- rawWaveDir = concatPath([prefix, '/share/csound/rawwaves'])
-
-@@ -214,37 +214,12 @@
- if findFiles('.', 'libcsound64\\.so\\..+').__len__() > 0:
- useDouble = 1
-
--# check for an already existing installation
--
--makeDir(concatPath([binDir]))
--installedBinaries = findFiles(concatPath([instDir, binDir]), '.+')
--if ('csound' in installedBinaries) or ('csound64' in installedBinaries):
-- if 'uninstall-csound5' in installedBinaries:
-- print ' *** WARNING: found an already existing installation of Csound'
-- tmp = ''
-- while (tmp != 'yes\n') and (tmp != 'no\n'):
-- sys.__stderr__.write(
-- ' *** Uninstall it ? Type \'yes\', or \'no\' to quit: ')
-- tmp = sys.__stdin__.readline()
-- if tmp != 'yes\n':
-- print ' *** Csound installation has been aborted'
-- print ''
-- raise SystemExit(1)
-- print ' --- Removing old Csound installation...'
-- runCmd([concatPath([instDir, binDir, 'uninstall-csound5'])])
-- print ''
-- else:
-- print ' *** Error: an already existing installation of Csound was found'
-- print ' *** Try removing it first, and then run this script again'
-- print ''
-- raise SystemExit(1)
--
- # copy binaries
-
- print ' === Installing executables ==='
- for i in exeFiles1:
- if findFiles('.', i).__len__() > 0:
-- err = installXFile('--strip-unneeded', i, binDir)
-+ err = installXFile('', i, binDir)
- installErrors = installErrors or err
- for i in exeFiles2:
- if findFiles('.', i).__len__() > 0:
-@@ -265,7 +240,7 @@
- if i[-2:] == '.a':
- err = installFile(i, libDir)
- else:
-- err = installXFile('--strip-debug', i, libDir)
-+ err = installXFile('', i, libDir)
- if err == 0:
- if i[:13] == 'libcsound.so.':
- err = installLink(i, concatPath([libDir, 'libcsound.so']))
-@@ -292,11 +267,26 @@
- if i in pluginList:
- pluginList.remove(i)
- for i in pluginList:
-- err = installXFile('--strip-unneeded', i, pluginDir)
-+ err = installXFile('', i, pluginDir)
- installErrors = installErrors or err
-
- # copy header files
-
-+# Add forgotten header dependencies
-+headerdeps = []
-+for header in headerFiles:
-+ f = open(header)
-+ for line in f:
-+ m = re.findall('^#include "\w+.\w+"', line)
-+ if m:
-+ n = re.match('^#include "(.+)"', "".join(m))
-+ if os.path.isfile("H/" + n.group(1)):
-+ headerdeps.append("H/" + n.group(1))
-+ else:
-+ headerdeps.append("interfaces/" + n.group(1))
-+ f.close()
-+headerFiles = list(set(headerdeps + headerFiles))
-+
- print ' === Installing header files ==='
- err = installFiles(headerFiles, includeDir)
- installErrors = installErrors or err
-@@ -313,6 +303,7 @@
- ['_loris\\.so', '1', pythonDir2],
- ['_scoregen\\.so', '1', pythonDir2],
- ['_CsoundAC\\.so ', '1', pythonDir2],
-+ ['luaCsnd\\.so', '1', luaDir],
- ['csnd\\.jar', '0', javaDir],
- ['interfaces/csound5\\.lisp', '0', lispDir]]
- for i in wrapperList:
-@@ -322,48 +313,21 @@
- if i[1] == '0':
- err = installFile(fName, i[2])
- else:
-- err = installXFile('--strip-debug', fName, i[2])
-+ err = installXFile('', fName, i[2])
- installErrors = installErrors or err
-
--# copy XMG files
--
--print ' === Installing Localisation files ==='
--xmgList = findFiles('.', '.+\\.xmg')
--if xmgList.__len__() > 0:
-- err = installFiles(xmgList, xmgDir)
-- installErrors = installErrors or err
--else:
-- xmgList = ['de', 'en_GB','en_US', 'es_CO', 'fr', 'it','ro']
-- for i in xmgList:
-- makeDir(concatPath([xmgDir, i, 'LC_MESSAGES']))
-- src = 'po/' + i + '/LC_MESSAGES/csound5.mo'
-- fileName = concatPath([instDir, xmgDir, i, 'LC_MESSAGES/csound5.mo'])
-- err = runCmd(['install', '-p', '-m', '0644', src, fileName])
-- if err == 0:
-- addMD5(fileName, fileName)
-- print ' %s' % fileName
-- else:
-- print ' *** error copying %s' % fileName
-- installErrors = installErrors or err
--
--# Copy documentation
--
--print ' === Installing documentation ==='
--err = installFiles(docFiles, docDir)
--installErrors = installErrors or err
--
- # copy Tcl/Tk files
-
- print ' === Installing Tcl/Tk modules and scripts ==='
- if findFiles('.', 'tclcsound\\.so').__len__() > 0:
-- err = installXFile('--strip-unneeded', 'tclcsound.so', tclDir)
-+ err = installXFile('', 'tclcsound.so', tclDir)
- installErrors = installErrors or err
- err = installFile('frontends/tclcsound/command_summary.txt', tclDir)
- installErrors = installErrors or err
--err = installFile('nsliders.tk', tclDir)
--installErrors = installErrors or err
--err = installXFile('', 'matrix.tk', binDir)
--installErrors = installErrors or err
-+ err = installFile('nsliders.tk', tclDir)
-+ installErrors = installErrors or err
-+ err = installXFile('', 'matrix.tk', binDir)
-+ installErrors = installErrors or err
-
- # copy STK raw wave files
-
-@@ -398,7 +362,7 @@
- pdDir = ''
- if pdDir != '':
- print ' === Installing csoundapi~ PD object ==='
-- err = installXFile('--strip-unneeded', 'csoundapi~.pd_linux', pdDir)
-+ err = installXFile('', 'csoundapi~.pd_linux', pdDir)
- if err == 0:
- try:
- os.chmod(concatPath([instDir, pdDir, 'csoundapi~.pd_linux']), 0644)
-@@ -420,42 +384,6 @@
- '%s/%s' % (vimDir, 'syntax'))
- installErrors = installErrors or err
-
--# create uninstall script
--
--print ' === Installing uninstall script ==='
--fileList += [concatPath([prefix, md5Name])]
--fileList += [concatPath([binDir, 'uninstall-csound5'])]
--try:
-- f = open(concatPath([instDir, binDir, 'uninstall-csound5']), 'w')
-- print >> f, '#!/bin/sh'
-- print >> f, ''
-- for i in fileList:
-- print >> f, 'rm -f "%s"' % i
-- print >> f, ''
-- print >> f, '/sbin/ldconfig > /dev/null 2> /dev/null'
-- print >> f, ''
-- f.close()
-- os.chmod(concatPath([instDir, binDir, 'uninstall-csound5']), 0755)
-- addMD5(concatPath([instDir, binDir, 'uninstall-csound5']),
-- concatPath([binDir, 'uninstall-csound5']))
-- print ' %s' % concatPath([binDir, 'uninstall-csound5'])
--except:
-- print ' *** Error creating uninstall script'
-- installErrors = 1
--
--# save MD5 checksums
--
--print ' === Installing MD5 checksums ==='
--try:
-- f = open(concatPath([instDir, prefix, md5Name]), 'w')
-- print >> f, md5List,
-- f.close()
-- os.chmod(concatPath([instDir, prefix, md5Name]), 0644)
-- print ' %s' % concatPath([prefix, md5Name])
--except:
-- print ' *** Error installing MD5 checksums'
-- installErrors = 1
--
-
- # -----------------------------------------------------------------------------
-
-@@ -481,10 +409,6 @@
- print ' CSSTRNGS=%s' % xmgDir
- if '%s/libstk.so' % pluginDir in fileList:
- print ' RAWWAVE_PATH=%s' % rawWaveDir
-- print 'Csound can be uninstalled by running %s/uninstall-csound5' % binDir
--
--if os.getuid() == 0:
-- runCmd(['/sbin/ldconfig'])
-
- print ''
-
diff --git a/media-sound/csound/files/csound-5.17.11-cmake.patch b/media-sound/csound/files/csound-5.17.11-cmake.patch
new file mode 100644
index 000000000000..388a043d57cf
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-cmake.patch
@@ -0,0 +1,10 @@
+--- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
++++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
+@@ -29,7 +29,6 @@
+ allegrowr.cpp
+ Cell.cpp
+ ChordLindenmayer.cpp
+- cmake_install.cmake
+ Composition.cpp
+ Conversions.cpp
+ Counterpoint.cpp
diff --git a/media-sound/csound/files/csound-5.17.2-scons.patch b/media-sound/csound/files/csound-5.17.2-scons.patch
deleted file mode 100644
index 3ae0e3d5689f..000000000000
--- a/media-sound/csound/files/csound-5.17.2-scons.patch
+++ /dev/null
@@ -1,277 +0,0 @@
---- Csound5.17.2/SConstruct
-+++ Csound5.17.2/SConstruct
-@@ -89,6 +89,9 @@
- commandOptions.Add('usePortMIDI',
- 'Build PortMidi plugin for real time MIDI input and output.',
- '1')
-+commandOptions.Add('usePulseAudio',
-+ 'Set to 1 to use PulseAudio for real-time audio and MIDI input and output.',
-+ '1')
- commandOptions.Add('useALSA',
- 'Set to 1 to use ALSA for real-time audio and MIDI input and output.',
- '1')
-@@ -101,6 +104,9 @@
- commandOptions.Add('noFLTKThreads',
- 'Set to 1 to disable use of a separate thread for FLTK widgets.',
- '1')
-+commandOptions.Add('useLuaJIT',
-+ 'Set to 1 to use the Just-In-Time Compiler for Lua',
-+ '1')
- commandOptions.Add('pythonVersion',
- 'Set to the Python version to be used.',
- '%d.%d' % (int(sys.hexversion) >> 24, (int(sys.hexversion) >> 16) & 255))
-@@ -180,6 +186,15 @@
- commandOptions.Add('dynamicCsoundLibrary',
- 'Build dynamic Csound library instead of libcsound.a',
- '0')
-+commandOptions.Add('buildChuaOpcodes',
-+ 'Set to 1 to build chua opcodes.',
-+ '1')
-+commandOptions.Add('buildLinearOpcodes',
-+ 'Set to 1 to build linear algebra opcodes.',
-+ '1')
-+commandOptions.Add('buildFluidOpcodes',
-+ 'Set to 1 to build Fluidsynth opcodes.',
-+ '1')
- commandOptions.Add('buildStkOpcodes',
- "Build opcodes encapsulating Perry Cook's Synthesis Toolkit in C++ instruments and effects",
- '0')
-@@ -352,6 +367,7 @@
- fileOptions.Add('customCXXFLAGS')
- fileOptions.Add('customLIBS')
- fileOptions.Add('customLIBPATH')
-+fileOptions.Add('customLINKFLAGS')
- fileOptions.Add('customSHLINKFLAGS')
- fileOptions.Add('customSWIGFLAGS')
- fileOptions.Update(commonEnvironment)
-@@ -366,6 +382,8 @@
- commonEnvironment.Prepend(LIBS = customLIBS)
- customLIBPATH = commonEnvironment['customLIBPATH']
- commonEnvironment.Prepend(LIBPATH = customLIBPATH)
-+customLINKFLAGS = commonEnvironment['customLINKFLAGS']
-+commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)
- customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
- commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
- customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
-@@ -469,14 +487,6 @@
- if commonEnvironment['buildRelease'] == '0':
- commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
-
--if commonEnvironment['Lib64'] == '1':
-- if getPlatform() == 'sunos':
-- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64'])
-- else:
-- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
--else:
-- commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
--
- if commonEnvironment['Word64'] == '1':
- if compilerSun():
- commonEnvironment.Append(CCFLAGS = ['-xcode=pic32'])
-@@ -494,10 +504,7 @@
- if getPlatform() == 'linux':
- commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
- commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
-- commonEnvironment.Append(CPPPATH = ['/usr/local/include'])
-- commonEnvironment.Append(CPPPATH = ['/usr/include'])
- commonEnvironment.Append(CPPPATH = ['/usr/include'])
-- commonEnvironment.Append(CPPPATH = ['/usr/X11R6/include'])
- commonEnvironment.Append(CCFLAGS = ["-DPIPES"])
- commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
- elif getPlatform() == 'sunos':
-@@ -559,18 +566,17 @@
-
- if getPlatform() == 'linux':
- path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-- path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
-- pythonIncludePath = [path1, path2]
-+ pythonIncludePath = [path1]
- path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion']
- path2 = '/usr/include/tk%s' % commonEnvironment['tclversion']
- tclIncludePath = [path1, path2]
- pythonLinkFlags = []
- if commonEnvironment['Lib64'] == '1':
- tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
-- pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
-+ pythonLibraryPath = ['/usr/lib64', tmp]
- else:
- tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
-- pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
-+ pythonLibraryPath = ['/usr/lib', tmp]
- pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
- elif getPlatform() == 'sunos':
- path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
-@@ -777,6 +783,7 @@
- zlibhfound = configure.CheckHeader("zlib.h", language = "C")
- midiPluginSdkFound = configure.CheckHeader("funknown.h", language = "C++")
- luaFound = configure.CheckHeader("lua.h", language = "C")
-+luajitFound = configure.CheckLibWithHeader("luajit-5.1", "luajit-2.0/lua.h", language = "C")
- #print 'LUA: %s' % (['no', 'yes'][int(luaFound)])
- swigFound = 'swig' in commonEnvironment['TOOLS']
- print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
-@@ -1452,25 +1459,31 @@
- swigflags = csoundWrapperEnvironment['SWIGFLAGS']
- print 'swigflags:', swigflags
- luaWrapper = None
-- if not (luaFound and commonEnvironment['buildLuaWrapper'] != '0'):
-+ if not ((luaFound or luajitFound) and commonEnvironment['buildLuaWrapper'] != '0'):
- print 'CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.'
- else:
- print 'CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.'
- luaWrapperEnvironment = csoundWrapperEnvironment.Clone()
- if getPlatform() != 'win32':
-- csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1'])
-+ if luajitFound and commonEnvironment['useLuaJIT'] == '1':
-+ csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/luajit-2.0'])
-+ else:
-+ csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1'])
- if getPlatform() == 'win32':
- csoundLuaInterface = luaWrapperEnvironment.SharedObject(
- 'interfaces/lua_interface.i',
- SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
- luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
-- else:
-- csoundLuaInterface = luaWrapperEnvironment.SharedObject(
-- 'interfaces/lua_interface.i',
-- SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
-- luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1'])
-- luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
-- Depends(luaWrapper, csoundLuaInterface)
-+ else:
-+ csoundLuaInterface = luaWrapperEnvironment.SharedObject(
-+ 'interfaces/lua_interface.i',
-+ SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
-+ if luajitFound and commonEnvironment['useLuaJIT'] == '1':
-+ luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1'])
-+ else:
-+ luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua'])
-+ luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
-+ Depends(luaWrapper, csoundLuaInterface)
-
- if not (javaFound and commonEnvironment['buildJavaWrapper'] != '0'):
- print 'CONFIGURATION DECISION: Not building Java wrapper to Csound C++ interface library.'
-@@ -1510,6 +1523,9 @@
- javaWrapper = javaWrapperEnvironment.Program(
- 'lib_jcsound.jnilib', javaWrapperSources)
- else:
-+ soname = 'lib_jcsound.so'
-+ soflag = [ '-Wl,-soname=%s' % soname ]
-+ javaWrapperEnvironment.Prepend(LINKFLAGS = [soflag])
- javaWrapper = javaWrapperEnvironment.SharedLibrary(
- '_jcsound', javaWrapperSources)
- #Depends(javaWrapper, csoundLibrary)
-@@ -1759,9 +1775,12 @@
- jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp'])
- makePlugin(jpluginEnvironment, 'jackTransport', 'Opcodes/jackTransport.c')
- makePlugin(jpluginEnvironment, 'jacko', 'Opcodes/jacko.cpp')
--if boostFound:
-+if commonEnvironment['buildChuaOpcodes'] == '1' and boostFound:
-+ print 'CONFIGURATION DECISION: Building chua opcodes.'
- makePlugin(pluginEnvironment, 'chua', 'Opcodes/chua/ChuaOscillator.cpp')
--if gmmFound and commonEnvironment['useDouble'] != '0':
-+else:
-+ print 'CONFIGURATION DECISION: Not building chua opcodes.'
-+if commonEnvironment['buildLinearOpcodes'] == '1' and gmmFound and commonEnvironment['useDouble'] != '0':
- makePlugin(pluginEnvironment, 'linear_algebra', 'Opcodes/linear_algebra.cpp')
- print 'CONFIGURATION DECISION: Building linear algebra opcodes.'
- else:
-@@ -1893,11 +1912,13 @@
- alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
- makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
-
--if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
-+if commonEnvironment['usePulseAudio'] == '1' and pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
- print "CONFIGURATION DECISION: Building PulseAudio plugin"
- pulseaudioEnv = pluginEnvironment.Clone()
- pulseaudioEnv.Append(LIBS = ['pulse-simple'])
- makePlugin(pulseaudioEnv, 'rtpulse', ['InOut/rtpulse.c'])
-+else:
-+ print "CONFIGURATION DECISION: Not building PulseAudio plugin."
-
- if getPlatform() == 'win32':
- winmmEnvironment = pluginEnvironment.Clone()
-@@ -1963,9 +1984,7 @@
-
- # FLUIDSYNTH OPCODES
-
--if not configure.CheckHeader("fluidsynth.h", language = "C"):
-- print "CONFIGURATION DECISION: Not building fluid opcodes."
--else:
-+if commonEnvironment['buildFluidOpcodes'] == '1' and configure.CheckHeader("fluidsynth.h", language = "C"):
- print "CONFIGURATION DECISION: Building fluid opcodes."
- fluidEnvironment = pluginEnvironment.Clone()
- if getPlatform() == 'win32':
-@@ -1981,6 +2000,8 @@
- fluidEnvironment.Append(LIBS = ['pthread'])
- makePlugin(fluidEnvironment, 'fluidOpcodes',
- ['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
-+else:
-+ print "CONFIGURATION DECISION: Not building fluid opcodes."
-
- # VST HOST OPCODES
-
-@@ -2174,7 +2195,7 @@
- if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
- Depends(pythonOpcodes, pythonImportLibrary)
-
--# Python opcodes
-+# Lua opcodes
-
- if not (commonEnvironment['buildLuaOpcodes'] != '0'):
- print "CONFIGURATION DECISION: Not building Lua opcodes."
-@@ -2183,10 +2204,13 @@
- luaEnvironment = pluginEnvironment.Clone()
-
- if getPlatform() == 'linux':
-- if(luaFound == 1):
-+ if(luajitFound == 1 and commonEnvironment['useLuaJIT'] == '1'):
- luaEnvironment.Append(LIBS = ['luajit-5.1'])
- luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
-- luaEnvironment.Append(CPPPATH = '/usr/local/include/luajit-2.0')
-+ luaEnvironment.Append(CPPPATH = '/usr/include/luajit-2.0')
-+ elif(luaFound == 1):
-+ luaEnvironment.Append(LIBS = ['lua'])
-+ luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
- elif getPlatform() == 'win32':
- if(luaFound == 1):
- luaEnvironment.Append(LIBS = ['lua51'])
-@@ -2538,21 +2562,24 @@
- Depends(csoundAcPythonModule, pythonWrapper)
- Depends(csoundAcPythonModule, csoundac)
- Depends(csoundAcPythonModule, csnd)
-- if luaFound and commonEnvironment['buildLuaWrapper'] != '0':
-- luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
-- if getPlatform() == 'win32':
-- luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
-- else:
-- luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
-- luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luajit-5.1 CsoundAC csnd fltk_images'))
-- luaCsoundACWrapper = luaCsoundACWrapperEnvironment.SharedObject(
-- 'frontends/CsoundAC/luaCsoundAC.i', SWIGFLAGS = [swigflags, Split('-lua ')])
-- luaCsoundACWrapperEnvironment.Clean('.', 'frontends/CsoundAC/luaCsoundAC_wrap.h')
-- CsoundAclModule = makeLuaModule(luaCsoundACWrapperEnvironment, 'luaCsoundAC', [luaCsoundACWrapper])
-- Depends(CsoundAclModule, luaCsoundACWrapper)
-- Depends(CsoundAclModule, luaWrapper)
-- Depends(CsoundAclModule, csoundac)
-- Depends(CsoundAclModule, csnd)
-+ if (luajitFound or luaFound) and commonEnvironment['buildLuaWrapper'] != '0':
-+ luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
-+ if getPlatform() == 'win32':
-+ luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
-+ else:
-+ luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
-+ if commonEnvironment['useLuaJIT'] == '1':
-+ luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luajit-5.1 CsoundAC csnd fltk_images'))
-+ else:
-+ luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('lua CsoundAC csnd fltk_images'))
-+ luaCsoundACWrapper = luaCsoundACWrapperEnvironment.SharedObject(
-+ 'frontends/CsoundAC/luaCsoundAC.i', SWIGFLAGS = [swigflags, Split('-lua ')])
-+ luaCsoundACWrapperEnvironment.Clean('.', 'frontends/CsoundAC/luaCsoundAC_wrap.h')
-+ CsoundAclModule = makeLuaModule(luaCsoundACWrapperEnvironment, 'luaCsoundAC', [luaCsoundACWrapper])
-+ Depends(CsoundAclModule, luaCsoundACWrapper)
-+ Depends(CsoundAclModule, luaWrapper)
-+ Depends(CsoundAclModule, csoundac)
-+ Depends(CsoundAclModule, csnd)
-
-
- # Build CsoundVST
diff --git a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
new file mode 100644
index 000000000000..3f69a3795f04
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
@@ -0,0 +1,20 @@
+--- Csound5.17.6/InOut/CMakeLists.txt
++++ Csound5.17.6/InOut/CMakeLists.txt
+@@ -26,7 +26,6 @@
+ endif()
+ if(USE_PORTMIDI)
+ find_library(PORTMIDI_LIBRARY portmidi)
+- find_library(PORTTIME_LIBRARY porttime)
+ check_include_file(portmidi.h PORTMIDI_HEADER)
+ endif()
+ if(USE_JACK)
+@@ -116,9 +115,6 @@
+ check_deps(USE_PORTMIDI PORTMIDI_HEADER PORTMIDI_LIBRARY)
+ if(USE_PORTMIDI)
+ set(pmidi_LIBS ${PORTMIDI_LIBRARY})
+- if(NOT APPLE)
+- list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})
+- endif()
+ if(WIN32)
+ list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})
+ endif()
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 539a9f1945ab..b34cf2a60132 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@@ -22,6 +22,5 @@
Build the stk opcodes
Build the tcl interface and clients
Build stand-alone executables for utilities that can also be used via `csound -U`
- Build the CsoundVST frontend