diff --git a/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild b/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
index 0fbc154760e3..40ca89d61ce5 100644
--- a/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
+++ b/app-accessibility/sphinxbase/sphinxbase-0.7.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/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.3 2012/02/24 11:29:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.4 2012/12/14 11:11:58 ulm Exp $
EAPI=3
PYTHON_DEPEND="python? 2:2.6"
@@ -13,7 +13,7 @@ DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine"
HOMEPAGE="http://cmusphinx.sourceforge.net/"
SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
-LICENSE="BSD as-is"
+LICENSE="BSD-2 HPND MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc lapack python static-libs"
diff --git a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild
index 674037a016da..80527acc07ee 100644
--- a/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild
+++ b/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.17 2012/09/30 17:39:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.0_p2-r4.ebuild,v 1.18 2012/12/14 11:05:41 ulm Exp $
inherit perl-module autotools eutils user
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P/_/}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND BSD GPL-2 GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 ~sparc x86"
RDEPEND="sys-libs/readline
diff --git a/app-backup/amanda/amanda-2.6.1_p2.ebuild b/app-backup/amanda/amanda-2.6.1_p2.ebuild
index 09d7c7cf168f..28079359d378 100644
--- a/app-backup/amanda/amanda-2.6.1_p2.ebuild
+++ b/app-backup/amanda/amanda-2.6.1_p2.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/app-backup/amanda/amanda-2.6.1_p2.ebuild,v 1.8 2012/05/24 04:36:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-2.6.1_p2.ebuild,v 1.9 2012/12/14 11:05:41 ulm Exp $
inherit autotools eutils user
@@ -8,7 +8,7 @@ MY_P="${P/_}"
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${MY_P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND BSD GPL-2 GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline
diff --git a/app-backup/amanda/amanda-3.2.1.ebuild b/app-backup/amanda/amanda-3.2.1.ebuild
index 4fd82229ee2b..4bd3305931a6 100644
--- a/app-backup/amanda/amanda-3.2.1.ebuild
+++ b/app-backup/amanda/amanda-3.2.1.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/app-backup/amanda/amanda-3.2.1.ebuild,v 1.14 2012/09/30 17:39:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.1.ebuild,v 1.15 2012/12/14 11:05:41 ulm Exp $
EAPI=3
inherit autotools eutils perl-module user
@@ -9,7 +9,7 @@ MY_P="${P/_}"
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 ~sparc x86"
RDEPEND="sys-libs/readline
diff --git a/app-backup/amanda/amanda-3.2.2.ebuild b/app-backup/amanda/amanda-3.2.2.ebuild
index c5c8fda3606e..4138883103a9 100644
--- a/app-backup/amanda/amanda-3.2.2.ebuild
+++ b/app-backup/amanda/amanda-3.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/app-backup/amanda/amanda-3.2.2.ebuild,v 1.5 2012/05/24 04:36:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.2.2.ebuild,v 1.6 2012/12/14 11:05:41 ulm Exp $
EAPI=3
inherit autotools eutils perl-module user
@@ -9,7 +9,7 @@ MY_P="${P/_}"
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline
diff --git a/app-backup/amanda/amanda-3.3.0.ebuild b/app-backup/amanda/amanda-3.3.0.ebuild
index 73768a82e2a9..b30a091a8620 100644
--- a/app-backup/amanda/amanda-3.3.0.ebuild
+++ b/app-backup/amanda/amanda-3.3.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/app-backup/amanda/amanda-3.3.0.ebuild,v 1.4 2012/05/24 04:36:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.0.ebuild,v 1.5 2012/12/14 11:05:41 ulm Exp $
EAPI=3
inherit autotools eutils perl-module user
@@ -9,7 +9,7 @@ MY_P="${P/_}"
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline
diff --git a/app-backup/amanda/amanda-3.3.1.ebuild b/app-backup/amanda/amanda-3.3.1.ebuild
index 959227e11c18..affba50b6413 100644
--- a/app-backup/amanda/amanda-3.3.1.ebuild
+++ b/app-backup/amanda/amanda-3.3.1.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/app-backup/amanda/amanda-3.3.1.ebuild,v 1.5 2012/10/01 08:30:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.1.ebuild,v 1.6 2012/12/14 11:05:41 ulm Exp $
EAPI=3
inherit autotools eutils perl-module user
@@ -9,7 +9,7 @@ MY_P="${P/_}"
DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
HOMEPAGE="http://www.amanda.org/"
SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 ~sparc x86"
RDEPEND="sys-libs/readline
diff --git a/app-dicts/aspell-en/aspell-en-0.51.0.ebuild b/app-dicts/aspell-en/aspell-en-0.51.0.ebuild
index 490dbb0a78f3..a0e8d96c8eb1 100644
--- a/app-dicts/aspell-en/aspell-en-0.51.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-0.51.0.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-0.51.0.ebuild,v 1.9 2012/05/17 19:53:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-0.51.0.ebuild,v 1.10 2012/12/14 11:57:57 ulm Exp $
ASPELL_LANG="English (US, British, Canadian)"
inherit aspell-dict
-LICENSE="as-is public-domain"
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
IUSE=""
diff --git a/app-dicts/aspell-en/aspell-en-0.51.1.ebuild b/app-dicts/aspell-en/aspell-en-0.51.1.ebuild
index 2ecaa60379ad..6f05d96fb33a 100644
--- a/app-dicts/aspell-en/aspell-en-0.51.1.ebuild
+++ b/app-dicts/aspell-en/aspell-en-0.51.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-0.51.1.ebuild,v 1.8 2012/05/17 19:53:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-0.51.1.ebuild,v 1.9 2012/12/14 11:57:57 ulm Exp $
ASPELL_LANG="English (US, British, Canadian)"
inherit aspell-dict
-LICENSE="as-is public-domain"
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
IUSE=""
diff --git a/app-dicts/aspell-en/aspell-en-6.0.0.ebuild b/app-dicts/aspell-en/aspell-en-6.0.0.ebuild
index 443f4d39c22c..3ff78a3c51e3 100644
--- a/app-dicts/aspell-en/aspell-en-6.0.0.ebuild
+++ b/app-dicts/aspell-en/aspell-en-6.0.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-6.0.0.ebuild,v 1.20 2012/05/17 19:53:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/aspell-en/aspell-en-6.0.0.ebuild,v 1.21 2012/12/14 11:57:57 ulm Exp $
ASPELL_LANG="English (US, British, Canadian)"
ASPOSTFIX="6"
inherit aspell-dict
-LICENSE="as-is public-domain"
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 447cf9429458..8720de633d14 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
+DIST calibre-0.9.10.tar.xz 27775784 SHA256 4e269320f883a17c6c6d577f7e4947dcda47e73917f297b33e402d4c9da042d9 SHA512 9c5aeb32f2910d236961ca58e8f079656f6844f2cc2d6c511a1dda561fb4b9b0247c47e5a3fd8c52472c0424ca3f3a8a8567d091f30bf412669255c7541de3fb WHIRLPOOL 2c39cfad0696075a1b3641c909cc6bf05d58742dea3fbc2fa6ad8ac2f45101e6ed8d98b14779838d7698223f8ccf3cf21720798b839516490ed1d89d81a535c3
DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
-DIST calibre-0.9.8.tar.xz 27624924 SHA256 8535ef31d8ade68399f6eae110c5929cde2ad2f27c9930648fc93e8e80379e9f SHA512 11b5049f6e8ee47c11dbf7fe03bb59bc6af3b1db27c2205127288bffbd1f4162b8a317e003c17ce12197b9d31fbf9c4a9fcb64d101bd2475b7357b19a0e58b2c WHIRLPOOL f49de7235d6f64b7c71a1cbee0499ca47c292e3ec7d5988053ba8a5e6e09de99603238b473efe5b63ed7b631cffaeeaa300628eacc0f51cb60f84c62431063b7
DIST calibre-0.9.9.tar.xz 27765504 SHA256 1fde798842c3ea22e04dbcb7e3d5e8f1a5a117e922dfd9e5ba762073feffae94 SHA512 eeaf8d4cc09933388f38b6caa2768e01a2255b8dfac9f4905b6fcda02d0d0bc4dd87553f706cff0419480c28adb02ea36b20a125ce82f90cdd853cc7afef93cd WHIRLPOOL 3cba05a9fe3ce535502b617b4cda76096685485c8c775c4f21b6264ed0bf255113a760f92711128e0708a7bc0f1e6f204784ebbff140996cf49e30d63bba40cf
diff --git a/app-text/calibre/calibre-0.9.8.ebuild b/app-text/calibre/calibre-0.9.10.ebuild
similarity index 95%
rename from app-text/calibre/calibre-0.9.8.ebuild
rename to app-text/calibre/calibre-0.9.10.ebuild
index e38147e4de20..b3ecdf428fbe 100644
--- a/app-text/calibre/calibre-0.9.8.ebuild
+++ b/app-text/calibre/calibre-0.9.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/app-text/calibre/calibre-0.9.8.ebuild,v 1.1 2012/11/30 09:10:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.10.ebuild,v 1.1 2012/12/14 18:20:44 zmedico Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
@@ -88,6 +88,12 @@ src_prepare() {
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
'-i', 'Makefile'])" \
-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+ # Disable destructive regex for Bug #446790.
+ if has_version '>=dev-python/PyQt4-4.9.6' ; then
+ sed -e "s|dat = re\.compile(r'QtGui\.QApplication\.translate\\\\(\..*|#\\0|" \
+ -i src/calibre/gui2/__init__.py || die
+ fi
}
src_install() {
diff --git a/dev-games/ogre/ogre-1.8.1.ebuild b/dev-games/ogre/ogre-1.8.1.ebuild
index 9c9ac6ec9a74..55ba0955f38a 100644
--- a/dev-games/ogre/ogre-1.8.1.ebuild
+++ b/dev-games/ogre/ogre-1.8.1.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-games/ogre/ogre-1.8.1.ebuild,v 1.2 2012/11/12 23:26:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.1.ebuild,v 1.4 2012/12/14 12:53:39 ago Exp $
EAPI=4
inherit eutils cmake-utils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip"
REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
RESTRICT="test" #139905
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
new file mode 100644
index 000000000000..5be798d85b2f
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild,v 1.1 2012/12/14 13:08:17 sera Exp $
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201002111343"
+
+DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+LICENSE="EPL-1.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+native"
+
+COMMON_DEPEND="
+ sys-devel/gcc[gcj]
+ || ( app-admin/eselect-java >=app-admin/eselect-ecj-0.6 )"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+ !dev-java/eclipse-ecj:3.5[gcj]"
+
+S="${WORKDIR}"
+
+# for compatibility with java eclass functions
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+MY_PS="${MY_PN}-${SLOT}"
+
+java_prepare() {
+ # We don't need the ant adapter here
+ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+ rm -fr org/eclipse/jdt/internal/antadapter || die
+
+ # upstream build.xml excludes this
+ rm -f META-INF/eclipse.inf || die
+
+ # these java6 specific classes cannot compile with ecj
+ rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+ local javac_opts javac java jar
+
+ local gccbin=$(gcc-config -B)
+ local gccver=$(gcc-fullversion)
+
+ local gcj="${gccbin}/gcj"
+ javac="${gcj} -C --encoding=ISO-8859-1"
+ jar="${gccbin}/gjar"
+ java="${gccbin}/gij"
+
+ mkdir -p bootstrap || die
+ cp -pPR org bootstrap || die
+ cd "${S}/bootstrap" || die
+
+ einfo "bootstrapping ${MY_PN} with ${javac} ..."
+ ${javac} ${javac_opts} $(find org/ -name '*.java') || die
+ find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+ -exec ${jar} cf ${MY_PN}.jar {} + || die
+
+ cd "${S}" || die
+
+ einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+ ${java} -classpath bootstrap/${MY_PN}.jar \
+ org.eclipse.jdt.internal.compiler.batch.Main \
+ ${javac_opts} -nowarn org || die
+ find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+ -exec ${jar} cf ${MY_PN}.jar {} + || die
+
+ if use native; then
+ einfo "Building native ${MY_PS} library, patience needed ..."
+ ${gcj} ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
+ -o ${MY_PS}.so ${MY_PN}.jar || die
+ fi
+}
+
+src_install() {
+ java-pkg_dojar ${MY_PN}.jar
+
+ sed -e "s|@SLOT@|${SLOT}|" \
+ "${FILESDIR}/${PN}.in" \
+ > "${T}"/${PN}-${SLOT} || die
+ eprefixify "${T}/${PN}-${SLOT}"
+ dobin "${T}/${PN}-${SLOT}"
+
+ use native && dolib.so ${MY_PS}.so
+}
+
+pkg_postinst() {
+ if use native; then
+ $(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
+ "${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+ "${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
+ fi
+
+ einfo "To select between slots of ECJ..."
+ einfo " # eselect ecj"
+
+ eselect ecj update ${PN}-${SLOT}
+}
+
+pkg_postrm() {
+ eselect ecj update
+}
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
new file mode 100644
index 000000000000..87ed21a476c7
--- /dev/null
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild,v 1.1 2012/12/14 13:08:17 sera Exp $
+
+EAPI=5
+
+inherit java-pkg-2 prefix toolchain-funcs
+
+MY_PN="ecj"
+DMF="R-${PV}-201006080911"
+
+DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
+
+LICENSE="EPL-1.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+native"
+
+COMMON_DEPEND="
+ sys-devel/gcc[gcj]
+ || ( app-admin/eselect-java >=app-admin/eselect-ecj-0.6 )"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+ !dev-java/eclipse-ecj:3.5[gcj]"
+
+S="${WORKDIR}"
+
+# for compatibility with java eclass functions
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+MY_PS="${MY_PN}-${SLOT}"
+
+java_prepare() {
+ # We don't need the ant adapter here
+ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+ rm -fr org/eclipse/jdt/internal/antadapter || die
+
+ # upstream build.xml excludes this
+ rm -f META-INF/eclipse.inf || die
+
+ # these java6 specific classes cannot compile with ecj
+ rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die
+}
+
+src_compile() {
+ local javac_opts javac java jar
+
+ local gccbin=$(gcc-config -B)
+ local gccver=$(gcc-fullversion)
+
+ local gcj="${gccbin}/gcj"
+ javac="${gcj} -C --encoding=ISO-8859-1"
+ jar="${gccbin}/gjar"
+ java="${gccbin}/gij"
+
+ mkdir -p bootstrap || die
+ cp -pPR org bootstrap || die
+ cd "${S}/bootstrap" || die
+
+ einfo "bootstrapping ${MY_PN} with ${javac} ..."
+ ${javac} ${javac_opts} $(find org/ -name '*.java') || die
+ find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+ -exec ${jar} cf ${MY_PN}.jar {} + || die
+
+ cd "${S}" || die
+
+ einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+ ${java} -classpath bootstrap/${MY_PN}.jar \
+ org.eclipse.jdt.internal.compiler.batch.Main \
+ ${javac_opts} -nowarn org || die
+ find org/ \( -name '*.class' -o -name '*.properties' -o -name '*.rsc' \) \
+ -exec ${jar} cf ${MY_PN}.jar {} + || die
+
+ if use native; then
+ einfo "Building native ${MY_PS} library, patience needed ..."
+ ${gcj} ${CFLAGS} ${LDFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \
+ -o ${MY_PS}.so ${MY_PN}.jar || die
+ fi
+}
+
+src_install() {
+ java-pkg_dojar ${MY_PN}.jar
+
+ sed -e "s|@SLOT@|${SLOT}|" \
+ "${FILESDIR}/${PN}.in" \
+ > "${T}"/${PN}-${SLOT} || die
+ eprefixify "${T}/${PN}-${SLOT}"
+ dobin "${T}/${PN}-${SLOT}"
+
+ use native && dolib.so ${MY_PS}.so
+}
+
+pkg_postinst() {
+ if use native; then
+ $(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
+ "${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
+ "${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
+ fi
+
+ einfo "To select between slots of ECJ..."
+ einfo " # eselect ecj"
+
+ eselect ecj update ${PN}-${SLOT}
+}
+
+pkg_postrm() {
+ eselect ecj update
+}
diff --git a/dev-java/ecj-gcj/files/ecj-gcj.in b/dev-java/ecj-gcj/files/ecj-gcj.in
new file mode 100755
index 000000000000..4f838d5de240
--- /dev/null
+++ b/dev-java/ecj-gcj/files/ecj-gcj.in
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# /usr/bin/gij was installed by gcj-jdk in the past and is now handled by
+# gcc-config, fall back to gcc-config to locate the binary should the
+# symlink/wrapper-binary not yet exists.
+GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij"
+if [[ ! -f ${GIJ_BIN} ]]; then
+ GIJ_BIN="$(gcc-config -B)/gij"
+fi
+if [[ ! -f ${GIJ_BIN} ]]; then
+ echo "gij not found! check that gcc is compiled with gcj flag"
+ exit 1
+fi
+# calling java-config would be an unnecessary slowdown here
+
+# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
+# this breaks e.g. bootstrap of ant-core
+ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-@SLOT@/lib/ecj.jar"
+if [[ -n "${CLASSPATH}" ]]; then
+ ecj_cp="${ecj_cp}:${CLASSPATH}"
+fi
+
+${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}"
diff --git a/dev-lang/mlton/mlton-20100608.ebuild b/dev-lang/mlton/mlton-20100608.ebuild
index 905e52282cd0..6c6c3f606003 100644
--- a/dev-lang/mlton/mlton-20100608.ebuild
+++ b/dev-lang/mlton/mlton-20100608.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/mlton/mlton-20100608.ebuild,v 1.1 2012/10/16 09:07:05 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20100608.ebuild,v 1.2 2012/12/14 11:09:19 ulm Exp $
inherit eutils
@@ -12,13 +12,12 @@ SRC_URI="!binary? ( ${BASE_URI}/${P}.src.tgz )
HOMEPAGE="http://www.mlton.org"
-LICENSE="as-is"
+LICENSE="HPND MIT"
SLOT="0"
# there is support for ppc64 and ia64, but no
# binaries are provided and there is no native
# code generation for these platforms
KEYWORDS="-* ~amd64 ~x86"
-
IUSE="binary doc"
DEPEND="dev-libs/gmp
diff --git a/dev-lang/php/php-5.3.18.ebuild b/dev-lang/php/php-5.3.18.ebuild
index b514a8f3406f..156a57a90857 100644
--- a/dev-lang/php/php-5.3.18.ebuild
+++ b/dev-lang/php/php-5.3.18.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/php/php-5.3.18.ebuild,v 1.4 2012/11/27 11:10:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.18.ebuild,v 1.6 2012/12/14 09:35:36 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
function php_get_uri ()
{
diff --git a/dev-lang/php/php-5.4.8.ebuild b/dev-lang/php/php-5.4.8.ebuild
index c0d7ff0e8e36..3d0b20d06d3c 100644
--- a/dev-lang/php/php-5.4.8.ebuild
+++ b/dev-lang/php/php-5.4.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/dev-lang/php/php-5.4.8.ebuild,v 1.3 2012/11/27 11:10:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.8.ebuild,v 1.5 2012/12/14 09:36:31 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
FPM_VERSION="builtin"
EXPECTED_TEST_FAILURES=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~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-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 063afcfd4c25..779a63717827 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,11 +2,13 @@ DIST pl-6.2.0.tar.gz 14353730 SHA256 be358eacd50bc7013cdcdd1aa763e67c5b1d40f7bbf
DIST pl-6.2.1.tar.gz 14349946 SHA256 c5ceac0a23e6a2ab706a10987cb87a0cfe4e5c3d01600f6c5e178846310ea7e8 SHA512 090294477b319d761f0bad0c4fa11b3c16ed8377167b0eba4391f7498068d2c75cee10bc8c40e87c928ec701c5ffcb5cf6aa0f9e483dcef93d6e46997b52b611 WHIRLPOOL 65246d63243383f3e97c5dabf593a678a21d70e7afef86b9a65f51c1dd2eade2f610894d8aa261e05dd27ac7805bc50c933c91f2a41cb4544507da362bbaf0d8
DIST pl-6.2.2.tar.gz 14353692 SHA256 e2d5a62756ea0001f65a2411dfe7d380e1d2ab7b365fe12bc6e110d966fe43dd SHA512 fad8bd48ef496258b86527e9764c748b25a83c25dcc7aa4921fcc78df730e7c442a8c3524356b36f2cb92cdb71a116475f7039e4c829c7f41fc6994ce0fa636e WHIRLPOOL f133afa09055d506e4fbf8e3214b5f290b890a7c42e6bb046d97318fbc8f961be33d788a79076597b4434974d7444bf67ba193829faebe2c768ff13c2ed7801e
DIST pl-6.2.3.tar.gz 14349678 SHA256 4421251d6ff74a410b5c42cd31d688cbfe80043bcc719f71d13bd57ecc2483f4 SHA512 a22f00652431fb32516dadcd92180971319002276642f520003dc1fce6b8962e0fdae282d75da06232b2440f4214bd4a1c4fca5c9a9ea9582fa55ace065c8dd7 WHIRLPOOL ac2e387a16a5741db55cdc168d25ab44814b61f0374de3a662e98acad72f9a798f8028f1ba8d49e2a544a8bd883c4af3126ff8f606ffd49cfefdaa79d6b8fc64
+DIST pl-6.2.4.tar.gz 14388523 SHA256 0e4a72c07c686b7e826a29b1da40d6c4a8e7249715d5a6b15c7a13d4ad68f95b SHA512 5db8cb6ae7d20bec0f5befff25718f4ad721d5b871236080640d1d8eb20140b85fb79351eff2b6a71278722dd09507ff29f43d2b63ff1d7d780ce17386d2063f WHIRLPOOL 5e019a20d4ce413d30c12fc38d61a4382592cc6ef7c1758437c189bdbaea27c4ed3f54267c939135f83f3982cfec622302342df3fb395304cba5cdd4bcf1f9a3
DIST pl-6.3.3.tar.gz 14467750 SHA256 6ea09e5a07eb80f6eee49282ed669f9ef89a86443b58061677345e17675041d1 SHA512 5664fb7bbad3cceb430387542f11fbd394fc088738cec69510f192ab6df2052a99f0a57d4bdaa21d0e01259ab83d122cbf4ca1343d30e3cd1f43833254c60d2e WHIRLPOOL 98240880a50e3a318f06ad8cecb153acaf3b20c84e180039188f628ffe5f701285043da6dc41ca7cccdf099a932758fa7e85c0b996c542d16fb40b669f2a53ce
DIST pl-6.3.4.tar.gz 14470255 SHA256 fb660fe0c117b7c8f144fcb27ace47c6955533abe8728b21e06761685f7fb79d SHA512 1268d47e13f3f87acdc1cb5307a1141e7847f8db05460646027b0b3febebc3d9422f6a09aee3f259f3fd8d3cb46467b8aa6eaf84fb1e3c04911bfc73fc579f2c WHIRLPOOL a137cfa1ed044b6dbda1c3382092273813fa0ff299d16908bd5b730a592971f0940aca4a3c2877aae90d2ea4cf7793e04892ba94f7b287ba04e2ef86c2f94e7b
DIST swi-prolog-6.2.0-gentoo-patchset-5.tar.gz 5340 SHA256 94d1ca1c17bba09c00e8d29bf599598574667f2093996651a357eb168e5a3f7a SHA512 2a7bc9998c117a9e509f1bab73898f668922225af97f31a2569f689b89edba6776f6117f32e7023db22354e4fedefb557e7603be31fc5a696f939d271f1aebf2 WHIRLPOOL 5e05b315ff8914eb54ec4b91ce455c98604ae7b514acbafea9f72d70fcb6f68a77579e03a3b292a57c0f8dfe0d3cb6d07fe5fb9b29cdcbd051919dffc5fd5904
DIST swi-prolog-6.2.1-gentoo-patchset-4.tar.gz 4765 SHA256 2d08ec0f5d74794c8d9df48cff8cccce17fd427fa25fc14472aecb40dfc34481 SHA512 46d7af77b78bab4873b3c2456d65337cf051b5b015d6421c62024df9707265a140809ed843eac0e13e38122366bb5b433a626b340075f6b4e906df46a8abd819 WHIRLPOOL 84d1fc399ee945a9ea06a164b2dae9f4b57df4794b9da4eb84294435e5f8f5d091be8e8ce03b03a720d48a9d3554fdb01d3769842cff68d09a16a71170ae9c33
DIST swi-prolog-6.2.2-gentoo-patchset-0.tar.gz 4303 SHA256 824dd784cf3b7e1b45b65e6a923289de6e6e28d3cf0b797e071e4185f2c05f9f SHA512 5c9c579971172e7300c01120bb70c273ea37a9f962d9ede3d0e7bd45dba6441b7f3244b568643bc6f16b8eabd3099b4cbee25f5be17ac4cebe54c06547cf530f WHIRLPOOL db8349096acd6341de46465ee7c914d19087227fb31064cf3bc21593f2c25660bff2d7d7080e78dff92508bb29dde4da0248ce8b290809aa8543882c82cd0638
DIST swi-prolog-6.2.3-gentoo-patchset-0.tar.gz 3737 SHA256 1254555d3c1927ffeca05b619f18ad7d48f27bdac33709996823fa4561e50983 SHA512 22feeb13ff09c3f1024ab395cc152943b1ee473c3faeda78f3868446dbf754fb30606d055911eabacb875b1e0c74ca421faf3382199882c7686f1d0d7c509aea WHIRLPOOL d0cd6c77c54fa0aac27c6f427839131f35beae07d3108351a998b362ff31f2aff98c3740c5c46b97213f98ed7fa01a8ee8ec6b17f14c44730673eb4870a3947a
+DIST swi-prolog-6.2.4-gentoo-patchset-0.tar.gz 2485 SHA256 3c18285a9867380e154443515a63e25c8cd16715ce2ac65c520c4e58145b1195 SHA512 5f0ef5a41fd524511cfa25b9165aff6ed768d44b640ae3f9670ee738d42b3bbe1ddd30bdc0d598f28b195dc8061383c580e98d2c89ab485a596290f8e2950cae WHIRLPOOL 4de88a9d70e85625a4d4b8311c1bface0b01449efc5df4488241577e6a279aceb200db95f2c52f1d83aa3cf1c1f2c0437b27d076a4ecabce576f68920b104157
DIST swi-prolog-6.3.3-gentoo-patchset-0.tar.gz 2732 SHA256 a1d1af6730cb0edb217e2705b1253ea44b5704e69b95230934cafbc2a4cc488f SHA512 c2e9aa945220dc4a0945639665ed041e694cb0940d9df3e19505a267bd1f2c135e001c5e7745cfb96e3ed462aa7837fad4079cd26dc44fe92c9e6de774f53186 WHIRLPOOL 48f1f848e39e7d5084b3e7b5ca411df72808ac44303ba192bb2da09dd96e66fe60c900e9cb4088e3eeb5f8cede0829f332682e07f53af6fc484731365cabddda
DIST swi-prolog-6.3.4-gentoo-patchset-0.tar.gz 2708 SHA256 8e589b63503355cd64746a38f95ea921791d6eea437d4d84ded3efd079408ccd SHA512 118d5fb931c1d499e57ee63977a7747a835e8a8329fa65b823c21a02661e117be8a7b611420ac4469292d390c2eecf4d0613c6f4286b2d87f03d4ec0a15053c0 WHIRLPOOL c171f1f35ddf2274e6925ac6f90de908ae3929bfbceacd31524821c1b2dc47cf5875cb3d5c0190de09bc79d5e9a9ade53135f2c48cc6ecc9b713ac15a0bf5ef0
diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.4.ebuild b/dev-lang/swi-prolog/swi-prolog-6.2.4.ebuild
new file mode 100644
index 000000000000..c66601444132
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.4.ebuild,v 1.1 2012/12/14 15:40:55 keri Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X"
+
+RDEPEND="sys-libs/ncurses
+ archive? ( app-arch/libarchive )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ readline? ( sys-libs/readline )
+ gmp? ( dev-libs/gmp )
+ ssl? ( dev-libs/openssl )
+ java? ( >=virtual/jdk-1.4 )
+ X? (
+ virtual/jpeg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/pl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ epatch "${WORKDIR}"/${PV}
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ cd "${S}"/src
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable readline) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS}"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages"
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ --with-chr \
+ --with-clib \
+ --with-clpqr \
+ --with-cpp \
+ --with-http \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ --with-nlp \
+ $(use_with odbc) \
+ --with-PDT \
+ --with-pldoc \
+ --with-plunit \
+ --with-protobufs \
+ --with-R \
+ --with-RDF \
+ --with-semweb \
+ --with-sgml \
+ $(use_with ssl) \
+ --with-table \
+ --with-tipc \
+ --with-utf8proc \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages"
+ emake
+ fi
+}
+
+src_test() {
+ cd "${S}/src"
+ emake check
+
+ if ! use minimal ; then
+ cd "${S}/packages"
+ emake check
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild b/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild
index cc94ed0b0817..a7170857e981 100644
--- a/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.1-r2.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/libtecla/libtecla-1.6.1-r2.ebuild,v 1.4 2012/08/04 09:42:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild,v 1.5 2012/12/14 18:46:31 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Tecla command-line editing library"
HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="icu"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="static-libs"
diff --git a/dev-libs/libtecla/libtecla-1.6.2.ebuild b/dev-libs/libtecla/libtecla-1.6.2.ebuild
index f8065f699894..8bfd688aab17 100644
--- a/dev-libs/libtecla/libtecla-1.6.2.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.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/libtecla/libtecla-1.6.2.ebuild,v 1.1 2012/08/09 16:32:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtecla/libtecla-1.6.2.ebuild,v 1.2 2012/12/14 18:46:31 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="Tecla command-line editing library"
HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="icu"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
diff --git a/dev-libs/ptypes/ptypes-2.0.2-r1.ebuild b/dev-libs/ptypes/ptypes-2.0.2-r1.ebuild
index 1ddbb48b7fe0..3d96b33844ea 100644
--- a/dev-libs/ptypes/ptypes-2.0.2-r1.ebuild
+++ b/dev-libs/ptypes/ptypes-2.0.2-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ptypes/ptypes-2.0.2-r1.ebuild,v 1.3 2006/12/23 23:26:33 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ptypes/ptypes-2.0.2-r1.ebuild,v 1.4 2012/12/14 11:27:18 ulm Exp $
inherit eutils toolchain-funcs
-KEYWORDS="amd64 x86"
-
DESCRIPTION="PTypes (C++ Portable Types Library) is a simple alternative to the STL that includes multithreading and networking."
HOMEPAGE="http://www.melikyan.com/ptypes/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="as-is"
+
+LICENSE="ZLIB"
SLOT="0"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND=""
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 5383dd30d743..a63e4508725b 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -1,3 +1,4 @@
+DIST asdf-2.26.tar.gz 185278 SHA256 b6e52e22565c4be6b48b35de265dc2929fbf3d8016919d3e0b0edb970921f7e3 SHA512 24ca65591079422d05fecb537f3a8413875d732e2b1b6c058310a08c096c59bf3ce5ed288bc270cb626ef9d21be6ae7df3f78d5c6d54540b41a553af6f86a08a WHIRLPOOL bca2c22bdcbc6f2d1a092a1ec06f7ff7d77b27ab149fe44e09441932aad396bbf25c3e36d8428c54e13f88ddb6311820ef6fd75c2c1d521a86be9682089bf2b3
DIST cl-asdf_1.86-1.diff.gz 4888 SHA256 ac7c526a4471353cff3fc2ae750693cf5a9a35c6dca1e52d04e9fd17d76082c8 SHA512 9aa905a14e814a9c7e8077d09aca238d735511ae67f0197fffc84100f5500950081bc00f5be7c6838e3a58d9e4c2f5b6fce9e41d84c7e39fb4fb2e04a1482abf WHIRLPOOL 86a88af4124e9e822c899f23400d054fd915365a825017fdf1ad0b6a26e121cbfe80639f65b018dbc7012173a40c88a31b287c96919184e050feb809ba86bd12
DIST cl-asdf_1.86.orig.tar.gz 53686 SHA256 cfee04493fe4b8a70a42e3ed79d927c3551878c8685ba7c8cf557341453421ce SHA512 a62ff032b41d60b3afbd1f1ef85ea52d669a6fdd87371b19364dec98e99a01e134242bd0b0d6e8731c8d89feab78b809b740a533a46ff21a3969ef0f7dd1e65c WHIRLPOOL c1943361d8e396d9ec602428b91622a023f7743553c4a8d8316ac6b472e11ef1bc3ad3e65644e2d492932c8eb7d02bf596f465e48b6e6714ee4af957459754d2
DIST cl-asdf_1.89-1.diff.gz 395 SHA256 1ad2de4d9bb494f58e69f327d02cd86100967371c93727393b99b3b6fd20d567 SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4 WHIRLPOOL 20bc02a86d3645bedf1952ef70193f3b52250dcab5720e21940f0721e2c8be330f8452d4f77c82cc7bb105afb935c3b255e435b5d99ac40965c49621082c0f4b
diff --git a/dev-lisp/asdf/asdf-2.26.ebuild b/dev-lisp/asdf/asdf-2.26.ebuild
new file mode 100644
index 000000000000..6c7d8d5c8e32
--- /dev/null
+++ b/dev-lisp/asdf/asdf-2.26.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/asdf/asdf-2.26.ebuild,v 1.1 2012/12/14 12:34:46 grozin Exp $
+
+EAPI=4
+
+DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!dev-lisp/cl-${PN}
+ !dev-lisp/asdf-binary-locations"
+
+S="${WORKDIR}/${PN}"
+
+CLSOURCEROOT="${ROOT%/}"/usr/share/common-lisp/source
+CLSYSTEMROOT="${ROOT%/}"/usr/share/common-lisp/systems
+CLPACKAGE="${PN}"
+
+absolute-path-p() {
+ [[ $# -eq 1 ]] || die "${FUNCNAME[0]} must receive one argument"
+ [[ ${1} == /* ]]
+}
+
+common-lisp-install-one-source() {
+ [[ $# -eq 3 ]] || die "${FUNCNAME[0]} must receive exactly three arguments"
+
+ local fpredicate=${1}
+ local source=${2}
+ local target="${CLSOURCEROOT}/${CLPACKAGE}/${3}"
+
+ if absolute-path-p "${source}" ; then
+ die "Cannot install files with absolute path: ${source}"
+ fi
+
+ if ${fpredicate} "${source}" ; then
+ insinto "${target}"
+ doins "${source}"
+ fi
+}
+
+lisp-file-p() {
+ [[ $# -eq 1 ]] || die "${FUNCNAME[0]} must receive one argument"
+
+ [[ ${1} =~ \.(lisp|lsp|cl)$ ]]
+}
+
+common-lisp-get-fpredicate() {
+ [[ $# -eq 1 ]] || die "${FUNCNAME[0]} must receive one argument"
+
+ local ftype=${1}
+ case ${ftype} in
+ "lisp") echo "lisp-file-p" ;;
+ "all" ) echo "true" ;;
+ * ) die "Unknown filetype specifier ${ftype}" ;;
+ esac
+}
+
+common-lisp-install-sources() {
+ local ftype="lisp"
+ if [[ ${1} == "-t" ]] ; then
+ ftype=${2}
+ shift ; shift
+ fi
+
+ [[ $# -ge 1 ]] || die "${FUNCNAME[0]} must receive one non-option argument"
+
+ local fpredicate=$(common-lisp-get-fpredicate "${ftype}")
+
+ for path in "${@}" ; do
+ if [[ -f ${path} ]] ; then
+ common-lisp-install-one-source ${fpredicate} "${path}" "$(dirname "${path}")"
+ elif [[ -d ${path} ]] ; then
+ common-lisp-install-sources -t ${ftype} $(find "${path}" -type f)
+ else
+ die "${path} it neither a regular file nor a directory"
+ fi
+ done
+}
+
+common-lisp-install-one-asdf() {
+ [[ $# != 1 ]] && die "${FUNCNAME[0]} must receive exactly one argument"
+
+ # the suffix «.asd» is optional
+ local source=${1/.asd}.asd
+ common-lisp-install-one-source true "${source}" "$(dirname "${source}")"
+ local target="${CLSOURCEROOT%/}/${CLPACKAGE}/${source}"
+ dosym "${target}" "${CLSYSTEMROOT%/}/$(basename ${target})"
+}
+
+common-lisp-install-asdf() {
+ dodir "${CLSYSTEMROOT}"
+
+ [[ $# = 0 ]] && set - ${CLSYSTEMS}
+ [[ $# = 0 ]] && set - $(find . -type f -name \*.asd)
+ for sys in "${@}" ; do
+ common-lisp-install-one-asdf ${sys}
+ done
+}
+
+src_install() {
+ common-lisp-install-sources {asdf,asdf-ecl,wild-modules}.lisp
+ common-lisp-install-asdf asdf.asd
+ dodoc README
+}
diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest
index e0f6e1ee3f5b..198fa39cff00 100644
--- a/dev-lisp/ecls/Manifest
+++ b/dev-lisp/ecls/Manifest
@@ -1,5 +1,6 @@
DIST ecl-10.4.1.tar.gz 5835953 SHA256 505dcfe8f26aca352271225ad5a7f117b9bef0f6e7f7a7abaf7b7f11f7c63c6c SHA512 4e3d378d9e40c56f75e12923e223ee37ed8c12268926032665d11239a8373b58a806a765f60543305cfae09f42a2ce8726c944cdeaa1a9f170a80df488404244 WHIRLPOOL daa638689e308c335fa8fbf2c273f06a954b20c24e3e60ffa8e948e84956f69e4c5d59140ebcb98d92bd6a5cc6c381607be2259b96531d3bc33f1ca0bfa1caad
DIST ecl-11.1.1.tar.gz 5898523 SHA256 28acce874e264a9e7182a2424bb7a1a3f7d834a8f2e1346ec0ef7156d4ed3b07 SHA512 a813d1514fcb0c1fba2090dc5232ab1261f293db050f54909dd74084cd757144d5e3a24677bbbcfcc74457247a1797059dc09ead8a14b8c23395c03c93e9d0dc WHIRLPOOL 42df041d01a1aeaddb235604e962b5aa55752ed60998bf9a40a4c001bf3281384e787c5a6cd513af3ca863f5b29885b1441640d0b17da5465142a4fda45fa2c3
+DIST ecl-12.12.1.tgz 9006697 SHA256 54e77ce8157752eab49f8640f7d0077522d493a4d4def463af26d292e46bc297 SHA512 9ac5d61e37cf18a56b2fb572b830955ededbe72d5d9a4e32ed631cd8cb5d27804ff5c0216a41f10ac988320b0584bcc4f9b4fb23732c541ee29f422c5726b23a WHIRLPOOL 8c2b1bd61caa27442bf337ab64788806e7e20150a902fe6c6d6cc593a3350d67252f8d450e6fd1ee99456a6238891c4b383044a6e79a77fad174d5db5a668aeb
DIST ecl-12.2.1.tgz 8974948 SHA256 dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091 SHA512 bf9bff5bfa02c638549ab7dab28d6778c6f676c0ea3ea8b8c11f85a4e9f3cf9fae23c7ec505024b3925ae0c905fccc132729964992c6d9b1524d9dd3b92bdf1f WHIRLPOOL cc8af8a2f92b66acb8578e76b7c982a57567591967c2e2fafbe681fdb8e78725072ec83d240addc255ff29979e6a6d23d077095f094288316f5dd16325d8ffbe
DIST ecl-12.7.1.tar.gz 9009087 SHA256 5709bfb92eff00ddc4bcd59375835e9421dae2d258466af75e7e8d2748e01c4d SHA512 1f4312a9b64e55b01df62b492c1d23bdb231abd28c357d18bd813481e0943a852fdaa79bc89c45d1d1da9c0e8a4e5b43c5525488280156d76cc42e0fe9e0c5fe WHIRLPOOL eb915ce3f014ac7583b4c678f9009acfab73a7ad15abe49542fe49718049804e3bc7270e3b8e8e45687738ebc1119d1a224c1b454e8feac1fc1687b2a2bf4320
DIST ecl-9.12.3.tgz 5758828 SHA256 f4f2e9d584130db9bb61bd09a676ad67c5d0f1ca8096ed781b50a2ae99c5e682 SHA512 8171d28945e5c06f55f6bc5bcf41b5370ee4d5723b3957d2c841aee1e100f3c2ca497f0651f777acd39ceaefeec2737ec254165280446fe51a4ef5cf81ef64b0 WHIRLPOOL 6ff09c048eb639b424a6b32cac88877d11d150f06a1bb482061dc8561c304afc3dbede3610a523a450a1792fd768e713c36dba04ca16501f090a803d7326dd87
diff --git a/dev-lisp/ecls/ecls-12.12.1.ebuild b/dev-lisp/ecls/ecls-12.12.1.ebuild
new file mode 100644
index 000000000000..aa1eb1a2a32b
--- /dev/null
+++ b/dev-lisp/ecls/ecls-12.12.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-12.12.1.ebuild,v 1.1 2012/12/14 07:21:23 grozin Exp $
+
+EAPI=4
+
+inherit eutils multilib
+MY_P=ecl-${PV}
+
+DESCRIPTION="ECL is an embeddable Common Lisp implementation."
+HOMEPAGE="http://ecls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug emacs gengc precisegc threads +unicode X"
+
+RDEPEND="dev-libs/gmp
+ virtual/libffi
+ >=dev-libs/boehm-gc-7.1[threads?]"
+DEPEND="${RDEPEND}
+ app-text/texi2html
+ emacs? ( virtual/emacs >=app-admin/eselect-emacs-1.12 )"
+PDEPEND="dev-lisp/gentoo-init"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+ if use gengc || use precisegc; then
+ ewarn "USE flags gengc and precisegc are experimental"
+ ewarn "Don't use them if you want a stable ecl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
+}
+
+src_configure() {
+ econf \
+ --with-system-gmp \
+ --enable-boehm=system \
+ --enable-longdouble \
+ $(use_enable gengc) \
+ $(use_enable precisegc) \
+ $(use_with debug debug-cflags) \
+ $(use_enable threads) \
+ $(use_with threads __thread) \
+ $(use_enable unicode) \
+ $(use_with X x) \
+ $(use_with X clx)
+}
+
+src_compile() {
+ if use emacs; then
+ local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}')
+ [[ -n ${ETAGS} ]] || die "No etags implementation found"
+ pushd build > /dev/null || die
+ emake ETAGS=${ETAGS} TAGS
+ popd > /dev/null
+ else
+ touch build/TAGS
+ fi
+
+ #parallel fails
+ emake -j1
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+
+ dodoc ANNOUNCEMENT Copyright
+ dodoc "${FILESDIR}"/README.Gentoo
+ pushd build/doc > /dev/null
+ newman ecl.man ecl.1
+ newman ecl-config.man ecl-config.1
+ popd > /dev/null
+}
diff --git a/dev-lisp/ecls/files/12.12.1-headers-gentoo.patch b/dev-lisp/ecls/files/12.12.1-headers-gentoo.patch
new file mode 100644
index 000000000000..635fc5d4afde
--- /dev/null
+++ b/dev-lisp/ecls/files/12.12.1-headers-gentoo.patch
@@ -0,0 +1,17 @@
+diff -Naur ecl-8.12.0.orig/src/h/object.h ecl-8.12.0/src/h/object.h
+--- ecl.orig/src/h/object.h 2008-12-17 16:41:53.000000000 +0100
++++ ecl/src/h/object.h 2008-12-17 19:35:05.000000000 +0100
+@@ -23,8 +23,13 @@
+ Integer and boolean types (see config.h)
+ */
+
++#ifndef TRUE
+ #define TRUE 1 /* boolean true value */
++#endif
++
++#ifndef FALSE
+ #define FALSE 0 /* boolean false value */
++#endif
+
+ #if !defined(__cplusplus) && !defined(bool)
+ typedef int bool;
diff --git a/dev-lisp/gentoo-init/files/gentoo-init-1.lisp b/dev-lisp/gentoo-init/files/gentoo-init-1.lisp
new file mode 100644
index 000000000000..263aedd10c29
--- /dev/null
+++ b/dev-lisp/gentoo-init/files/gentoo-init-1.lisp
@@ -0,0 +1,11 @@
+(in-package #:cl-user)
+
+(let ((*compile-print* nil)
+ (*compile-verbose* nil)
+ #+cmu (ext:*gc-verbose* nil))
+ (handler-bind ((warning #'muffle-warning))
+ (load #p"/usr/share/common-lisp/source/asdf/asdf.lisp"
+ :print nil :verbose nil)
+ #+ecl
+ (load #p"/usr/share/common-lisp/source/asdf/asdf-ecl.lisp"
+ :print nil :verbose nil)))
diff --git a/dev-lisp/gentoo-init/files/source-registry.conf b/dev-lisp/gentoo-init/files/source-registry.conf
new file mode 100644
index 000000000000..45e1fdfc5aa0
--- /dev/null
+++ b/dev-lisp/gentoo-init/files/source-registry.conf
@@ -0,0 +1,5 @@
+;; -*- Mode: Lisp; -*-
+
+(:source-registry
+ (:directory "/usr/share/common-lisp/systems")
+ :inherit-configuration)
diff --git a/dev-lisp/gentoo-init/gentoo-init-1.0.ebuild b/dev-lisp/gentoo-init/gentoo-init-1.0.ebuild
new file mode 100644
index 000000000000..a7f8d87772c1
--- /dev/null
+++ b/dev-lisp/gentoo-init/gentoo-init-1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gentoo-init/gentoo-init-1.0.ebuild,v 1.1 2012/12/14 12:36:03 grozin Exp $
+
+EAPI=4
+
+DESCRIPTION="Simple ASDF2 configuration for Gentoo Common Lisp ports."
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/common-lisp/guide.xml"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lisp/asdf-2.0"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /etc/common-lisp
+ newins "${FILESDIR}"/gentoo-init-1.lisp gentoo-init.lisp
+ doins "${FILESDIR}"/source-registry.conf
+}
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 1dd0d00b80f0..5a97fceb5005 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,6 +1,11 @@
+DIST sbcl-1.0.23-mips-linux-binary.tar.bz2 7932957 SHA256 9a4ef25e7119ad12ca4789ad8e333b6550bbb865f8eae06c9fb66fbf9323f960 SHA512 1d0b9177660fdba8ee88feeb3bc7b0eea57839d4bf793334611f674846d2b4369f07ca48574b176c3762ed346ff333c54451cc2ec521a0fd07b67e8a2d2931c0 WHIRLPOOL 4b5269bfb7672685aa39186ebe93c33169fee12b10132fede64f49e504349838b9f9fd489b3d13856bcba82194a2b14d97ddf39940c16c0444fde20eb49e53e9
DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 SHA256 0bd8125e1375a75b9dda286439dcbe9861d6df5c6fc8475fd217b8b757edf9cc SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab WHIRLPOOL 839363a0d2fcc7cf383143fc130c40bf6f03468a89eb4b5eecb39339ba376a6b3a2096938934a91cf689310bff20807d2ac24b99c0d6e3673729b26d9edb83aa
+DIST sbcl-1.0.28-mipsel-linux-binary.tar.bz2 8099121 SHA256 ddff119b6e868b05704b9d171c7defb626a845f991cc0c1ec90fc1c11e022a13 SHA512 514609df314d8f1623bf3f4cfa2329bab3c7087fd4f1be7f39b8d5829b600a7196cbea2a4bc05f33c96c419fac7bb42b3a008f7aa6c8f8a41a27ce698bb47d93 WHIRLPOOL 9f84b47d61b4a12cc98c87f85cb5e52a8d66b15227f2421d4bddc72f780ff8730c08acf07035c45f0adaa675f4dac9485d0d2bd638eea159f7e315a39186633a
DIST sbcl-1.0.28-powerpc-linux-binary.tar.bz2 7621107 SHA256 b51fe8cd3a998d178fc1876d10016439cfa4ed3566d761c331cacab364acd591 SHA512 e3386d25ae44c03cac5ecf2a9ba95338348b51955dc731f0bb57a124e572601b84170b452ff0c3540af07278053f1e5d153a4f1a621b376ceb1861f84777bad3 WHIRLPOOL 1c16053a0c15b3bec892811185945df59765f4d220045e0f116234aa18f843c6a6b8ce472029603624e47751185822891ffaaeb96dfd87f714b8fddf74149f26
DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 SHA256 a2e848ac11b0f16bb91866bd187949d908ad94fabb958a0b56320fc0e8b8923e SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 WHIRLPOOL e7f7e9bc7b43cab7b729792a22f0f41be12d8dd97a1c45fa039a49607865b977dd336fef8c7ccda087a9e9e32f92241c83e05da442e12cf883d3dfb3c2fda169
DIST sbcl-1.0.37-x86-64-linux-binary.tar.bz2 8702821 SHA256 0757a1d49d5452c9bef8d1c270dd423aa1b752e6a7ce4a3ffb546253e1bf56f3 SHA512 2175c30ce46c0b7b8fb4b2ed7aaadfa7a127cd50f2343adf1e8e0bd8b16c30803be5171fa076ca3a477df03a698f6887287bcf5e3249ba7c9e07f86f57cf8540 WHIRLPOOL 65322b7c36cf7cc23a796f4a4fd0c9f460c60cc18a0f3f167c20e892177c342f6af6ecda94e30ea32858ec3f13f0d7cb0a86955615b3fc180c62310de8bf1884
DIST sbcl-1.0.37-x86-linux-binary.tar.bz2 8815040 SHA256 3d04ffc7c71afe523858799386a3175467556648b27184e39f62df8f60cf7268 SHA512 6c630ed7f5a86f1ed928e59f5258b7b7be116c23f469c814a386fd82c4a554ab02ca6819098e5703063ac6f683538779b00c3bd6757338ce2b843062d873989f WHIRLPOOL 25e575652d1c87ad6ecb8a0934c5e9b0210e566e11f6c5df09bb4048c7567732b10350c1f91e0bcc1c85907d1e2ed877e7297b7ee838b941cefd6fb6fe5da781
DIST sbcl-1.0.55-source.tar.bz2 3611026 SHA256 e3216a7b9c302b6c1431d0f1ae444008de8ac465eb44f4ae841300d052d207ad SHA512 dbda1f1bcb28a4bea8bc3ab8c3d5c6c27754a1388087ae9db81b783444ac306d0c72dde3a096bc6dc716d1b174868f5e5f39402f69b0604fc8023b9227eea38b WHIRLPOOL ead2425660e1a8812f882bb4d359471f5f70295a0196e1df70ec5b6aa2bc2ccfb0f3c23d63aba19e149b808e4b4ced26b98428745033c8197255274094ccccea
+DIST sbcl-1.0.58-x86-linux-binary.tar.bz2 9313124 SHA256 a2195fce096fd7c64acef60ca496a29d703afc61eb39c366fdd9e56dc8982f84 SHA512 2776faa09f8a3d35ccb2745ec4a07e78bd714c47ae39032bbef3161d599d14fcc6313e65629df06b576cb973012b9c8356fac47bf7b886f9549d688fab3c4f98 WHIRLPOOL d98dda83b6ee02a777c787013ada2ca0a4548c75abe907a29215a48693bbbf787a6c6f83e07b2e8ab94afae261572dc0222570927357656d388329541301537c
+DIST sbcl-1.1.2-source.tar.bz2 3692248 SHA256 0c7a04d4ccf149324ff5919f230e1473757c223cda47623a97d749e018327713 SHA512 5d7cdaaa112da9fbacf7a67330e1981c0ba38aea7e17b307e2cdd6f832fac310868f06d1db659a80826b454a4dd6f3493c13ce0a3fdd1b1b70128832fd606dda WHIRLPOOL 52c5ae291adfcaa29e8ebb8db6faac753fa6be70ac7843af0f452df352bce04d403a2c3df1429de6a67d964f6be8667bb4cebc3cd2955872ff2d48a35e8bfe45
+DIST sbcl-1.1.2-x86-64-linux-binary.tar.bz2 9258037 SHA256 4ceecb6e64a88e47e094a047ac0fc27719c3ddb3bce405c1ddbb3d61b2070ced SHA512 fb3f649518ef4d2139f9ac6448f31cf97e81a835a56cb3547103bd729f6e2290d877518353d3cc0b93eb7fee486c9012adc8657be8203359b18f79060450153c WHIRLPOOL 60ebf6153f7aa40b69c111a02912b8f3422f3e39e43c9776a6c607c02bf3b54ec6dd5d94bb836d3a83e0e978d006cae2aa25842afab319140ee07b606fec27db
diff --git a/dev-lisp/sbcl/files/gentoo-fix_linux-os-c.patch b/dev-lisp/sbcl/files/gentoo-fix_linux-os-c.patch
index cabfafe6e45e..b5c593051186 100644
--- a/dev-lisp/sbcl/files/gentoo-fix_linux-os-c.patch
+++ b/dev-lisp/sbcl/files/gentoo-fix_linux-os-c.patch
@@ -11,3 +11,4 @@
-#endif
size_t os_vm_page_size;
+
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 5e07508634bd..eabe14e37cc9 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -1,6 +1,5 @@
-
+
pchrist@gentoo.org
@@ -25,10 +24,12 @@ pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
non-ANSI extensions, or on backward compatibility with old
non-ANSI features. Support for native threading on GNU/Linux is
available for the x86 and amd64 platforms using an NPTL enabled
- GLIBC. SBCL 0.8.17 and later support Unicode.
+ GLIBC. SBCL 0.8.17 and later support Unicode.
+
diff --git a/dev-lisp/sbcl/sbcl-1.1.2.ebuild b/dev-lisp/sbcl/sbcl-1.1.2.ebuild
new file mode 100644
index 000000000000..e57b8b04cc29
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.1.2.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.2.ebuild,v 1.1 2012/12/14 12:53:31 grozin Exp $
+
+EAPI=3
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.0.58
+BV_AMD64=1.1.2
+BV_PPC=1.0.28
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_MIPS=1.0.23
+BV_MIPSEL=1.0.28
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+ x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+ amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+ ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+ sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+ alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+ mips? ( !cobalt? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.bz2 ) )
+ mips? ( cobalt? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPSEL}-mipsel-linux-binary.tar.bz2 ) )"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+asdf ldb source +threads +unicode debug doc cobalt"
+
+DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
+RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3 || ( =sys-libs/glibc-2.6 ) )
+ asdf? ( >=dev-lisp/gentoo-init-1.0 )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+usep() {
+ use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+ echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+ cat > "${CONFIG}" <<'EOF'
+(lambda (list)
+ (flet ((enable (x) (pushnew x list))
+ (disable (x) (setf list (remove x list))))
+EOF
+ if use x86 || use amd64; then
+ sbcl_feature "$(usep threads)" ":sb-thread"
+ fi
+ sbcl_feature "$(usep ldb)" ":sb-ldb"
+ sbcl_feature "false" ":sb-test"
+ sbcl_feature "$(usep unicode)" ":sb-unicode"
+ sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+ cat >> "${CONFIG}" <<'EOF'
+ )
+ list)
+EOF
+ cat "${CONFIG}"
+}
+
+src_unpack() {
+ unpack ${A}
+ mv sbcl-*-linux sbcl-binary
+ cd "${S}"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+ epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch
+
+ # To make the hardened compiler NOT compile with -fPIE -pie
+ if gcc-specs-pie ; then
+ einfo "Disabling PIE..."
+ epatch "${FILESDIR}"/gentoo-fix_nopie_for_hardened_toolchain.patch
+ fi
+
+ use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+ # Some shells(such as dash) don't have "time" as builtin
+ # and we don't want to DEPEND on sys-process/time
+ sed "s,^time ,," -i make.sh
+ sed "s,/lib,/$(get_libdir),g" -i install.sh
+ sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c # #define SBCL_HOME ...
+
+ find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+ # customizing SBCL version as per
+ # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+ echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+ # applying customizations
+ sbcl_apply_features
+}
+
+src_compile() {
+ local bindir="${WORKDIR}"/sbcl-binary
+
+ strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+ if host-is-pax ; then
+ # To disable PaX on hardened systems
+ pax-mark -C "${bindir}"/src/runtime/sbcl
+ pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+ # Hack to disable PaX on second GENESIS stage
+ sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+ "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+ fi
+
+ # clear the environment to get rid of non-ASCII strings, see bug 174702
+ # set HOME for paludis
+ env - HOME="${T}" \
+ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+ GNUMAKE=make ./make.sh \
+ "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+ || die "make failed"
+
+ # need to set HOME because libpango(used by graphviz) complains about it
+ if use doc; then
+ env - HOME="${T}" make -C doc/manual info html || die "Cannot build manual"
+ env - HOME="${T}" make -C doc/internals info html || die "Cannot build internal docs"
+ fi
+}
+
+src_test() {
+ ewarn "Unfortunately, it is known that some tests fail eg."
+ ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+ ewarn "development and not of Gentoo's side. Please, before filing"
+ ewarn "any bug(s) search for older submissions. Thank you."
+ time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+ # install system-wide initfile
+ dodir /etc/
+ cat > "${D}"/etc/sbclrc <> "${D}"/etc/sbclrc < "${ENVD}"
+ echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+ doenvd "${ENVD}"
+}
diff --git a/dev-ml/xstr/xstr-0.2.1.ebuild b/dev-ml/xstr/xstr-0.2.1.ebuild
index 75d9c817ea68..c300b35c0c6a 100644
--- a/dev-ml/xstr/xstr-0.2.1.ebuild
+++ b/dev-ml/xstr/xstr-0.2.1.ebuild
@@ -1,19 +1,21 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/xstr/xstr-0.2.1.ebuild,v 1.3 2012/11/09 18:31:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/xstr/xstr-0.2.1.ebuild,v 1.4 2012/12/14 11:17:18 ulm Exp $
inherit findlib
DESCRIPTION="Thread-safe implementation of string searching/matching/splitting."
HOMEPAGE="http://www.ocaml-programming.de/packages/"
-LICENSE="as-is"
SRC_URI="http://www.ocaml-programming.de/packages/${P}.tar.gz"
+LICENSE="MIT"
SLOT="0"
+KEYWORDS="~amd64 ppc x86"
IUSE=""
+
DEPEND=""
RDEPEND="$DEPEND"
-KEYWORDS="~amd64 ppc x86"
+
S="${WORKDIR}/${PN}"
src_compile()
@@ -25,5 +27,5 @@ src_compile()
src_install()
{
findlib_src_install
- dodoc LICENSE README RELEASE
+ dodoc README RELEASE
}
diff --git a/dev-perl/DelimMatch/DelimMatch-1.06.ebuild b/dev-perl/DelimMatch/DelimMatch-1.06.ebuild
index efab74341b56..c3e6c157dbee 100644
--- a/dev-perl/DelimMatch/DelimMatch-1.06.ebuild
+++ b/dev-perl/DelimMatch/DelimMatch-1.06.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/dev-perl/DelimMatch/DelimMatch-1.06.ebuild,v 1.19 2011/08/17 16:44:27 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DelimMatch/DelimMatch-1.06.ebuild,v 1.20 2012/12/14 11:31:13 ulm Exp $
inherit perl-module
MY_P=${P}a
@@ -9,8 +9,8 @@ DESCRIPTION="A Perl 5 module for locating delimited substrings with proper nesti
SRC_URI="mirror://cpan/authors/id/N/NW/NWALSH/${MY_P}.tar.gz"
HOMEPAGE="http://search.cpan.org/~nwalsh/"
+LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild
index 1a51a409bad6..59e6c5cb112f 100644
--- a/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.45.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-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild,v 1.10 2012/08/27 17:21:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild,v 1.11 2012/12/14 11:33:57 ulm Exp $
EAPI=4
@@ -10,8 +10,8 @@ inherit perl-module
DESCRIPTION="Run a subprocess in batch mode (a la system)"
+LICENSE="|| ( BSD-2 Artistic GPL-1+ )"
SLOT="0"
-LICENSE="as-is"
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"
IUSE="test"
diff --git a/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0.ebuild b/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0.ebuild
index 0102c421d160..1572653b7b9c 100644
--- a/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0.ebuild
+++ b/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.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-perl/XML-AutoWriter/XML-AutoWriter-0.400.0.ebuild,v 1.3 2012/06/08 17:51:03 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-AutoWriter/XML-AutoWriter-0.400.0.ebuild,v 1.4 2012/12/14 11:35:42 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="DOCTYPE based XML output"
-LICENSE="as-is"
+LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 hppa ia64 sparc x86"
IUSE=""
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
index 9f1e1af56fa5..ab0dde463abc 100644
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild
@@ -1,13 +1,12 @@
-# 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/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild,v 1.1 2011/03/26 10:49:48 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2.ebuild,v 1.2 2012/12/14 11:24:55 ulm Exp $
inherit php-pear-r1
DESCRIPTION="Render text using FIGlet fonts."
-# the bundled fonts come from figlet and their license is not really clear.
-LICENSE="PHP-2.02 as-is"
-SLOT="0"
+LICENSE="PHP-2.02 GPL-2+ OFL-1.1"
+SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/dev-php/agavi/agavi-1.0.4.ebuild b/dev-php/agavi/agavi-1.0.4.ebuild
index 38dfc425a35a..21c29433817f 100644
--- a/dev-php/agavi/agavi-1.0.4.ebuild
+++ b/dev-php/agavi/agavi-1.0.4.ebuild
@@ -1,18 +1,18 @@
-# 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/dev-php/agavi/agavi-1.0.4.ebuild,v 1.1 2011/03/06 11:17:22 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/agavi/agavi-1.0.4.ebuild,v 1.2 2012/12/14 11:21:10 ulm Exp $
EAPI="2"
inherit php-pear-lib-r1
-KEYWORDS="~amd64 ~x86"
-
DESCRIPTION="PHP5 MVC Application Framework."
HOMEPAGE="http://www.agavi.org/"
SRC_URI="http://www.agavi.org/download/${PV}.tgz"
-LICENSE="LGPL-2.1 as-is public-domain CCPL-Attribution-ShareAlike-2.5"
+
+LICENSE="LGPL-2.1+ icu unicode ZLIB public-domain"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE=""
# currently fails to install with dev-php/PEAR-PEAR_PackageFileManager-1.7.0
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index bbccad0af9ae..5cafb70ea70c 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,2 +1,2 @@
-DIST bpython-0.10.1.tar.gz 83331 SHA256 73546a3162ddd9da400ded365c65393989221397da54690e4d25f1ddef3dbc16 SHA512 4cf296430f0d10b530bdcff3bd2dc5f099cfeca5b22dca33a8298f59286b4b5a0de5dc659577469d86d12fa0b3d80d4639dc340028e9899544d142f1ccfda1ca WHIRLPOOL fb16b6a77517afe155d184c9910856853a6774ceaee28a580ff684176492d5291490d8279feffc3f316aeb8ec37e28f0adb830a8a06ded5f248bb101afd1b64d
DIST bpython-0.11.tar.gz 86569 SHA256 60cf39712564f0a2516f7b0acf86f3c0392e67a79914eeed189400ffaaaeb309 SHA512 fc798422bd8220220302f08d919c854b832ebb9174e1467dc416e29bd47d69d58f910b827be67ac6c7516ed9b8d02f7706e6e2ecd790e9ccc6bc4d4cc5e8cbf7 WHIRLPOOL f8ca4fa4ad19527e476953ef20d3f4bd159cfde5d355bb2e3f28f5f9d5c8e46e552790a8d665126be9bfe34cbb331f27c2e1c034e59722ec61836d7604bcadf5
+DIST bpython-0.12.tar.gz 130968 SHA256 74a9074c5d5448e09ea9efe6b5305a4f580617d73c38f21eab5fe983312a8ec6 SHA512 001deb068dbc31e592b1c9c524cfbb5061cc9f1abb30d7597472920032285d20632f4ca75a10d4444be947413f9d2d65f476b64a66717956bca7d52b6b7ce948 WHIRLPOOL 15c7b6821af6893a88f91bc25b624af99423324a29bfc97eae5861a83e722cb1e3da478ef1838bb650e836e2b3e51dc90a5cca130bd95e64c3e0d8799af082b2
diff --git a/dev-python/bpython/bpython-0.10.1.ebuild b/dev-python/bpython/bpython-0.12.ebuild
similarity index 85%
rename from dev-python/bpython/bpython-0.10.1.ebuild
rename to dev-python/bpython/bpython-0.12.ebuild
index 2be98ba0ab11..3fbac48f303b 100644
--- a/dev-python/bpython/bpython-0.10.1.ebuild
+++ b/dev-python/bpython/bpython-0.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/dev-python/bpython/bpython-0.10.1.ebuild,v 1.4 2012/01/28 15:27:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.12.ebuild,v 1.1 2012/12/14 06:58:42 grozin Exp $
EAPI="3"
PYTHON_DEPEND="*:2.5"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 *-jython"
PYTHON_USE_WITH="ncurses"
-inherit distutils
+inherit distutils eutils
DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
HOMEPAGE="http://www.bpython-interpreter.org/ https://bitbucket.org/bobf/bpython/ http://pypi.python.org/pypi/bpython"
@@ -16,7 +16,7 @@ SRC_URI="http://www.bpython-interpreter.org/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="gtk urwid"
RDEPEND="dev-python/pygments
@@ -27,6 +27,11 @@ DEPEND="${RDEPEND}"
DOCS="sample-config sample.theme light.theme"
+src_prepare() {
+ distutils_src_prepare
+ epatch "${FILESDIR}"/${PN}-desktop.patch
+}
+
src_install() {
distutils_src_install
@@ -42,6 +47,8 @@ src_install() {
python_execute_function -q delete_unneeded_modules
fi
if ! use urwid; then
+ rm -f "${ED}"usr/bin/bpython-urwid*
+
delete_urwid() {
rm -f "${ED}$(python_get_sitedir)/bpython/urwid.py"
}
diff --git a/dev-python/coverage/coverage-3.5.3-r1.ebuild b/dev-python/coverage/coverage-3.5.3-r1.ebuild
index 1075d3a20497..fd5211edcfdb 100644
--- a/dev-python/coverage/coverage-3.5.3-r1.ebuild
+++ b/dev-python/coverage/coverage-3.5.3-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3-r1.ebuild,v 1.1 2012/12/08 15:08:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.3-r1.ebuild,v 1.2 2012/12/14 16:03:50 mgorny Exp $
EAPI=4
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} jython2_5 )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
inherit distutils-r1
DESCRIPTION="Code coverage measurement for Python"
diff --git a/dev-python/pyserial/pyserial-2.6-r1.ebuild b/dev-python/pyserial/pyserial-2.6-r1.ebuild
index 46072f40d7c5..30080d9ba1ed 100644
--- a/dev-python/pyserial/pyserial-2.6-r1.ebuild
+++ b/dev-python/pyserial/pyserial-2.6-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.6-r1.ebuild,v 1.1 2012/12/08 20:44:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.6-r1.ebuild,v 1.2 2012/12/14 16:04:46 mgorny Exp $
EAPI=4
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} jython2_5 )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
inherit distutils-r1
diff --git a/dev-ruby/RubyInline/Manifest b/dev-ruby/RubyInline/Manifest
index 5a51f4b594ca..b985f250122d 100644
--- a/dev-ruby/RubyInline/Manifest
+++ b/dev-ruby/RubyInline/Manifest
@@ -1,2 +1,3 @@
DIST RubyInline-3.11.3.gem 28672 SHA256 c3716cdd20082224548ee465eb5df59ed4d4556a19620f34ffe2418144d7f451 SHA512 fa0b2c8a942f69cccee6b32af1b6d6b7b2b3f71c140181072991af143997a1a239da36f879dda3b18c7cca2ac66d0f2b427c9073645509a450992d09215f41e4 WHIRLPOOL c3b16379e14690dca2c778643ff6741c81da00ba39b4c37ad2da29872a61b415e15803a7a835c1481b37e548cf69a44daaf2ab6be3f215f7f400db3ac20e5976
+DIST RubyInline-3.11.4.gem 28672 SHA256 7f85e67d929574c6ca6f26b3c06cf2bcc8baaf1d55713630db1d6dcfe9342df0 SHA512 183b36a682fc0ba3c6f32a5abfb8da795cca2d50a2ae2f74cc0996ba1fb3956c5c53abe14132b87af0d5dffa9f3a2428d485078950bb104370f93d0aaf241a67 WHIRLPOOL 57d15ecd1f705fc04d53ac29b022c8aa0434a274ec8bdf6a709da3f5a751f671b8b18a1ba3ffd9399e4753842f06b44571c617edf8633d69c17cdffced4c25e9
DIST RubyInline-3.8.6.gem 28160 SHA256 1153411b2026b50dc6516dbad4889970766d439312d588b2ab8db1ef35f1e58e SHA512 1cd5993a69a21f6a9256336ae6eee1c26e2cadeb807785651b1b047ec516b032aa826e65ec3ff2458b8bf2c5f13d0c5e6b58906aadf800368acbc6d304fc1d53 WHIRLPOOL 69b53d4448d7a0484806470682084ba30c704c1c5058bd467d205cdfd9965f4f0e5cddb748ce9e8f3658a906ac2d0c57978c3708aa11e76642cfa7a8331b12ac
diff --git a/dev-ruby/RubyInline/RubyInline-3.11.4.ebuild b/dev-ruby/RubyInline/RubyInline-3.11.4.ebuild
new file mode 100644
index 000000000000..9e51f07e9967
--- /dev/null
+++ b/dev-ruby/RubyInline/RubyInline-3.11.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.11.4.ebuild,v 1.1 2012/12/14 06:55:42 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows to embed C/C++ in Ruby code"
+HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend dev-ruby/zentest
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/hoe
+ dev-ruby/hoe-seattlerb
+ virtual/ruby-minitest
+ )"
+
+RUBY_PATCHES=(
+ ruby-inline-3.11.0-gentoo.patch
+ ruby-inline-3.11.1-ldflags.patch
+)
+
+all_ruby_prepare() {
+ sed -i -e '/isolate/ s:^:#:' Rakefile || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ docinto examples
+ dodoc example.rb example2.rb demo/*.rb
+}
diff --git a/dev-ruby/amq-client/Manifest b/dev-ruby/amq-client/Manifest
index 9a6676f0d496..c050e8c0e93d 100644
--- a/dev-ruby/amq-client/Manifest
+++ b/dev-ruby/amq-client/Manifest
@@ -1,2 +1,3 @@
+DIST amq-client-0.9.10.gem 74240 SHA256 80b06050399d79745362622af133ccfbe2a3dffaf1c78e89cfc76755835d55f0 SHA512 b328ef504fecba86f7a0a4a887439ed2a135512bdf9718704b6b0f49e9fb948b7e481b9955f580c3016194026b403eafc9456cd77cc09d063516ceea2033af33 WHIRLPOOL 88297d2cd9ae05babe5d6104c7efd6a967f42bc743e7137483961ba4716b2aad77fde73c08d61477d22f330bb62dfb8d345bc369e2bd98fb31c0775978e099e2
DIST amq-client-0.9.4.gem 74752 SHA256 7be618ce90bfada7abf556e0981d3d5a34222bba514288a9babad3d90a3dd63b SHA512 fbcb1ce9d033392752e0e472870d5ce9ee6507844f13341fe30bb818d698392c7cf6050383562f4dd087a780e0f497f545350ff2abcdca1921492c25ba714a26 WHIRLPOOL 1c330d328038c950aa18b7c4c27eb3082d0cd1f25e9b59ddb6cad3a6599d53fcb10bbda7c8276b002e5151d64c8cde49666bdc8b2857cb9f7f45fbbf4b373b4f
DIST amq-client-0.9.5.gem 75264 SHA256 94d86d761fec274f88fd090e959fb9ce103971fb55b175e789eb763303edfd08 SHA512 5fb7dfa82939affc838185f551c43a6a28de8d0f9f688296ad70e7c87404dc10e4a2af331357f54a6a5a6670f843562e9ba69b42847c91b6093e77b90e3b9c88 WHIRLPOOL 4cca9fe0a5304457905f4c0e96c3ba8bde10c03631414e4d20cf15aafbb9b628804207843802c92707d1905298229e6bc6bc6f90f16aa3b8fd4346b9f803206b
diff --git a/dev-ruby/amq-client/amq-client-0.9.10.ebuild b/dev-ruby/amq-client/amq-client-0.9.10.ebuild
new file mode 100644
index 000000000000..7d46e678b8de
--- /dev/null
+++ b/dev-ruby/amq-client/amq-client-0.9.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-client/amq-client-0.9.10.ebuild,v 1.1 2012/12/14 07:26:08 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="A fully-featured, low-level AMQP 0.9.1 client."
+HOMEPAGE="http://github.com/ruby-amqp/amq-client"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-0.9.4 dev-ruby/eventmachine"
+
+ruby_add_bdepend "test? ( dev-ruby/evented-spec )"
+
+all_ruby_prepare() {
+ rm Gemfile || die
+ sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+ sed -i -e '7i require "evented-spec"' spec/spec_helper.rb || die
+
+ # Drop integration tests since these require a running AMQP server.
+ rm -rf spec/integration spec/regression/bad_frame_slicing_in_adapters_spec.rb spec/unit/client_spec.rb || die
+}
diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest
index 879bbc834a74..f70bda09d1ef 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -1,3 +1,4 @@
DIST amq-protocol-0.9.0.gem 40448 SHA256 37f7c04d0246f0173bfdd8f25edf7eb6152fb346a2e7184a359cfd68df3942e2 SHA512 55a0e9b3a2a4850068c3d3f19c2a7eedc4413dde158008cff38bbb6bb645908299355214b1dfd20b67f445172c5fb8ec4205441ab1c430e1ef684470527fba65 WHIRLPOOL bfb3300ac85f85ae7a6bb9668aedf223c52ac1d9fe02ca6c12fbb6e43a1588fd35dac447936e6ab786bba30151d71b977fd057ef76fb2231b553ece36109fe33
DIST amq-protocol-0.9.4.gem 39936 SHA256 e2a3a406d3f0678b86adba668e50bb8772e06445760be683fc5dbb98f94874bd SHA512 7e24edfcd0b81165e640fcdc9f9cb5413d89f03ca82417cd5d8df3e61cef8e604ccc78c702a9baf329ec6a142ad0e4fa159135386603e5e93123a583dc8ece5e WHIRLPOOL 8bbc60a0c863f200ccb5432d6f2ec15bf51af7e53cf1910ce26b928a15dc0b78eba59b4e2a05b34979de271156420fd0101bc8a01299c7e098da6e4bfc9f068f
DIST amq-protocol-0.9.5.gem 39936 SHA256 ef0ca472d4cd671d754c8b12a69740aa7abf4df72de6d4a684ded5a519bfa16f SHA512 ad81e17f78b8dcd9d8616ec05cbc7374f5f41048386444a823c9ef8db2efcd8ecc4fca3294777460b6191f39e12038232f38f0b67e417e0a08bba2d766a6025f WHIRLPOOL e073e1544c4f82c7c987d09cf0e59a7bc38dd855877758b1b2c2da8c10733a49a065520abb6eb4cea5b881a5c6d69ec4c7fa398df882e84ac9b81e3346e0e08f
+DIST amq-protocol-1.0.1.gem 42496 SHA256 64ddc0a4734e1cdead365a8456a717c2843f2bfcf4a9749cf8c666f34fc5440c SHA512 53c9a6354cdfc31fcc28ce3f41e3cc04ca800c0d0f68ececed51b65807fb5003339b813ba0e986ddb5f8fda4272138b592a54cb44f7dc474c930eaf4f7d897cc WHIRLPOOL 829727b7fb14d99c3441449d25575ea99c58510e26e6c09126614ccb501b235e9f4398280bf38b3eb3c303237697c3398e676cd60cd139811ea58b22d993db32
diff --git a/dev-ruby/amq-protocol/amq-protocol-1.0.1.ebuild b/dev-ruby/amq-protocol/amq-protocol-1.0.1.ebuild
new file mode 100644
index 000000000000..cddf28ec8e58
--- /dev/null
+++ b/dev-ruby/amq-protocol/amq-protocol-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-protocol/amq-protocol-1.0.1.ebuild,v 1.1 2012/12/14 15:44:55 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby."
+HOMEPAGE="http://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+ rm Gemfile || die
+ sed -i -e '/bundler/d' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/async_sinatra/Manifest b/dev-ruby/async_sinatra/Manifest
index 7bee6b583dd3..9d3a9406b468 100644
--- a/dev-ruby/async_sinatra/Manifest
+++ b/dev-ruby/async_sinatra/Manifest
@@ -1 +1,2 @@
DIST async_sinatra-0.4.0.gem 12800 SHA256 06d0c6000c6f162fb09028c45f80a79588649bf5b681f205ac3aa7090fecef2f SHA512 f007a3ebda532ebccb179673b7dda221dfedb8d15d1a02b0b2e7359b0f21e47a8b928defb18a6eceedfef7d480025d086bf3a5647d75b5db453a6010b38a5d84 WHIRLPOOL 3120a84cff8298077c9f694d8430af077179303a44997c169f08954fd3ce90eb71c459f30ef0cb2882c978008189513b55b6d23b0dd6a172f0b89ae7e20149a6
+DIST async_sinatra-1.0.0-git.tgz 8028 SHA256 3af2ee78ccc5b93e7d3f13ef5515a18336acdce19cfbf239259db0d320597496 SHA512 89be4d3aef3d3b67da3dc7efd8820515cc3f81ecbceb9a80b2ef7a6c953bfb2153d12f38e6299e545f841d5d31ec89ac18fd83347ec51136ae74da9ff5dc5661 WHIRLPOOL 795bf3bcaeb2de241dcfb29e1809e90ec4bf61831485a8416a67ab379515ff08bb8139f33429429d0312d602596c08aade4f59e67b5ba548909c3637d45a1268
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.0.0.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.0.0.ebuild
new file mode 100644
index 000000000000..611ee96fad6b
--- /dev/null
+++ b/dev-ruby/async_sinatra/async_sinatra-1.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/async_sinatra/async_sinatra-1.0.0.ebuild,v 1.1 2012/12/14 16:08:57 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Asynchronous response API for Sinatra and Thin"
+HOMEPAGE="http://libraggi.rubyforge.org/async_sinatra"
+SRC_URI="https://github.com/raggi/async_sinatra/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RUBY_PATCHES=( "${FILESDIR}/${P}-extended-sinatra.patch" )
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/hoe-2.9.1
+ >=dev-ruby/minitest-2.5.1
+ >=dev-ruby/rubyforge-2.0.4
+ >=dev-ruby/eventmachine-0.12.11
+ )"
+ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
+
+ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
+ >=dev-ruby/rack-1.4.1"
+
+all_ruby_prepare() {
+ # Remove development dependencies that we don't have from the gemspec
+ sed -i -e '/\(hoe-doofus\|hoe-seattlerb\|hoe-git\|hoe-gemspec2\)/d' async_sinatra.gemspec || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ insinto /usr/share/doc/${PF}/
+ doins -r examples || die "Failed to install examples"
+}
diff --git a/dev-ruby/async_sinatra/files/async_sinatra-1.0.0-extended-sinatra.patch b/dev-ruby/async_sinatra/files/async_sinatra-1.0.0-extended-sinatra.patch
new file mode 100644
index 000000000000..9c3ccc0cf912
--- /dev/null
+++ b/dev-ruby/async_sinatra/files/async_sinatra-1.0.0-extended-sinatra.patch
@@ -0,0 +1,19 @@
+commit f00c791c8baa150bea4de7a4efbe941b93470c02
+Author: Sam Soffes
+Date: Fri Sep 14 11:55:10 2012 -0700
+
+ Support Sinatra::ExtendedRack. Fixes #30
+
+diff --git a/lib/sinatra/async/test.rb b/lib/sinatra/async/test.rb
+index 1571dbe..7e98aca 100644
+--- a/lib/sinatra/async/test.rb
++++ b/lib/sinatra/async/test.rb
+@@ -87,6 +87,8 @@ class Sinatra::Async::Test
+ # This hack exists because sinatra is now returning a proper rack stack.
+ # We might need to consider alternative approaches in future.
+ app = app()
++ app = app.app if app.is_a?(Sinatra::ExtendedRack)
++
+ until app.nil? || app.is_a?(Sinatra::Base)
+ app = app.instance_variable_get(:@app)
+ end
diff --git a/dev-ruby/best_in_place/Manifest b/dev-ruby/best_in_place/Manifest
index 9b32b2ce16e4..41c0a9f77605 100644
--- a/dev-ruby/best_in_place/Manifest
+++ b/dev-ruby/best_in_place/Manifest
@@ -1 +1,2 @@
DIST best_in_place-1.1.2.gem 59904 SHA256 eebfb440b671e6d1c9a796932264b2b819ad6f5d2cf2461daf38ea243994c7a9 SHA512 7fc3ce03d8dcc50d46248e0d207700ff66496a9cb73770d2868a5d9eacf5f7932b2636a5b6bfeec2cee0bc616077cc280b90bf7bc3ba0b1312d636d01dc56157 WHIRLPOOL fdc3a2c36de5bca90e2ad4462c9c20b01ae06c4b525e5edf4551e09a39c1542324c46e1e2b6b0420bdd7965ed9f049dc8fe09e6acfe7ccc5cb89e1622001837f
+DIST best_in_place-1.1.3.gem 62464 SHA256 174f659dfef3f061e420c0da7c4da09ece7ba97c6656c5cfe8937e164e848bfd SHA512 4cbcbc8bc74c7663ea45de1c1382dddab47fd4455f2cca8e0edb79c57659e09dcf0db25caa9baccd66e638f36990f62e1ddb31c17585f2dc7b616dffaef5dc2b WHIRLPOOL 5fb28e5ae44874b3bef3c04dc9544fde9be9c156b503b7cd94cff65af14b3af96df23bda19e1c5126a7637024bd13621d5b2df911017ecc8f21c93ee1fc89956
diff --git a/dev-ruby/best_in_place/best_in_place-1.1.3.ebuild b/dev-ruby/best_in_place/best_in_place-1.1.3.ebuild
new file mode 100644
index 000000000000..5268ef810939
--- /dev/null
+++ b/dev-ruby/best_in_place/best_in_place-1.1.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.1.3.ebuild,v 1.1 2012/12/14 16:31:11 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+# if ever needed
+#GITHUB_USER="bernat"
+#GITHUB_PROJECT="${PN}"
+#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="In-place editor helper for Rails 3o"
+HOMEPAGE="http://github.com/bernat/best_in_place"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rails-3.1
+ dev-ruby/jquery-rails"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/rspec-rails
+ >=dev-ruby/nokogiri-1.5.0
+ >=dev-ruby/capybara-1.0.1
+ dev-ruby/rails:3.2
+ >=dev-ruby/sqlite3-1.3.4-r1
+ dev-ruby/kramdown
+ )"
+
+DEPEND+=" test? ( www-client/firefox dev-ruby/bundler )"
+
+all_ruby_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.1.0-kramdown.patch
+
+ sed -i \
+ -e '/git ls-files/d' \
+ -e '/rspec-rails/s:,.*::' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ sed -i \
+ -e '/gem .rails/s:3.2: ~> 3.2.0:' \
+ -e '/group :assets/,/^end/ d' \
+ test_app/Gemfile || die
+}
+
+each_ruby_test() {
+ RAILS_ENV=test ${RUBY} -C test_app -S rake db:migrate || die "test_app migration failed"
+ VIRTUALX_COMMAND="${RUBY}" virtualmake -S bundle exec rspec spec || die "Specs failed"
+}
diff --git a/dev-ruby/celluloid/Manifest b/dev-ruby/celluloid/Manifest
new file mode 100644
index 000000000000..5c71b0597d82
--- /dev/null
+++ b/dev-ruby/celluloid/Manifest
@@ -0,0 +1 @@
+DIST celluloid-0.12.4-git.tgz 45475 SHA256 91d6adf03f351b8f3d164431d1838411481c516b72768b758ec68b9de591314d SHA512 03eb83377981fb01fd8d686e7c2bee4d796460848723bd247d220d21d0c1a2166b914953160399cd4a64e88bee3c5713cfa7e1f6d3eb4205d78b0fb75cb4bef5 WHIRLPOOL 5b8e5568406028c2a7572bb3092eea4f5c48f50859e52aa1a457fcbb941fee8e4b81fce84c4ce53ba1e4709b097c439d92fab2d2ad619303003aec54383f1208
diff --git a/dev-ruby/celluloid/celluloid-0.12.4.ebuild b/dev-ruby/celluloid/celluloid-0.12.4.ebuild
new file mode 100644
index 000000000000..bec82b819144
--- /dev/null
+++ b/dev-ruby/celluloid/celluloid-0.12.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/celluloid/celluloid-0.12.4.ebuild,v 1.1 2012/12/14 07:08:56 graaff Exp $
+
+EAPI=5
+# rbx or jruby recommended, but only in 1.9 mode.
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Celluloid provides a simple and natural way to build fault-tolerant concurrent programs in Ruby"
+HOMEPAGE="https://github.com/celluloid/celluloid"
+SRC_URI="https://github.com/celluloid/celluloid/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+IUSE=""
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend ">=dev-ruby/facter-1.6.12
+ >=dev-ruby/timers-1.0.0"
+
+all_ruby_prepare() {
+ rm Gemfile .rspec || die
+}
diff --git a/dev-ruby/celluloid/metadata.xml b/dev-ruby/celluloid/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/celluloid/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
new file mode 100644
index 000000000000..4fd32e309bae
--- /dev/null
+++ b/dev-util/cmocka/Manifest
@@ -0,0 +1 @@
+DIST cmocka-0.2.0_p20121129.tar.xz 61388 SHA256 87d67349ca0f79e37137d7b3a094eef1ce59868ecce37356fae67e5ce91eb983 SHA512 83f5f0e4f8a3b4677c4dc3742267a05a4b55f66e394fa04e5c33a078be48285f606dcc29793c9a1273a14dbb63b068f41c93664c6bd78073f8d5240985abf30f WHIRLPOOL 73e5d268e68721414df74cc7d1c22ca7c47d4c699a7df63dd88cecc0556641961b10064b4a7f5e6d353b746e85bcbd74ee5fd7da606c42fe8fc1720b01d60e4b
diff --git a/dev-util/cmocka/cmocka-0.2.0_p20121129.ebuild b/dev-util/cmocka/cmocka-0.2.0_p20121129.ebuild
new file mode 100644
index 000000000000..dfc0e6e26860
--- /dev/null
+++ b/dev-util/cmocka/cmocka-0.2.0_p20121129.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmocka/cmocka-0.2.0_p20121129.ebuild,v 1.1 2012/12/14 17:04:36 creffett Exp $
+
+EAPI=4
+
+inherit cmake-utils
+DESCRIPTION="The lightweight C unit testing library"
+HOMEPAGE="https://open.cryptomilk.org/projects/cmocka"
+SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="
+ doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}/${PN}-automagicness.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with static-libs STATIC_LIB)
+ $(cmake-utils_use test UNIT_TESTING)
+ $(cmake-utils_use_with doc APIDOC)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ if use doc; then
+ pushd ${BUILD_DIR}/doc/
+ doxygen doxy.config
+ rm html/*.md5 latex/*.md5 latex/Manifest man/man3/_*
+ dohtml html/*
+ dodoc latex/*
+ doman man/man3/*.3
+ popd
+ fi
+ cmake-utils_src_install
+}
diff --git a/dev-util/cmocka/files/cmocka-automagicness.patch b/dev-util/cmocka/files/cmocka-automagicness.patch
new file mode 100644
index 000000000000..29ece4563214
--- /dev/null
+++ b/dev-util/cmocka/files/cmocka-automagicness.patch
@@ -0,0 +1,74 @@
+--- a/cmake/Modules/MacroOptionalFindPackage.cmake
++++ b/cmake/Modules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,48 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_, which can be disabled via the cmake GUI.
++# or via -DWITH_=OFF
++# The standard _FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006-2010 Alexander Neundorf,
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# This is just a helper macro to set a bunch of variables empty.
++# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
++macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
++ if(DEFINED ${_name}_${_var})
++ set(${_name}_${_var} "")
++ endif(DEFINED ${_name}_${_var})
++
++ string(TOUPPER ${_name} _nameUpper)
++ if(DEFINED ${_nameUpper}_${_var})
++ set(${_nameUpper}_${_var} "")
++ endif(DEFINED ${_nameUpper}_${_var})
++endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++ option(WITH_${_name} "Search for ${_name} package" ON)
++ if (WITH_${_name})
++ find_package(${_name} ${ARGN})
++ else (WITH_${_name})
++ string(TOUPPER ${_name} _nameUpper)
++ set(${_name}_FOUND FALSE)
++ set(${_nameUpper}_FOUND FALSE)
++
++ _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
++ _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
++ _mofp_set_empty_if_defined(${_name} INCLUDES)
++ _mofp_set_empty_if_defined(${_name} LIBRARY)
++ _mofp_set_empty_if_defined(${_name} LIBRARIES)
++ _mofp_set_empty_if_defined(${_name} LIBS)
++ _mofp_set_empty_if_defined(${_name} FLAGS)
++ _mofp_set_empty_if_defined(${_name} DEFINITIONS)
++ endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
++
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@
+ include(DefineInstallationPaths)
+ include(DefineOptions.cmake)
+ include(CPackConfig.cmake)
+-
++include(MacroOptionalFindPackage)
+ if (UNIT_TESTING)
+ include(AddCMockaTest)
+ endif (UNIT_TESTING)
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ #
+ # Build the documentation
+ #
+-include(UseDoxygen OPTIONAL)
+-
++option(WITH_APIDOC "Use doxygen to generate documentation" ON)
++if (WITH_APIDOC)
++ include(UseDoxygen OPTIONAL)
++endif (WITH_APIDOC)
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
new file mode 100644
index 000000000000..f017c1146cff
--- /dev/null
+++ b/dev-util/cmocka/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+kde
+
+ creffett@gentoo.org
+ Chris Reffett
+
+
diff --git a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.1.ebuild b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.1.ebuild
index 349922bfba64..f6cb9e2411e1 100644
--- a/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.1.ebuild
+++ b/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.1.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-util/kdevelop-php-docs/kdevelop-php-docs-1.4.1.ebuild,v 1.1 2012/11/05 13:55:35 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php-docs/kdevelop-php-docs-1.4.1.ebuild,v 1.3 2012/12/14 12:54:57 ago Exp $
EAPI=4
@@ -18,7 +18,7 @@ IUSE="debug"
if [[ $PV == *9999* ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
RDEPEND="
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.4.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.4.1.ebuild
index e822b10575e6..7c5e1924f40f 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.4.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.4.1.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-util/kdevelop-php/kdevelop-php-1.4.1.ebuild,v 1.1 2012/11/05 13:58:04 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.4.1.ebuild,v 1.3 2012/12/14 12:54:43 ago Exp $
EAPI=4
@@ -19,7 +19,7 @@ IUSE="debug doc"
if [[ $PV == *9999* ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DEPEND="
diff --git a/dev-util/kdevelop/kdevelop-4.4.1.ebuild b/dev-util/kdevelop/kdevelop-4.4.1.ebuild
index 08f070bcd0cc..d5d3c76fa77b 100644
--- a/dev-util/kdevelop/kdevelop-4.4.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-4.4.1.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-util/kdevelop/kdevelop-4.4.1.ebuild,v 1.2 2012/12/10 15:55:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-4.4.1.ebuild,v 1.4 2012/12/14 12:54:09 ago Exp $
EAPI=4
@@ -17,7 +17,7 @@ IUSE="+cmake +cxx debug okteta qthelp"
if [[ $PV == *9999* ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc x86"
fi
DEPEND="
diff --git a/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild b/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild
index a653c6788fce..bb0dbbf16c1f 100644
--- a/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild
+++ b/dev-util/kdevplatform/kdevplatform-1.4.1.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-util/kdevplatform/kdevplatform-1.4.1.ebuild,v 1.2 2012/12/10 15:56:59 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevplatform/kdevplatform-1.4.1.ebuild,v 1.4 2012/12/14 12:54:26 ago Exp $
EAPI=4
@@ -21,7 +21,7 @@ IUSE="cvs debug reviewboard subversion"
if [[ $PV == *9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="amd64 ~ppc x86"
fi
DEPEND="
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 7bdc5d6db999..c952de5ae6ec 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -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/eclass/autotools-utils.eclass,v 1.60 2012/12/03 12:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.61 2012/12/14 08:40:18 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -157,6 +157,8 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
# @DESCRIPTION:
# Array containing documents passed to dodoc command.
#
+# In EAPIs 4+, can list directories as well.
+#
# Example:
# @CODE
# DOCS=( NEWS README )
@@ -485,7 +487,12 @@ autotools-utils_src_install() {
# XXX: support installing them from builddir as well?
if [[ ${DOCS} ]]; then
- dodoc "${DOCS[@]}" || die "dodoc failed"
+ if [[ ${EAPI} == [23] ]]; then
+ dodoc "${DOCS[@]}" || die
+ else
+ # dies by itself
+ dodoc -r "${DOCS[@]}"
+ fi
else
local f
# same list as in PMS
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 39de7f2f27eb..f4e4c95add51 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -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/eclass/python-r1.eclass,v 1.25 2012/12/01 09:29:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.26 2012/12/14 08:41:59 mgorny Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -133,7 +133,9 @@ fi
_python_set_globals() {
local flags=( "${PYTHON_COMPAT[@]/#/python_targets_}" )
+ local flags_st=( "${PYTHON_COMPAT[@]/#/-python_single_target_}" )
local optflags=${flags[@]/%/?}
+ optflags+=,${flags_st[@]/%/(-)}
IUSE=${flags[*]}
REQUIRED_USE="|| ( ${flags[*]} )"
diff --git a/games-simulation/openttd/openttd-1.2.3.ebuild b/games-simulation/openttd/openttd-1.2.3.ebuild
index 074ccdfa5d77..bfb3abe2b82b 100644
--- a/games-simulation/openttd/openttd-1.2.3.ebuild
+++ b/games-simulation/openttd/openttd-1.2.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-simulation/openttd/openttd-1.2.3.ebuild,v 1.1 2012/11/01 19:37:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.3.ebuild,v 1.2 2012/12/14 12:18:54 pinkbyte Exp $
EAPI=3
inherit eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
RESTRICT="test" # needs a graphics set in order to test
diff --git a/games-strategy/widelands/widelands-0.17.ebuild b/games-strategy/widelands/widelands-0.17.ebuild
index 4f69c4d5a886..7c04d33619e7 100644
--- a/games-strategy/widelands/widelands-0.17.ebuild
+++ b/games-strategy/widelands/widelands-0.17.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/widelands/widelands-0.17.ebuild,v 1.5 2012/08/28 20:38:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.17.ebuild,v 1.6 2012/12/14 18:45:45 nimiux Exp $
EAPI=3
inherit eutils versionator toolchain-funcs flag-o-matic cmake-utils games
@@ -13,7 +13,7 @@ SRC_URI="http://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_r
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND="dev-lang/lua
diff --git a/licenses/BSD-with-attribution b/licenses/BSD-with-attribution
new file mode 100644
index 000000000000..a3b72f61c915
--- /dev/null
+++ b/licenses/BSD-with-attribution
@@ -0,0 +1,34 @@
+Copyright (c) ,
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without [specific] prior written permission.
+ [For permission [or any legal details], [please] contact .]
+4. Redistributions of any form whatsoever must retain the following
+ acknowledgment: "This product includes software developed by
+ ()."
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 OWNER 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: A variant of this license includes the HPND disclaimer instead.
diff --git a/licenses/IJG b/licenses/IJG
new file mode 100644
index 000000000000..5ca57958da2f
--- /dev/null
+++ b/licenses/IJG
@@ -0,0 +1,73 @@
+In plain English:
+
+1. We don't promise that this software works. (But if you find any bugs,
+ please let us know!)
+2. You can use this software for whatever you want. You don't have to pay us.
+3. You may not pretend that you wrote this software. If you use it in a
+ program, you must acknowledge somewhere in your documentation that
+ you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose. This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library. If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it. This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+by the usual distribution terms of the Free Software Foundation; principally,
+that you must include source code if you redistribute it. (See the file
+ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part
+of any program generated from the IJG code, this does not limit you more than
+the foregoing paragraphs do.
+
+The Unix configuration script "configure" was produced with GNU Autoconf.
+It is copyright by the Free Software Foundation but is freely distributable.
+The same holds for its supporting scripts (config.guess, config.sub,
+ltmain.sh). Another support script, install-sh, is copyright by X Consortium
+but is also freely distributable.
+
+The IJG distribution formerly included code to read and write GIF files.
+To avoid entanglement with the Unisys LZW patent, GIF reading support has
+been removed altogether, and the GIF writer has been simplified to produce
+"uncompressed GIFs". This technique does not use the LZW algorithm; the
+resulting GIF files are larger than usual, but are readable by all standard
+GIF decoders.
+
+We are required to state that
+ "The Graphics Interchange Format(c) is the Copyright property of
+ CompuServe Incorporated. GIF(sm) is a Service Mark property of
+ CompuServe Incorporated."
diff --git a/licenses/Ispell b/licenses/Ispell
new file mode 100644
index 000000000000..eaf55eb7f9e0
--- /dev/null
+++ b/licenses/Ispell
@@ -0,0 +1,33 @@
+Copyright 1993, Geoff Kuenning, Granada Hills, CA
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. 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.
+3. All modifications to the source code must be clearly marked as
+ such. Binary redistributions based on modified source code
+ must be clearly marked as modified versions in the documentation
+ and/or other materials provided with the distribution.
+(clause 4 removed with permission from Geoff Kuenning)
+5. The name of Geoff Kuenning may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING 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 GEOFF
+KUENNING 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.
diff --git a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
similarity index 74%
rename from media-gfx/argyllcms/argyllcms-1.4.0.ebuild
rename to media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
index 75a4bbc4de82..1df7d16797a8 100644
--- a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
@@ -1,24 +1,26 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.6 2012/12/11 16:10:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild,v 1.1 2012/12/14 08:54:19 jlec Exp $
-EAPI=4
+EAPI=5
-inherit base udev toolchain-funcs
+inherit base flag-o-matic toolchain-funcs udev
MY_P="Argyll_V${PV}"
+
DESCRIPTION="Open source, ICC compatible color management system"
HOMEPAGE="http://www.argyllcms.com/"
SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc"
-RDEPEND="media-libs/tiff
- virtual/jpeg
+RDEPEND="
+ media-libs/tiff
sys-libs/zlib
+ virtual/jpeg
x11-libs/libX11
x11-libs/libXau
x11-libs/libXdmcp
@@ -34,7 +36,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${P}-jpeg.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.0-jpeg.patch"
+ "${FILESDIR}/${PN}-1.4.0-CVE-2012-4405.patch"
+ )
src_compile() {
# Make it respect LDFLAGS
@@ -47,43 +52,46 @@ src_compile() {
local jobnumber=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
[ ${jobnumber} ] || jobnumber=-j1
- jam -q -fJambase ${jobnumber} || die
+ append-cflags -DUNIX -D_THREAD_SAFE
+
+ sed \
+ -e 's:CCFLAGS:CFLAGS:g' \
+ -e "s:ar rusc:$(tc-getAR) rusc:g" \
+ -i Jambase || die
+
+ tc-export CC RANLIB
+
+ jam -dx -fJambase ${jobnumber} || die
}
src_install() {
- jam -q -fJambase install || die
+ jam -dx -fJambase install || die
rm bin/License.txt || die
- cd bin || die
+ pushd bin > /dev/null
local binname
for binname in * ; do
newbin ${binname} argyll-${binname}
done
- cd .. || die
+ popd > /dev/null
- if use doc; then
- dohtml doc/*
- fi
+ use doc && dohtml doc/*
dodoc log.txt Readme.txt ttbd.txt notes.txt
- insinto /usr/share/${PN}/ref
- doins ref/*
+ insinto /usr/share/${PN}
+ doins -r ref
udev_dorules libusb/55-Argyll.rules
}
pkg_postinst() {
- elog "To avoid file collisions, all binary names have been prefixed"
- elog "with \"argyll-\". E.g., the \"refine\" program is now called"
- elog "\"argyll-refine\"."
- elog
elog "If you have a Spyder2 you need to extract the firmware"
elog "from the CVSpyder.dll of the windows driver package"
elog "and store it as /usr/share/color/spyd2PLD.bin"
- elog
+ echo
elog "For further info on setting up instrument access read"
elog "http://www.argyllcms.com/doc/Installing_Linux.html"
- elog
+ echo
}
diff --git a/media-gfx/argyllcms/metadata.xml b/media-gfx/argyllcms/metadata.xml
index 91f4e72fb544..1470e032181b 100644
--- a/media-gfx/argyllcms/metadata.xml
+++ b/media-gfx/argyllcms/metadata.xml
@@ -1,7 +1,7 @@
-
- maintainer-needed@gentoo.org
-
+
+ maintainer-needed@gentoo.org
+
diff --git a/media-gfx/dispcalgui/Manifest b/media-gfx/dispcalgui/Manifest
index 6c6cab3d4e9f..08a0e13e525e 100644
--- a/media-gfx/dispcalgui/Manifest
+++ b/media-gfx/dispcalgui/Manifest
@@ -1,3 +1,4 @@
DIST dispcalGUI-0.9.9.1.tar.gz 3225111 SHA256 17323641e7b54d1b3882a09b0a7ce6b4260e82d9682f38ea0374605cf7f22e5b SHA512 1cfbe2d55171bf71db61bc96e7ab2c5d8e83c7e02ae7e5d0bf6cd698802d9e8212f50996cc3ba8e304a5a2ddffb6da537f0776e02d2bbcbcbb51b6a3dac66bdd WHIRLPOOL 49794a0a36625c99be7f9d007421cb01efed89bffe7a1b9495b8016dcc564ea821c36b2bf675df9dbe225a5ed6f6ae08534e63c9c8fb66020e839ef6d3a8df9c
DIST dispcalGUI-1.1.0.0.tar.gz 3274797 SHA256 467f52c62af56149732468cd18131483ceafd8f622b990cd0e6dd3637f170613 SHA512 977b8cf563fa6c59d51ed7400c3cffa9427d9892cc5d7db0392babb4f2f2085e63de2e86c74a816f05c32b503013eee70b1a3cace3d9ddaee8ff2ada9090989e WHIRLPOOL 132204006fbdc92d4997ae303a9dd4e2361dc03c8cf17f8342932f9a1fc208ebf2e39cfe711145d3d4b820d95b0b812823398c2f6d181a0cc481cc66ede164f9
DIST dispcalGUI-1.1.2.1.tar.gz 3278240 SHA256 24f58f10396e3e7fc2a39f273d8e7f208cc3c2bead9bfcb5294b2f07bf5e577c SHA512 76e5613cc06f218cef424b1ebfad6afce67cc5969016e920e09e15788ac2495e75b6fd508a4e344049cb988a3ed9ce9643c61e49010097390c090e7d2e249e2e WHIRLPOOL b78fb117ac37d6fb5c8587be22d72570e7fb1e6c1f409aa0cb6bc63d0bdf391d6cfeb076f797c7ea18a441125782f8e0f3658a0393a447c5a77dc67598f29754
+DIST dispcalGUI-1.1.2.9.tar.gz 3278916 SHA256 4bb3094e050261a928c49b72716db6c943b92844bdf8479946a9a2093bb444ef SHA512 45a4bb84a46d3b92bcbbbf21e1f9172992870f74b20bd1110fe51263b94ff3f8ca2d7fb7e7291fbb4c73d6c451f6180333480a4fc66c0c782d37ff856129353f WHIRLPOOL 119f46aa850f709de42b184e8e58f47778429d6bd06693c1ee195ef55ef5928e8a830b54c049d03765a37325e59aee37eac8ad7cc626e76a2e336f1cb1e2e4ef
diff --git a/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild b/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild
new file mode 100644
index 000000000000..dcee7bcd6eb5
--- /dev/null
+++ b/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild,v 1.1 2012/12/14 11:57:32 jlec Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
+
+inherit distutils fdo-mime
+
+MY_PN="dispcalGUI"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS"
+HOMEPAGE="http://dispcalgui.hoech.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-gfx/argyllcms-1.1.0
+ >=dev-python/wxpython-2.8.10.1
+ >=x11-libs/libX11-1.3.3
+ >=x11-apps/xrandr-1.3.2
+ >=x11-libs/libXxf86vm-1.1.0
+ >=x11-proto/xineramaproto-1.2
+ >=x11-libs/libXinerama-1.1"
+RDEPEND="${DEPEND}
+ >=dev-python/numpy-1.2.1"
+
+# Just in case someone renames the ebuild
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+ README.html
+)
+
+src_prepare() {
+# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+ cd "${S}/dispcalGUI" || die "Cannot cd to source directory."
+ sed -e 's/if which(\"xdg-icon-resource\"):/if which(\"xdg-icon-resource-non-existant\"):/' \
+ -e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
+ -i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
+
+# Remove deprecated Encoding key from .desktop file
+ cd "${S}" || die "Cannot cd to work directory."
+ for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
+ sed -e '/Encoding=UTF-8/d' -i "${offendingFile}" || \
+ die "removing deprecated Encoding key from .desktop files failed"
+ done
+
+ distutils_src_prepare
+}
+
+src_install() {
+ distutils_src_install
+ #remove udev files
+ rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+}
+
+pkg_postinst() {
+# Run xdg-* programs the Gentoo way since we removed this functionality from the original package
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+ distutils_pkg_postinst
+}
+
+pkg_postrm() {
+# Run xdg-* programs the Gentoo way since we removed this functionality from the original package
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+ distutils_pkg_postrm
+}
diff --git a/media-gfx/dispcalgui/metadata.xml b/media-gfx/dispcalgui/metadata.xml
index 37c471e3b3cc..7e7422e80efc 100644
--- a/media-gfx/dispcalgui/metadata.xml
+++ b/media-gfx/dispcalgui/metadata.xml
@@ -1,18 +1,17 @@
-proxy-maintainers
-
-opensource@andmarios.com
-Marios Andreopoulos
-Maintainer.
-
-
-hwoarang@gentoo.org
-Markos Chandras
-Proxy maintainer.
-
-
+ proxy-maintainers
+
+ opensource@andmarios.com
+ Marios Andreopoulos
+ Maintainer.
+
+
+ hwoarang@gentoo.org
+ Markos Chandras
+ Proxy maintainer.
+
+
-
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 44d3dab3e9cc..0ac2cae25f67 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,7 +1,4 @@
-DIST fldigi-3.21.42.tar.gz 1665053 SHA256 864ffdab48e352116347fef80bd34e6b1c55ac35b83b9770767da3827e7d639e SHA512 5cc641e2aea8b94044cc65f59785b09b8c7acd4e5152c650fec2ab942b1e99b577cd18fed2d66c63a72648ddafa5a14d5eeeabe860a3453df5580b8a0c9ec272 WHIRLPOOL 12d0e5aecdbcb668e91529e5ff1884b75ea9dfee3e503a838c3889d22ff9ef113f64b4430c4b973a1056d9700c30b2af08f5c9cbbbba8eaeaa8f9e5b7bfbe00a
DIST fldigi-3.21.50.tar.gz 1790564 SHA256 244921f705f70cd48e2ade44f853a7e092775f7a61d3e214f5faaf74853606c5 SHA512 4852528590192758711b59a201ef5af5c9469b5fc4007b75cca783877d45de3091f930395ee02446c81bc6a433a58006ebc0a2cecc4f01dff49594c5ee983126 WHIRLPOOL b89b026e64c227e30da18fc8059b81e8937e805013cebb6cc28ccef97d4a4b061b8d63ee74b2c8efa993f60c68672db2a57f2e5a0f184b2015b817f38faab73b
-DIST fldigi-3.21.58.tar.gz 1794407 SHA256 99dfe1fbda0b2a7d9a49f0db7757dc8f8223a77ef95208b0ec1dc7b1ad8ac8af SHA512 c9d5c3c37dbb36ba04138fb7ef0cfbf8c0b221b2e1d3fbd8f3d47d9bfb47e42f90d45bffbaaf1cd5d801316acee7e1bdd827c60caac79a665f73f93cf0c7cb08 WHIRLPOOL b8f8024fb4e3ca242b4b67786fa370cdb9f334227feacc91468b5f8c55b8a13357550e83311183cbc51dcfb4fb8422dfabcc072264a8c5b0fdcadea22901c840
-DIST fldigi-3.21.59.tar.gz 2105081 SHA256 0b87722b2931ba9ee60a002459f320e1cdbb80a1fec6b1242bb2bb8ef415d212 SHA512 e633b1cee9f10ba5c56157d59b7cca515c3f13a33d46e9aec8a9b36890fa7a3de3332a94fb1be8ba0186555ed2382c3464a3cb9076e7a608ef39566c71b67f67 WHIRLPOOL 4f73555d3615f92a7a9c1dd0121fca119be04746ef726a8c9aea161883aff3c6c318d7b0ccf0e995097a8a027f521385205afcbf4686225c4a23b56ae8b9b8ce
DIST fldigi-3.21.60.tar.gz 2120677 SHA256 72bbd9f1066642671fa50736224c186c2d4874f20548d304e84194d3609b1a1b SHA512 3051923f4f56828b45e5e1413b40607dc4ccbfca420105a0513cd0ec6e58341736711400e58a2388dda9ccd62a80c6ba0937a5f1dd73aaff0fb75ec7d4f704b6 WHIRLPOOL 590f3b5b7d1958b725a741b00c60c02d0c90621e41cfb15ed9e348b8acb764e5460b6e442454608343cb52f6f95fe6ae38293b30f666fbedc3bb452407c81a5c
DIST fldigi-3.21.61.tar.gz 2119162 SHA256 a00ef5e5b500ea55d7f179dfc4ec172fc2db147499c0665fd76825e5d370e709 SHA512 aa0f2d40ec18698fe67fdbd1210aea530083b7162519a9d1835a9d28b38b190b34e6f0757966042b98591a99ab4abef16f70bcc5e07ce6b3425db321efbdcac3 WHIRLPOOL e817dd3a55f226d02538d7bc332940db4e954ca4ef04330d9b7571999fd4da1e6dfba89ea1b2f4077b6ba5052ffcdcbf34093c217757a637c1c855332a8877ea
DIST fldigi-3.21.62.tar.gz 2122596 SHA256 82d7882e8a7033d60dbcecdf24449ac33248cb2fbac3d46f0d6a8affff1d5d51 SHA512 acf3432a5dfe4af70da6e9d85350b8240a0b73786268cef9913bc829e188f28c0b1ec11762b9999a9ae52ff8f48cf4abc1251dfbcc52b19fadc9f10a89dbe0c0 WHIRLPOOL d953e45e48a0ea83840f869fac68dc8052d8d30b9dc0d604e4ecce656ec54286adb492c61f390ebe81ba9fb621d3dd700554dd4f47832548735c5a1a6472d55c
diff --git a/media-radio/fldigi/fldigi-3.21.42.ebuild b/media-radio/fldigi/fldigi-3.21.42.ebuild
deleted file mode 100644
index 5534d9ccf69a..000000000000
--- a/media-radio/fldigi/fldigi-3.21.42.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.21.42.ebuild,v 1.3 2012/06/17 21:43:40 jdhore Exp $
-
-EAPI=4
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile xmlrpc"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
- media-libs/libsamplerate
- media-libs/libpng
- x11-misc/xdg-utils
- hamlib? ( media-libs/hamlib )
- portaudio? ( >=media-libs/portaudio-19_pre20071207 )
- pulseaudio? ( media-sound/pulseaudio )
- sndfile? ( >=media-libs/libsndfile-1.0.10 )
- xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] =media-libs/portaudio-19_pre20071207 )
- pulseaudio? ( media-sound/pulseaudio )
- sndfile? ( >=media-libs/libsndfile-1.0.10 )
- xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss] =media-libs/portaudio-19_pre20071207 )
- pulseaudio? ( media-sound/pulseaudio )
- sndfile? ( >=media-libs/libsndfile-1.0.10 )
- xmlrpc? ( || ( >=dev-libs/xmlrpc-c-1.18.02[abyss]
- maintainer-needed@gentoo.org
- Default assignee for orphaned packages
+ alonbl@gentoo.org
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
index 7eee381fc69e..013ecfa8157a 100644
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.52.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/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild,v 1.2 2012/10/28 12:09:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild,v 1.4 2012/12/14 09:23:59 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://cybione.org/~${PN}/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=net-irc/irssi-0.8.13
diff --git a/net-libs/farsight2/metadata.xml b/net-libs/farsight2/metadata.xml
index fd474b76ff67..8f916372dcdf 100644
--- a/net-libs/farsight2/metadata.xml
+++ b/net-libs/farsight2/metadata.xml
@@ -3,8 +3,4 @@
voip
gnome
-
-
diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml
index 61237848d342..e3bc0d794290 100644
--- a/net-libs/farstream/metadata.xml
+++ b/net-libs/farstream/metadata.xml
@@ -6,7 +6,5 @@
-
diff --git a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
index 2ba67b6ab8ff..025e70d5a5c3 100644
--- a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20110808-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/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild,v 1.7 2012/03/25 22:59:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild,v 1.8 2012/12/14 16:46:27 blueness Exp $
EAPI=4
inherit eutils toolchain-funcs multilib
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
IUSE="static-libs"
src_prepare() {
diff --git a/net-libs/libnice/metadata.xml b/net-libs/libnice/metadata.xml
index 89d331205888..e56e3df5ef9f 100644
--- a/net-libs/libnice/metadata.xml
+++ b/net-libs/libnice/metadata.xml
@@ -3,8 +3,4 @@
gnome
voip
-
-
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 25aff6d3448f..05e3b6b3fe79 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,3 +1,4 @@
DIST node-v0.6.21.tar.gz 10235165 SHA256 22265fd07e09c22f1d058156d548e7398c9740210f534e2f848eeab5b9772117 SHA512 b00908576986741a2c10d00fb9ae4b97c8a8bd8e5937fc196b13bab80098b07f1f5eb2d0e67a1dd1d6d56acf45e4e847a60325501d9db3f02ddebf94e5393d5f WHIRLPOOL 1fa1d71ed761cb9fcef9b3bb0c640075349e0ccc67951e4554de200fd4091051d5b9b56f8d0cf28088df5ca2e9d1b0600e4a44ccf920b01ec570300f2bc38c95
DIST node-v0.8.15.tar.gz 11867033 SHA256 1758639c6df3e081fe26585472d0f1961c5703b44ba6c57ecdf66a4c015792b1 SHA512 be312f86f75db32515c62c3573b0661f884ddc0463df4784ddc591e88f527486e3baf10b10df72240fb358b79f0b0ffcc60560e58103e3f6ac351b8ebe66284d WHIRLPOOL 78978789c048673e6aced0d47b5c01c1d1ab9980215be186c6077273eae089219fba4c7213b7c19a74eaec43e759f4161c6cf52612be4277a160037b9751690c
DIST node-v0.8.16.tar.gz 11899509 SHA256 2cd09d4227c787d6886be45dc54dad5aed779d7bd4b1e15ba930101d9d1ed2a4 SHA512 2c068b240bfc303a8d8c50c28c038cfe5158436483395be83d7b0c768e9ef7a74924aa888c66e20b6e4314752e79b856e5db7ecbd21a34f2919b267065389f44 WHIRLPOOL 54b1baa80cfa9d52aeacce1794e1557b5fb45bd03be0b1d2ca284ee4b60f4dbbbd06ae7735838ffac4e625f0c3b248f2da22fe6588d994709bcdf266d9488d62
+DIST node-v0.9.3.tar.gz 12481901 SHA256 7e1750cd47d7b8c13c7cf12457b6a528fa2abf8a10b7c9a35c13ed47cebaab41 SHA512 2e2670832a5838fdffa58a8b1a0afd57d79dc76f92ea319761e35e91fb1495409f793c8080e7de581368520afc5677530b5ad8b97eaa733fe27eeb2a6746fdde WHIRLPOOL 8e9bf4bb605c39fc0b8d13bcf0570e4e34b04e5b363fc98d8eb7f24e3943dd0ec6d5c21347732bf1d5b7d39e6a9a84bbd10aa223fe8a11c1b332b120ba58ce48
diff --git a/net-libs/nodejs/nodejs-0.9.3-r1.ebuild b/net-libs/nodejs/nodejs-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..18be3071e0b3
--- /dev/null
+++ b/net-libs/nodejs/nodejs-0.9.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.9.3-r1.ebuild,v 1.3 2012/12/14 08:46:30 patrick Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+
+inherit python eutils multilib pax-utils
+
+# omgwtf
+RESTRICT="test"
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/v8-3.11.10:=
+ dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # fix compilation on Darwin
+ # http://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+}
+
+src_configure() {
+ # this is an autotools lookalike confuserator
+ ./configure --shared-v8 --prefix="${EPREFIX}"/usr --shared-v8-includes="${EPREFIX}"/usr/include --openssl-use-sys --shared-zlib || die
+}
+
+src_compile() {
+ emake || die
+}
+
+src_install() {
+ docompress -x /lib/node_modules/npm/man
+ local MYLIB=$(get_libdir)
+ mkdir -p "${ED}"/usr/include/node
+ mkdir -p "${ED}"/usr/bin
+ mkdir -p "${ED}"/usr/"${MYLIB}"/node_modules/npm
+ mkdir -p "${ED}"/usr/"${MYLIB}"/node
+ cp 'src/eio-emul.h' 'src/ev-emul.h' 'src/node.h' 'src/node_buffer.h' 'src/node_object_wrap.h' 'src/node_version.h' "${ED}"/usr/include/node || die "Failed to copy stuff"
+ cp -R deps/uv/include/* "${ED}"/usr/include/node || die "Failed to copy stuff"
+ cp 'out/Release/node' "${ED}"/usr/bin/node || die "Failed to copy stuff"
+ cp -R deps/npm/* "${ED}"/usr/"${MYLIB}"/node_modules/npm || die "Failed to copy stuff"
+
+ # now add some extra stupid just because we can
+ # needs to be a symlink because of hardcoded paths ... no es bueno!
+ dosym /usr/"${MYLIB}"/node_modules/npm/bin/npm-cli.js /usr/bin/npm
+ pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+ emake test || die
+}
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index becb48ac1e8d..804a8911c6ec 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,3 +1,2 @@
-DIST csync-0.50.8.tar.bz2 1332970 SHA256 878be8a78fd7f1e1482d5d40d584ffadcd8cefb5106726f1a70b07ce0daee2cf SHA512 e185b385e5b257953678687e40ad7dc49ac5c6265c50715e519e63f96b1c6e4900201ad5b85542f47a778fc601e52ed692aebfbc2cff0eed4adcee3100ca3f87 WHIRLPOOL 7a4ecc329fed80edda381e4799fbd64da75a2dd02b1cb6bc40975104dc793e154c6bd9cc898ff1e69335a90f139af72bf2526f7177b3bc40e8ee2ed41d464db0
-DIST ocsync-0.60.0.tar.bz2 2065335 SHA256 3f43d4d349bd46fe8c80c27073bd578ce1931fa9c4e8cc7aaa1eb204d9c2a2a6 SHA512 aadbdd9d70827557eb83b7eb325b68be8399293409886a23b54aae5b5b55b74eb7c6ab79c043f2a1ea8a49633692a1bdc0829847125f4a45910869f2e5b079f9 WHIRLPOOL 824cf9835b5e03dc71d07c21308adc0f33473bec3be4d3f648edfb506402ab11e08c5ce822fe8055acf8adb8b7a4a947962c29d1c140c7bab789eb810c3b4e8d
DIST ocsync-0.60.1.tar.bz2 2101539 SHA256 8ef3ecd717030fab2bf1a5b94d9145de755454334bf97bd0929cec1997ad82d6 SHA512 59e0304121799509edba8b81a468515dab53ff96d680a8c32480e82817c17d364d6c9806b4ec3c5c9984df0b03d2cca290df5a3244a92d9e6c5fd6afa32e335e WHIRLPOOL 243ed110a67ec3d08d5dbeba5b8a3bdd013df5b491dfc3af2e626146c7a761071a5ad4032998d5363fdc9c02faba8ae2a8e4fbfa166884bed4699b955ead138b
+DIST ocsync-0.60.3.tar.bz2 2102126 SHA256 86d431f33207d6b082c2f0ddad8b0880461b37c938c927802408867e87928fad SHA512 1ec324ded7a7bda08f3d6a4f68335b478797cf5497b7df4bfec45c2c5c4ce8faf62331559a1e940bda93e5e40724266670ff11fccc84753b0f8fcdf8f5bf4ce7 WHIRLPOOL 36afd7a26fd62bfee0f0912d4c892079854a39fea020e1a36fa059b6be6e9a68e0e632d2dafcfe4ce99a563f03a4af18664f6e338154264e4d10a111f3bd8964
diff --git a/net-misc/csync/csync-0.50.8.ebuild b/net-misc/csync/csync-0.50.8.ebuild
deleted file mode 100644
index b27f1cd34e04..000000000000
--- a/net-misc/csync/csync-0.50.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.50.8.ebuild,v 1.4 2012/08/28 13:21:00 scarabeus Exp $
-
-EAPI=4
-
-inherit base cmake-utils
-
-DESCRIPTION="A file synchronizer especially designed for you, the normal user"
-HOMEPAGE="http://csync.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc log samba +sftp test +webdav"
-
-RDEPEND="
- dev-db/sqlite:3
- >=dev-libs/iniparser-3.1
- dev-libs/openssl:0
- log? ( dev-libs/log4c )
- samba? ( net-fs/samba )
- sftp? ( net-libs/libssh )
- webdav? ( net-libs/neon )
-"
-DEPEND="${DEPEND}
- app-text/asciidoc
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-automagicness.patch"
-)
-
-src_prepare() {
- base_src_prepare
-
- # punt owncloud test as it uses weird cmocka framework
- sed -i \
- -e 's:add_subdirectory(ownCloud)::' \
- tests/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOG_TO_CALLBACK=ON"
- $(cmake-utils_use test UNIT_TESTING)
- $(cmake-utils_use_with doc APIDOC)
- $(cmake-utils_use_with log Log4C)
- $(cmake-utils_use_with samba Libsmbclient)
- $(cmake-utils_use_with sftp LibSSH)
- $(cmake-utils_use_with webdav Neon)
- )
- cmake-utils_src_configure
-}
diff --git a/net-misc/csync/csync-0.60.0-r1.ebuild b/net-misc/csync/csync-0.60.3.ebuild
similarity index 77%
rename from net-misc/csync/csync-0.60.0-r1.ebuild
rename to net-misc/csync/csync-0.60.3.ebuild
index c12541ce586e..77346e76c245 100644
--- a/net-misc/csync/csync-0.60.0-r1.ebuild
+++ b/net-misc/csync/csync-0.60.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/net-misc/csync/csync-0.60.0-r1.ebuild,v 1.1 2012/10/17 06:30:20 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/csync/csync-0.60.3.ebuild,v 1.1 2012/12/14 17:18:48 creffett Exp $
EAPI=4
@@ -27,11 +27,12 @@ RDEPEND="
DEPEND="${DEPEND}
app-text/asciidoc
doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
+ test? ( dev-util/cmocka )
"
PATCHES=(
- "${FILESDIR}/${PN}-automagicness.patch"
+ "${FILESDIR}/${PN}-0.60.2-automagicness.patch"
+ "${FILESDIR}/${PN}-0.60.2-removebadtest.patch"
)
S="${WORKDIR}/o${P}"
@@ -39,10 +40,12 @@ S="${WORKDIR}/o${P}"
src_prepare() {
base_src_prepare
- # punt owncloud test as it uses weird cmocka framework
- sed -i \
- -e 's:add_subdirectory(ownCloud)::' \
- tests/CMakeLists.txt || die
+ if ! use doc; then
+ sed -i \
+ -e 's:add_subdirectory(doc)::' \
+ CMakeLists.txt || die
+ fi
+
# proper docdir
sed -i \
-e "s:/doc/ocsync:/doc/${PF}:" \
diff --git a/net-misc/csync/files/csync-0.60.2-automagicness.patch b/net-misc/csync/files/csync-0.60.2-automagicness.patch
new file mode 100644
index 000000000000..426d83097e64
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.2-automagicness.patch
@@ -0,0 +1,102 @@
+--- ocsync-0.60.2/cmake/Modules/MacroOptionalFindPackage.cmake
++++ ocsync-0.60.2/cmake/Modules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,47 @@
++# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
++# MACRO_OPTIONAL_FIND_PACKAGE( [QUIT] )
++# This macro is a combination of OPTION() and FIND_PACKAGE(), it
++# works like FIND_PACKAGE(), but additionally it automatically creates
++# an option name WITH_, which can be disabled via the cmake GUI.
++# or via -DWITH_=OFF
++# The standard _FOUND variables can be used in the same way
++# as when using the normal FIND_PACKAGE()
++
++# Copyright (c) 2006-2010 Alexander Neundorf,
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++# This is just a helper macro to set a bunch of variables empty.
++# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
++macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
++ if(DEFINED ${_name}_${_var})
++ set(${_name}_${_var} "")
++ endif(DEFINED ${_name}_${_var})
++
++ string(TOUPPER ${_name} _nameUpper)
++ if(DEFINED ${_nameUpper}_${_var})
++ set(${_nameUpper}_${_var} "")
++ endif(DEFINED ${_nameUpper}_${_var})
++endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
++
++
++macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
++ option(WITH_${_name} "Search for ${_name} package" ON)
++ if (WITH_${_name})
++ find_package(${_name} ${ARGN})
++ else (WITH_${_name})
++ string(TOUPPER ${_name} _nameUpper)
++ set(${_name}_FOUND FALSE)
++ set(${_nameUpper}_FOUND FALSE)
++
++ _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
++ _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
++ _mofp_set_empty_if_defined(${_name} INCLUDES)
++ _mofp_set_empty_if_defined(${_name} LIBRARY)
++ _mofp_set_empty_if_defined(${_name} LIBRARIES)
++ _mofp_set_empty_if_defined(${_name} LIBS)
++ _mofp_set_empty_if_defined(${_name} FLAGS)
++ _mofp_set_empty_if_defined(${_name} DEFINITIONS)
++ endif (WITH_${_name})
++endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
+
+--- ocsync-0.60.2/CMakeLists.txt
++++ ocsync-0.60.2/CMakeLists.txt
+@@ -38,8 +38,9 @@
+ # add macros
+ include(MacroAddPlugin)
+ include(MacroCopyFile)
++include(MacroOptionalFindPackage)
+
+-find_package(Log4C)
++macro_optional_find_package(Log4C)
+ find_package(CMocka)
+ if (CMOCKA_FOUND AND UNIT_TESTING)
+ include(AddCMockaTest)
+
+--- ocsync-0.60.2/DefineOptions.cmake
++++ ocsync-0.60.2/DefineOptions.cmake
+@@ -1,4 +1,3 @@
+-option(WITH_LOG4C "Build csync without log4c" ON)
+ option(UNIT_TESTING "Build with unit tests" OFF)
+ option(MEM_NULL_TESTS "Enable NULL memory testing" OFF)
+ option(LOG_TO_CALLBACK "Enable extended logging through a callback" OFF)
+
+--- ocsync-0.60.2/doc/CMakeLists.txt
++++ ocsync-0.60.2/doc/CMakeLists.txt
+@@ -2,7 +2,10 @@
+ # Build the documentation
+ #
+
+-include(UseDoxygen OPTIONAL)
++option(WITH_APIDOC "Use doxygen to generate documentation" ON)
++if (WITH_APIDOC)
++ include(UseDoxygen OPTIONAL)
++endif (WITH_APIDOC)
+
+ file(GLOB _manpages *.[0-9].txt)
+ add_custom_target(man
+
+--- ocsync-0.60.2/modules/CMakeLists.txt
++++ ocsync-0.60.2/modules/CMakeLists.txt
+@@ -1,8 +1,8 @@
+ project(modules C)
+
+-find_package(Libsmbclient)
+-find_package(LibSSH 0.4.0)
+-find_package(Neon)
++macro_optional_find_package(Libsmbclient)
++macro_optional_find_package(LibSSH 0.4.0)
++macro_optional_find_package(Neon)
+
+ set(PLUGIN_VERSION_INSTALL_DIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
+
diff --git a/net-misc/csync/files/csync-0.60.2-removebadtest.patch b/net-misc/csync/files/csync-0.60.2-removebadtest.patch
new file mode 100644
index 000000000000..5b8a3a6e96b1
--- /dev/null
+++ b/net-misc/csync/files/csync-0.60.2-removebadtest.patch
@@ -0,0 +1,9 @@
+--- a/tests/vio_tests/check_vio.c
++++ b/tests/vio_tests/check_vio.c
+@@ -505,7 +505,6 @@
+ unit_test_setup_teardown(check_csync_vio_mkdirs_some_exist, setup_dir, teardown),
+ unit_test_setup_teardown(check_csync_vio_rmdir, setup, teardown),
+ unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown),
+- unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown),
+ unit_test(check_csync_vio_closedir_null),
+ unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown),
diff --git a/net-misc/mirall/Manifest b/net-misc/mirall/Manifest
index dbc6dbe3b359..975076a120be 100644
--- a/net-misc/mirall/Manifest
+++ b/net-misc/mirall/Manifest
@@ -1,3 +1 @@
-DIST mirall-1.0.5.tar.bz2 789362 SHA256 07880de327f7f377c19521064bda466bbc26cad6c73848f7ce369a22c059ba41 SHA512 926b77a3c51b5f72c874853ee742aaea6f7debb0df48a614d04ba1e7eb016261a80abc8d4e59f67da6a96533bbfe5a0352bfd5f5f0fe67ff60c6202438a70936 WHIRLPOOL d9f53e45c04bc0b721a4a20a063a43efc9cc943f67b94d0cd29621c523296fb40850d3f620fdc43a50e4521b4cce7e770ffdd9982b4f2384c8123ada4b8051d6
-DIST mirall-1.1.0.tar.bz2 833165 SHA256 69d2f3ff300303b5055b08713a8104cbd6afaf80fc82ccdcf2260097cf5166a3 SHA512 7fedd190244c90f5572aa48d4e4c0161e659b8d35d60ab9bd10c6f56c0b1908d2217ca0ac1e742c2e48209b070746887052a976a580066358d0574cc4cbc4a08 WHIRLPOOL a213e82008c893704eb9ca6f920f3d36ad4fae48265758749f092d83d8a3fb627c0e4af7040f47f17eb944a8c3c85c5e76bb6d77ef842d53d33c85b7ac8bc32e
-DIST mirall-1.1.1.tar.bz2 920900 SHA256 c3989084a820134c042f7825e86d6296e2b226c9048193dd5edfdd3c387c4d30 SHA512 3fe794ba915bd72fb0e7c7895111e6dd76cc8235fc397786b015b0fd7ebdd7a92d250be334a6584787fea1fdfa63780c95d6fc2abf0bb0f8f2ed9586c4695a01 WHIRLPOOL bcfad964fc4dd6851739610ee540daa493aeb863ebd39e2b5c7fbfab13aac3aa1242ec7d69a931a19cee15a903b1a119227ce683d2fa0adcf5282fb1cc4bfec0
+DIST mirall-1.1.2.tar.bz2 940514 SHA256 da9665dd49d5741b7632a0f320ff0cb2ccadbb336ee68fe128dfae90fffa0ee9 SHA512 bb4d237c01c204bfdf7feb8f7af6abfe69adcce33823a34ace963ae584294eb6d7e5811cbeeeffef033ba8a4a7d835707833b3c16eb2ae09d2a5f96adb6f2f31 WHIRLPOOL 8fa573acf7be489bd61958c801725237e164b2c9c3b3e2f86092fe6c1ae443c2455107bdc736b39459863eb1bab2e0a4e92a01ae79ab8cfd5f7275fc253dcae4
diff --git a/net-misc/mirall/metadata.xml b/net-misc/mirall/metadata.xml
index c228c6403977..a23f444b67d6 100644
--- a/net-misc/mirall/metadata.xml
+++ b/net-misc/mirall/metadata.xml
@@ -2,9 +2,4 @@
kde
-
-
diff --git a/net-misc/mirall/mirall-1.0.5.ebuild b/net-misc/mirall/mirall-1.0.5.ebuild
deleted file mode 100644
index 541f0928063e..000000000000
--- a/net-misc/mirall/mirall-1.0.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.0.5.ebuild,v 1.4 2012/10/09 14:14:43 scarabeus Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronization of your folders with another computers"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- net-misc/csync[sftp,samba,webdav]
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- x11-libs/qt-test:4
-"
-DEPEND="${RDEPEND}"
diff --git a/net-misc/mirall/mirall-1.1.0.ebuild b/net-misc/mirall/mirall-1.1.0.ebuild
deleted file mode 100644
index aea3ff0ced39..000000000000
--- a/net-misc/mirall/mirall-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.0.ebuild,v 1.2 2012/10/15 08:19:54 scarabeus Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronization of your folders with another computers"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=net-misc/csync-0.60.0[sftp,samba,webdav]
- x11-libs/qt-core:4
- x11-libs/qt-gui:4
- x11-libs/qt-test:4
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Yay for fcked detection.
- export CSYNC_DIR="${EPREFIX}/usr/include/ocsync/"
-}
diff --git a/net-misc/mirall/mirall-1.1.1-r1.ebuild b/net-misc/mirall/mirall-1.1.2.ebuild
similarity index 53%
rename from net-misc/mirall/mirall-1.1.1-r1.ebuild
rename to net-misc/mirall/mirall-1.1.2.ebuild
index 70b951fdad48..f3b2cbc38a5d 100644
--- a/net-misc/mirall/mirall-1.1.1-r1.ebuild
+++ b/net-misc/mirall/mirall-1.1.2.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.1-r1.ebuild,v 1.2 2012/11/30 06:02:43 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mirall/mirall-1.1.2.ebuild,v 1.1 2012/12/14 17:23:18 creffett Exp $
-EAPI=4
+EAPI=5
LANG_DIR="translations"
-PLOCALES="af ar ar_SA bg_BG ca cs_CZ da de el en eo es es_AR et_EE eu eu_ES fa fi fi_FI fr gl he hi hr hu_HU hy ia id id_ID it ja_JP ko lb lt_LT lv mk nb_NO nl nn_NO oc pl pl_PL pt_BR pt_PT ro ru ru_RU sk_SK sl sr sr@latin sv tr uk vi zh_CN zh_TW"
+PLOCALES="ca cs_CZ da de el en eo es es_AR et_EE eu fa fi_FI fr gl he hr hu_HU it ja_JP ko lb lt_LT mk
+nb_NO nl oc pl pt_BR pt_PT ro ru ru_RU sk_SK sl sr@latin sv ta_LK tr uk vi zh_CN zh_TW"
inherit cmake-utils l10n
DESCRIPTION="Synchronization of your folders with another computers"
@@ -15,10 +16,10 @@ SRC_URI="http://download.owncloud.com/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="samba +sftp +webdav"
+IUSE=""
RDEPEND="
- >=net-misc/csync-0.60.0[sftp=,samba=,webdav=]
+ >=net-misc/csync-0.60.2
x11-libs/qt-core:4
x11-libs/qt-gui:4
x11-libs/qt-test:4
@@ -36,3 +37,12 @@ src_prepare() {
fi
done
}
+
+pkg_postinst() {
+ if ! has_version net-misc/csync[samba]; then
+ elog "For samba support, build net-misc/csync with USE=samba"
+ fi
+ if ! has_version net-misc/csync[sftp]; then
+ elog "For sftp support, build net-misc/csync with USE=sftp"
+ fi
+}
diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index d3ace33ac5c9..23c0a9013b2c 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/metadata.xml
@@ -11,7 +11,6 @@
Enable NAT Port Mapping Protocol
Compile tor with hardening on vanilla compilers/linkers
Enable transparent proxying
- Enable Universal Plug and Play
Enable tor2web support
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index bc4d2a6c9596..5eee9c15ed52 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1 +1 @@
-DIST aMule-2.3.1.tar.bz2 4565232 RMD160 7bc5ceea196f9ba0aa0687a694cc82354a0210fc SHA1 25bcef92b06cb34849afaf052e2cd66b4a8454c2 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
+DIST aMule-2.3.1.tar.bz2 4565232 SHA256 d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
index 3a6295810631..3b8b3e7244bf 100644
--- a/net-p2p/amule/metadata.xml
+++ b/net-p2p/amule/metadata.xml
@@ -6,6 +6,5 @@
Enable amule daemon
Enable remote controlling of the client
Enable statistic reporting
- Enables support for Intel UPnP stack.
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index 8960ca3d99be..1c83ca4f3952 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -14,6 +14,5 @@
Enable backported support for relaying and mining new BIP16 pay-to-script-hash transactions
Enable using lower fees accepted by Eligius
Enable generation of QR Codes for receiving payments
- Enable Universal Plug and Play
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 848f2d64c429..7239fb0389b8 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -13,6 +13,5 @@
Enable backported support for relaying and mining new BIP16 pay-to-script-hash transactions
Enable using lower fees accepted by Eligius
Use app-admin/logrotate for rotating logs
- Enable Universal Plug and Play
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index e6a69e14bb9c..e3a3071c3eb7 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -25,6 +25,5 @@
Enable JSON for cli and daemon
Enable sound notifications support over libcanberra in EiskaltDC++ Gtk
Don't install headers
- Forward ports using UPnP
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index 44e5142199b4..566ffb324a68 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -17,7 +17,6 @@
Search for torrents
Shutdown when done
Shows statistics about torrents in several graphs
- Forward ports using UPnP
Allows control of KTorrent via a web interface
Discover peers on the local network using the Zeroconf protocol
diff --git a/net-p2p/leechcraft-eiskaltdcpp/metadata.xml b/net-p2p/leechcraft-eiskaltdcpp/metadata.xml
index ee001f18d933..abfd6e924735 100644
--- a/net-p2p/leechcraft-eiskaltdcpp/metadata.xml
+++ b/net-p2p/leechcraft-eiskaltdcpp/metadata.xml
@@ -4,6 +4,5 @@
leechcraft
-
\ No newline at end of file
+
diff --git a/net-p2p/tribler/tribler-6.0.2.ebuild b/net-p2p/tribler/tribler-6.0.2.ebuild
index 471484766e86..43a9f88b0d95 100644
--- a/net-p2p/tribler/tribler-6.0.2.ebuild
+++ b/net-p2p/tribler/tribler-6.0.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/net-p2p/tribler/tribler-6.0.2.ebuild,v 1.2 2012/12/12 18:31:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.2.ebuild,v 1.3 2012/12/14 12:53:25 ago Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="vlc"
RDEPEND="
diff --git a/profiles/license_groups b/profiles/license_groups
index 6a40ae167bfa..944efa9b7bf4 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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/profiles/license_groups,v 1.148 2012/12/12 08:14:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.151 2012/12/14 20:07:03 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
# Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED
# TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation?
# BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath
-MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton psutils pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BSD-with-attribution BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL IJG imagemagick Info-ZIP ipadic Ispell JasPer2.0 jaxen JDOM JNIC JOVE libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton psutils pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.
diff --git a/profiles/package.mask b/profiles/package.mask
index d1cd8a3c808e..a06b659eed64 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14296 2012/12/13 17:07:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14299 2012/12/14 15:18:13 mgorny Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,13 @@
#--- END OF EXAMPLES ---
+# Andrey Grozin (14 Dec 2012)
+# Stuff from the lisp overlay, with some version bumps
+# Masked for testing
+>=dev-lisp/gentoo-init-1.0
+>=dev-lisp/asdf-2.26
+>=dev-lisp/sbcl-1.1.2
+
# Sebastien Fabbro (13 Dec 2012)
# Necessary removal to get rid of very unstable sci-libs/lapack-atlas
# Packages are in the science overlay
@@ -38,7 +45,7 @@
sci-astronomy/sextractor
sci-astronomy/scamp
-# Justin Lecher (5 Dec 2012)
+# Justin Lecher (13 Dec 2012)
# sci-libs/(lapack/blas)-altas will be removed due to
# fragile build and runtime behaviour #372323.
# Alternatives are sci-libs/lapack-reference & sci-libs/blas-reference.
@@ -82,18 +89,6 @@ mail-client/claws-mail-geolocation
# maked for testing
sci-libs/openmm
-# Michał Górny (30 Nov 2012)
-# Mask the cleaned up (-r1) Python ebuilds for testing.
-=dev-lang/python-2.5.4-r5
-=dev-lang/python-2.6.8-r1
-=dev-lang/python-2.7.3-r3
-=dev-lang/python-3.1.5-r1
-=dev-lang/python-3.2.3-r2
-=dev-lang/python-3.3.0-r1
-=dev-python/pypy-1.8-r2
-=dev-python/pypy-1.9-r2
-=dev-java/jython-2.5.3-r2
-
# Sebastian Pipping (27 Nov 2012)
# Masked for removal in 30 days.
# Licensing issues, turned out not distributable (bug #444332)
diff --git a/profiles/use.desc b/profiles/use.desc
index 2dce414f7d78..790c193c6212 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -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/profiles/use.desc,v 1.496 2012/12/01 11:18:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.497 2012/12/14 15:26:11 mgorny Exp $
# Keep them sorted
@@ -350,7 +350,8 @@ truetype - Adds support for FreeType and/or FreeType2 fonts
uclibc - Enable uclibc specific patches and build or link uclibc
udev - Enable sys-fs/udev integration (device discovery, power and storage device support, etc)
unicode - Adds support for Unicode
-upnp - Enable support for the Universal Plug and Play (UPnP) network protocol
+upnp - Enable UPnP port mapping support
+upnp-av - Enable UPnP audio/video streaming support
usb - Adds USB support to applications that have optional USB support (e.g. cups)
v4l - Enable support for video4linux (using linux-headers or userspace libv4l libraries)
vanilla - Do not add extra patches which change default behaviour; DO NOT USE THIS ON A GLOBAL SCALE as the severity of the meaning changes drastically
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5d790a328678..8a0b71b5ce0c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1502,6 +1502,7 @@ dev-lisp/gcl:custreloc - Build a GCL which uses custom GCL code for linking
dev-lisp/gcl:dlopen - Build a GCL which uses dlopen for linking
dev-lisp/gcl:gprof - Build a GCL with profiling support
dev-lisp/sbcl:asdf - Include support for dev-lisp/asdf in SBCL
+dev-lisp/sbcl:cobalt - mips only: use mipsel binary instead of mips big endian binary to bootstrap
dev-lisp/sbcl:ldb - Include support for the SBCL low level debugger
dev-lisp/sbcl:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
dev-lua/luarocks:curl - Uses net-misc/curl for fetching lua packages instead of net-misc/wget.
@@ -4179,9 +4180,7 @@ net-libs/daq:dump - Build the Dump data acquisition module. The dump DAQ allows
net-libs/daq:ipq - Build the IPQ data acquisition module. IPQ is the old way to process iptables packets for inline deployments. Snort can not run unprivileged when using this module.
net-libs/daq:nfq - Build the NFQ data acquisition module. NFQ is the new way to process iptables packets for inline deployments. Snort can not run unprivileged when using this module.
net-libs/daq:pcap - Build the PCAP data acquisition module.
-net-libs/farsight2:upnp - Enable UPnP IGD support
net-libs/farstream:introspection - Use dev-libs/gobject-introspection for introspection
-net-libs/farstream:upnp - Enable UPnP IGD support
net-libs/glib-networking:gnome - Extract HTTP/HTTPS/SOCKS proxy configuration stored using GSettings
net-libs/glib-networking:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration
net-libs/gnome-online-accounts:introspection - Use dev-libs/gobject-introspection for introspection
@@ -4209,7 +4208,6 @@ net-libs/libinfinity:server - Build and install the server binary including init
net-libs/libkgapi:oldpim - Allow the use of non-akonadi kdepim-4.4
net-libs/libkolabxml:csharp - Enable C# language bindings
net-libs/libmicrohttpd:messages - enable error messages
-net-libs/libnice:upnp - Enable UPnP IGD support
net-libs/libnids:glib - Use dev-libs/glib for multiprocessing support
net-libs/libnids:libnet - Include code requiring net-libs/libnet
net-libs/liboauth:bindist - Alias for the nss USE flag, since there are license compliancy trouble when using OpenSSL.
@@ -4511,8 +4509,6 @@ net-misc/mediatomb:mysql - Use dev-db/mysql as backend rather than SQLite3
net-misc/mediatomb:taglib - Use media-libs/taglib for reading files' metadata rather than id3lib
net-misc/mediatomb:thumbnail - Enables video thumbnails generation throughmedia-video/ffmpegthumbnailer
net-misc/memcached:slabs-reassign - Allow manual reassignment of memory slabs at the cost of slab optimizations.
-net-misc/mirall:sftp - Enable sftp transfer support via net-libs/libssh
-net-misc/mirall:webdav - Adds support for HTTP/dav content via net-libs/neon
net-misc/mosh:client - Build network client
net-misc/mosh:examples - Include example scripts
net-misc/mosh:mosh-hardening - Enable compiler and linker options to frustrate memory corruption exploits
@@ -4626,7 +4622,6 @@ net-misc/tor:nat-pmp - Enable NAT Port Mapping Protocol
net-misc/tor:stats - Enable to keep track of how much of each kind of resource we download
net-misc/tor:tor-hardening - Compile tor with hardening on vanilla compilers/linkers
net-misc/tor:transparent-proxy - Enable transparent proxying
-net-misc/tor:upnp - Enable Universal Plug and Play
net-misc/tor:web - Enable tor2web support
net-misc/uftp:server - Install uftp server daemon
net-misc/vde:pcap - Enable the pcap-based plugin that allows creating a switch against a real interface.
@@ -4682,16 +4677,13 @@ net-nntp/tin:gpg - Enable app-crypt/gpg support
net-p2p/amule:daemon - Enable amule daemon
net-p2p/amule:remote - Enable remote controlling of the client
net-p2p/amule:stats - Enable statistic reporting
-net-p2p/amule:upnp - Enables support for Intel UPnP stack.
net-p2p/bitcoin-qt:1stclassmsg - Enable first-class Bitcoin message tools
net-p2p/bitcoin-qt:bip16 - Enable backported support for relaying and mining new BIP16 pay-to-script-hash transactions
net-p2p/bitcoin-qt:eligius - Enable using lower fees accepted by Eligius
net-p2p/bitcoin-qt:qrcode - Enable generation of QR Codes for receiving payments
-net-p2p/bitcoin-qt:upnp - Enable Universal Plug and Play
net-p2p/bitcoind:bip16 - Enable backported support for relaying and mining new BIP16 pay-to-script-hash transactions
net-p2p/bitcoind:eligius - Enable using lower fees accepted by Eligius
net-p2p/bitcoind:logrotate - Use app-admin/logrotate for rotating logs
-net-p2p/bitcoind:upnp - Enable Universal Plug and Play
net-p2p/dbhub:switch_user - Enable support for switching user
net-p2p/deluge:setproctitle - Install dependencies needed for beautifying the process name
net-p2p/deluge:webinterface - Install dependencies needed for the web interface
@@ -4704,7 +4696,6 @@ net-p2p/eiskaltdcpp:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
net-p2p/eiskaltdcpp:json - Enable JSON for cli and daemon
net-p2p/eiskaltdcpp:libcanberra - Enable sound notifications support over libcanberra in EiskaltDC++ Gtk
net-p2p/eiskaltdcpp:minimal - Don't install headers
-net-p2p/eiskaltdcpp:upnp - Forward ports using UPnP
net-p2p/fms:frost - Add support for frost boards
net-p2p/freenet:freemail - Add Freemail support
net-p2p/gift:ares - pull in Ares plugin
@@ -4724,11 +4715,9 @@ net-p2p/ktorrent:scanfolder - Scan folders for torrent files and load them
net-p2p/ktorrent:search - Search for torrents
net-p2p/ktorrent:shutdown - Shutdown when done
net-p2p/ktorrent:stats - Shows statistics about torrents in several graphs
-net-p2p/ktorrent:upnp - Forward ports using UPnP
net-p2p/ktorrent:webinterface - Allows control of KTorrent via a web interface
net-p2p/ktorrent:zeroconf - Discover peers on the local network using the Zeroconf protocol
net-p2p/leechcraft-eiskaltdcpp:emoticons - Install emoticon packs
-net-p2p/leechcraft-eiskaltdcpp:upnp - Forward ports using UPnP
net-p2p/mldonkey:bittorrent - enable bittorrent support
net-p2p/mldonkey:fasttrack - enable fasttrack support
net-p2p/mldonkey:gnutella - enable gnutella and gnutella2 support
@@ -5663,7 +5652,6 @@ sys-kernel/rt-sources:deblob - Remove binary blobs from kernel sources to provid
sys-kernel/spl:debug-log - Enable additional diagnostics
sys-kernel/vanilla-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
sys-kernel/vserver-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
-sys-kernel/zen-sources:minimal - Clone git tree with --depth 1 to reduce amount of data to download. Use with caution
sys-libs/db:rpc - Enable rpc client/server
sys-libs/freeipmi:nagios - Install a nagios plugin to check sensors' status.
sys-libs/gdbm:berkdb - enable compatibility layer for UNIX-like dbm and ndbm interfaces
@@ -5892,7 +5880,6 @@ www-servers/ocsigen:ocamlduce - Enables ocamlduce XML typechecking for generated
www-servers/pound:dynscaler - Enable dynamic rescaling of back-end priorities
www-servers/pshs:magic - Enable automatic detection of Content-Type using libmagic (sys-apps/file)
www-servers/pshs:netlink - Use libnetlink (sys-apps/iproute2) to get network interface addresses
-www-servers/pshs:upnp - Enable port forwarding using UPnP via net-libs/miniupnpc
www-servers/resin:admin - Enable Resin admin webapp
www-servers/tomcat:extra-webapps - Build also the docs and examples webapp
www-servers/uwsgi:carbon - Enable support for sending statistics to a carbon server (see http://projects.unbit.it/uwsgi/wiki/Carbon).
diff --git a/sci-biology/allpathslg/allpathslg-37578.ebuild b/sci-biology/allpathslg/allpathslg-37578.ebuild
index 616b16173efb..b57bde0cab0a 100644
--- a/sci-biology/allpathslg/allpathslg-37578.ebuild
+++ b/sci-biology/allpathslg/allpathslg-37578.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/sci-biology/allpathslg/allpathslg-37578.ebuild,v 1.5 2012/11/19 10:26:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-37578.ebuild,v 1.6 2012/12/14 09:57:17 ulm Exp $
EAPI="2"
@@ -10,7 +10,7 @@ DESCRIPTION="De novo assembly of whole-genome shotgun microreads"
HOMEPAGE="http://www.broadinstitute.org/science/programs/genome-biology/crd"
SRC_URI="ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="MIT"
SLOT="0"
IUSE=""
KEYWORDS="amd64"
diff --git a/sci-biology/allpathslg/allpathslg-41839.ebuild b/sci-biology/allpathslg/allpathslg-41839.ebuild
index a96d6e87c242..ff66b9feaf5e 100644
--- a/sci-biology/allpathslg/allpathslg-41839.ebuild
+++ b/sci-biology/allpathslg/allpathslg-41839.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/sci-biology/allpathslg/allpathslg-41839.ebuild,v 1.2 2012/11/19 10:26:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-41839.ebuild,v 1.3 2012/12/14 09:57:17 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="De novo assembly of whole-genome shotgun microreads"
HOMEPAGE="http://www.broadinstitute.org/science/programs/genome-biology/crd"
SRC_URI="ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="MIT"
SLOT="0"
IUSE=""
KEYWORDS="~amd64"
diff --git a/sci-biology/allpathslg/allpathslg-42337.ebuild b/sci-biology/allpathslg/allpathslg-42337.ebuild
index 76c108334460..b2d271271c0e 100644
--- a/sci-biology/allpathslg/allpathslg-42337.ebuild
+++ b/sci-biology/allpathslg/allpathslg-42337.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/sci-biology/allpathslg/allpathslg-42337.ebuild,v 1.2 2012/11/19 10:26:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-42337.ebuild,v 1.3 2012/12/14 09:57:17 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="De novo assembly of whole-genome shotgun microreads"
HOMEPAGE="http://www.broadinstitute.org/science/programs/genome-biology/crd"
SRC_URI="ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="MIT"
SLOT="0"
IUSE=""
KEYWORDS="~amd64"
diff --git a/sci-biology/biopython/Manifest b/sci-biology/biopython/Manifest
index 86e9e7c37807..efef2ecf66ac 100644
--- a/sci-biology/biopython/Manifest
+++ b/sci-biology/biopython/Manifest
@@ -1,3 +1,3 @@
-DIST biopython-1.57.tar.gz 6945024 RMD160 ae061442a97decbd9951af8f85913bbc3747ffee SHA1 dbbd23c9f555e0c69d61db96f8aa368617ecacef SHA256 07c16a86127770c8d5b653a6e82fee0999159f7284a3a01c98cf66ed2f0ec4a0
-DIST biopython-1.58.tar.gz 8035063 RMD160 3e05426017e98cdc45cacfb08b1b5d7c3d4b10ff SHA1 3db0819d0046cfcd1c9aaf39aa7db40b9aa2645e SHA256 f9183facf01d3b0b489401f43a0cae8249c3dd1f7452d939f137980f5e683e73
-DIST biopython-1.59.tar.gz 8577492 RMD160 2d08fe70d131cd2a90019465a4f5f680b4c92da3 SHA1 dc8e9d76b208a2c2fcc8d4e10c7bbf0cc56dbbfd SHA256 588abf55de3d8e4deac611a0f810a9c5d9ce7e5868d3064f79efe6cabd18cacb
+DIST biopython-1.57.tar.gz 6945024 SHA256 07c16a86127770c8d5b653a6e82fee0999159f7284a3a01c98cf66ed2f0ec4a0
+DIST biopython-1.58.tar.gz 8035063 SHA256 f9183facf01d3b0b489401f43a0cae8249c3dd1f7452d939f137980f5e683e73
+DIST biopython-1.59.tar.gz 8577492 SHA256 588abf55de3d8e4deac611a0f810a9c5d9ce7e5868d3064f79efe6cabd18cacb SHA512 235cbe0689f9a72fe4a0713cd6c5b963b0351f7565405ef643001df14c1c5809f023f7612c5253f2487eca123f2d6fe5b66bf817d511fa82155f509edaaf5096 WHIRLPOOL 61ea1bfa2bdcb32e1eb86f37bec2e1f1eb024743e72c572b13585a6f76fe2beb97a65a6414a01408b48a9ce899d1cb63b7b71383c468cddaf047385a3bdd0036
diff --git a/sci-biology/biopython/biopython-1.57.ebuild b/sci-biology/biopython/biopython-1.57.ebuild
index d09792c2545c..630ae3b9d3de 100644
--- a/sci-biology/biopython/biopython-1.57.ebuild
+++ b/sci-biology/biopython/biopython-1.57.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/sci-biology/biopython/biopython-1.57.ebuild,v 1.5 2011/05/28 13:52:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.57.ebuild,v 1.6 2012/12/14 10:00:10 ulm Exp $
EAPI=3
PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ DESCRIPTION="Python modules for computational molecular biology"
HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/"
SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="mysql postgres"
diff --git a/sci-biology/biopython/biopython-1.58.ebuild b/sci-biology/biopython/biopython-1.58.ebuild
index 4e219b27da2b..4433194ae75e 100644
--- a/sci-biology/biopython/biopython-1.58.ebuild
+++ b/sci-biology/biopython/biopython-1.58.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/sci-biology/biopython/biopython-1.58.ebuild,v 1.1 2011/12/26 05:51:16 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.58.ebuild,v 1.2 2012/12/14 10:00:10 ulm Exp $
EAPI=3
PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ DESCRIPTION="Python modules for computational molecular biology"
HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/"
SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="mysql postgres"
diff --git a/sci-biology/biopython/biopython-1.59.ebuild b/sci-biology/biopython/biopython-1.59.ebuild
index 1a4a7397c2ff..66e93c7c0abb 100644
--- a/sci-biology/biopython/biopython-1.59.ebuild
+++ b/sci-biology/biopython/biopython-1.59.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/sci-biology/biopython/biopython-1.59.ebuild,v 1.1 2012/02/27 16:06:59 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.59.ebuild,v 1.2 2012/12/14 10:00:10 ulm Exp $
EAPI=3
PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ DESCRIPTION="Python modules for computational molecular biology"
HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/"
SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="mysql postgres"
diff --git a/sci-chemistry/gabedit/gabedit-2.3.6.ebuild b/sci-chemistry/gabedit/gabedit-2.3.6.ebuild
index 310fa482adac..5bd1b0b676ea 100644
--- a/sci-chemistry/gabedit/gabedit-2.3.6.ebuild
+++ b/sci-chemistry/gabedit/gabedit-2.3.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/sci-chemistry/gabedit/gabedit-2.3.6.ebuild,v 1.7 2012/07/02 09:07:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.3.6.ebuild,v 1.8 2012/12/14 10:12:42 ulm Exp $
EAPI=2
@@ -14,8 +14,8 @@ DESCRIPTION="GUI for computational chemistry packages"
HOMEPAGE="http://gabedit.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/GabeditDevloppment/${MY_PN}${MY_PV}/${MY_P}.tar.gz"
+LICENSE="MIT"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="amd64 x86"
IUSE="openmp"
diff --git a/sci-chemistry/gabedit/gabedit-2.4.0.ebuild b/sci-chemistry/gabedit/gabedit-2.4.0.ebuild
index a240f1fe7760..58fd7a36635b 100644
--- a/sci-chemistry/gabedit/gabedit-2.4.0.ebuild
+++ b/sci-chemistry/gabedit/gabedit-2.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/sci-chemistry/gabedit/gabedit-2.4.0.ebuild,v 1.2 2012/05/04 07:02:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.4.0.ebuild,v 1.3 2012/12/14 10:12:42 ulm Exp $
EAPI=4
@@ -14,8 +14,8 @@ DESCRIPTION="GUI for computational chemistry packages"
HOMEPAGE="http://gabedit.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="~amd64 ~x86"
IUSE="openmp"
diff --git a/sci-chemistry/gabedit/gabedit-2.4.2.ebuild b/sci-chemistry/gabedit/gabedit-2.4.2.ebuild
index aa28f277c9df..89802667314f 100644
--- a/sci-chemistry/gabedit/gabedit-2.4.2.ebuild
+++ b/sci-chemistry/gabedit/gabedit-2.4.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/sci-chemistry/gabedit/gabedit-2.4.2.ebuild,v 1.3 2012/06/14 10:42:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.4.2.ebuild,v 1.4 2012/12/14 10:12:42 ulm Exp $
EAPI=4
@@ -14,8 +14,8 @@ DESCRIPTION="GUI for computational chemistry packages"
HOMEPAGE="http://gabedit.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="~amd64 ~x86"
IUSE="openmp"
diff --git a/sci-chemistry/gabedit/gabedit-2.4.3.ebuild b/sci-chemistry/gabedit/gabedit-2.4.3.ebuild
index cfbb3a8cb3b8..a13fd6ea5b59 100644
--- a/sci-chemistry/gabedit/gabedit-2.4.3.ebuild
+++ b/sci-chemistry/gabedit/gabedit-2.4.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/sci-chemistry/gabedit/gabedit-2.4.3.ebuild,v 1.1 2012/07/02 09:07:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.4.3.ebuild,v 1.2 2012/12/14 10:12:42 ulm Exp $
EAPI=4
@@ -14,8 +14,8 @@ DESCRIPTION="GUI for computational chemistry packages"
HOMEPAGE="http://gabedit.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="~amd64 ~x86"
IUSE="openmp"
diff --git a/sci-chemistry/gabedit/gabedit-2.4.5.ebuild b/sci-chemistry/gabedit/gabedit-2.4.5.ebuild
index 26ed1a5fb2e1..f21069d182b4 100644
--- a/sci-chemistry/gabedit/gabedit-2.4.5.ebuild
+++ b/sci-chemistry/gabedit/gabedit-2.4.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/sci-chemistry/gabedit/gabedit-2.4.5.ebuild,v 1.1 2012/11/29 11:46:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gabedit/gabedit-2.4.5.ebuild,v 1.2 2012/12/14 10:12:42 ulm Exp $
EAPI=4
@@ -14,8 +14,8 @@ DESCRIPTION="GUI for computational chemistry packages"
HOMEPAGE="http://gabedit.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="~amd64 ~x86"
IUSE="openmp"
diff --git a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild b/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
index d64f0d7ccf87..06d741f3beac 100644
--- a/sci-chemistry/raster3d/raster3d-3.0.2.ebuild
+++ b/sci-chemistry/raster3d/raster3d-3.0.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/sci-chemistry/raster3d/raster3d-3.0.2.ebuild,v 1.9 2012/10/19 10:24:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/raster3d-3.0.2.ebuild,v 1.10 2012/12/14 10:16:38 ulm Exp $
EAPI=4
@@ -14,8 +14,8 @@ DESCRIPTION="Generation high quality raster images of proteins or other molecule
HOMEPAGE="http://www.bmsc.washington.edu/raster3d/raster3d.html"
SRC_URI="http://www.bmsc.washington.edu/${PN}/${MY_P}.tar.gz -> ${MY_P}.tar"
+LICENSE="Artistic-2"
SLOT="0"
-LICENSE="as-is"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="gd tiff"
diff --git a/sci-chemistry/scala/scala-3.3.20.ebuild b/sci-chemistry/scala/scala-3.3.20.ebuild
index d90b571ee930..68218a58d9d8 100644
--- a/sci-chemistry/scala/scala-3.3.20.ebuild
+++ b/sci-chemistry/scala/scala-3.3.20.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/sci-chemistry/scala/scala-3.3.20.ebuild,v 1.3 2012/10/19 10:26:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/scala/scala-3.3.20.ebuild,v 1.5 2012/12/14 12:55:11 ago Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
LICENSE="ccp4"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 7b91c1dbc63d..8cac992d2a1f 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,7 +1,7 @@
-DIST 2002a.tar.gz 6601961 RMD160 3eb7e61999b032dc47bddc3398543f4d4cde3adf SHA1 908160476c9cddcedfb8a73f78f67f2c66480cc2 SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19
-DIST magic-7.4.46.tgz 3605986 RMD160 695623481c4c9d4437bd30c629a6c8bac91f6ad6 SHA1 95a344c6b4ff54466f0a7521a322d5f8da1a430f SHA256 55f377500a861b12d21483b002c72a7a5fb9b35885f7dc858ee98f4a1e191cac
-DIST magic-7.5.127.tgz 3674974 RMD160 f741008a16dca5fa282527e7c4c5a512d0d8033a SHA1 f1a25e805d91fbb279ffa9ca11a72016edda71f5 SHA256 fa19563ec011e25b1a1655a6ceda47dc8ad6898dbf68448fe17bc51427a8f578
-DIST magic-7.5.129.tgz 3674551 RMD160 25e6e1e46069667a3ca50b333d8b09a3d1dfd980 SHA1 501ed7f4ef849ee9caece8715b562f9b539822c2 SHA256 81bca3223ddf7251d73a38692e7a4f4758076c65a2fa1e3825c6bd8cce491041
-DIST magic-7.5.202.tgz 3692294 RMD160 99ae0bae03d131a4ed87a1059e92706f0a7f20d8 SHA1 baf03cff89d9c60c9fc9b23e40a085db78f1ff4b SHA256 975cb3962c8a97e3caae83c5de309bf09e623a829bd36983e82d28104067d99c
-DIST magic-7.5.220.tgz 3746889 RMD160 628cdf685366790a10037cfd97a27932f6f17ba2 SHA1 039b445ab104325d01e31b047c3a2b1da7aabfa8 SHA256 a6a9c2bcd3e16942165a40cdcda28937f2cc122a47d92812f47e46dd67d0f69e
-DIST magic-8.0.109.tgz 3865558 RMD160 51dd11704ab5204524ca70c0d73392347a4473ff SHA1 b6243a2fdf49de82a60d902cf1ccfb6649ee5c5d SHA256 f3a669490440f5f1ae19f681a6e49eb85dc70c564b472f4e0ff40a9a53773a71
+DIST 2002a.tar.gz 6601961 SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19 SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e WHIRLPOOL f3cadaaaa48e4603115cd9c34e51a5beb51cc8cdbec3bf4352750c91476943eb182c9bc3865f8a7adfe115012320af7d8132d5d279ea61618f3a713f08cff0c6
+DIST magic-7.4.46.tgz 3605986 SHA256 55f377500a861b12d21483b002c72a7a5fb9b35885f7dc858ee98f4a1e191cac
+DIST magic-7.5.127.tgz 3674974 SHA256 fa19563ec011e25b1a1655a6ceda47dc8ad6898dbf68448fe17bc51427a8f578
+DIST magic-7.5.129.tgz 3674551 SHA256 81bca3223ddf7251d73a38692e7a4f4758076c65a2fa1e3825c6bd8cce491041
+DIST magic-7.5.202.tgz 3692294 SHA256 975cb3962c8a97e3caae83c5de309bf09e623a829bd36983e82d28104067d99c
+DIST magic-7.5.220.tgz 3746889 SHA256 a6a9c2bcd3e16942165a40cdcda28937f2cc122a47d92812f47e46dd67d0f69e
+DIST magic-8.0.109.tgz 3865558 SHA256 f3a669490440f5f1ae19f681a6e49eb85dc70c564b472f4e0ff40a9a53773a71 SHA512 8e2b413a74a05c3351a4f57dcc70141215fd5d950cea648bc32927d72c84ce1bfd4836b9456c2f8aef2e1e5f47edc839886c9a1f6db30ad5b447c88309b87c97 WHIRLPOOL 154cc0fe36436f8957e63ac97e8bf129d24380df7a27da80327ae94eaacd028e7296a0b1f058de0865d00acb541f42b21e2c9c231eb7df839a45906cb54f143a
diff --git a/sci-electronics/magic/magic-7.4.46-r1.ebuild b/sci-electronics/magic/magic-7.4.46-r1.ebuild
index 1658f73db470..fe1f9ab07d98 100644
--- a/sci-electronics/magic/magic-7.4.46-r1.ebuild
+++ b/sci-electronics/magic/magic-7.4.46-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.46-r1.ebuild,v 1.5 2012/04/25 17:22:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.46-r1.ebuild,v 1.6 2012/12/14 10:43:26 ulm Exp $
DESCRIPTION="The VLSI design CAD tool."
HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
diff --git a/sci-electronics/magic/magic-7.4.46.ebuild b/sci-electronics/magic/magic-7.4.46.ebuild
index 6eaba202e833..65a96e8decfc 100644
--- a/sci-electronics/magic/magic-7.4.46.ebuild
+++ b/sci-electronics/magic/magic-7.4.46.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.46.ebuild,v 1.5 2012/04/25 17:22:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.4.46.ebuild,v 1.6 2012/12/14 10:43:26 ulm Exp $
DESCRIPTION="The VLSI design CAD tool."
HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
diff --git a/sci-electronics/magic/magic-7.5.127.ebuild b/sci-electronics/magic/magic-7.5.127.ebuild
index 5332e10aa5f6..a5ca70ec99b1 100644
--- a/sci-electronics/magic/magic-7.5.127.ebuild
+++ b/sci-electronics/magic/magic-7.5.127.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.127.ebuild,v 1.2 2012/04/25 17:22:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.127.ebuild,v 1.3 2012/12/14 10:43:26 ulm Exp $
DESCRIPTION="The VLSI design CAD tool."
HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
diff --git a/sci-electronics/magic/magic-7.5.129.ebuild b/sci-electronics/magic/magic-7.5.129.ebuild
index 40cfd94ff7a4..09d50b353293 100644
--- a/sci-electronics/magic/magic-7.5.129.ebuild
+++ b/sci-electronics/magic/magic-7.5.129.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.129.ebuild,v 1.2 2012/04/25 17:22:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.129.ebuild,v 1.3 2012/12/14 10:43:26 ulm Exp $
DESCRIPTION="The VLSI design CAD tool."
HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
diff --git a/sci-electronics/magic/magic-7.5.202.ebuild b/sci-electronics/magic/magic-7.5.202.ebuild
index 6aca2d3ccdba..1caf34421517 100644
--- a/sci-electronics/magic/magic-7.5.202.ebuild
+++ b/sci-electronics/magic/magic-7.5.202.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/sci-electronics/magic/magic-7.5.202.ebuild,v 1.4 2012/06/13 14:00:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.202.ebuild,v 1.5 2012/12/14 10:43:26 ulm Exp $
EAPI=2
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
diff --git a/sci-electronics/magic/magic-7.5.220.ebuild b/sci-electronics/magic/magic-7.5.220.ebuild
index 0f8475e0a699..ee09cc34acee 100644
--- a/sci-electronics/magic/magic-7.5.220.ebuild
+++ b/sci-electronics/magic/magic-7.5.220.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/sci-electronics/magic/magic-7.5.220.ebuild,v 1.1 2012/06/13 14:00:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.220.ebuild,v 1.2 2012/12/14 10:43:26 ulm Exp $
EAPI=2
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
diff --git a/sci-electronics/magic/magic-8.0.109.ebuild b/sci-electronics/magic/magic-8.0.109.ebuild
index 0f4cc9a694da..83a9d2f2c583 100644
--- a/sci-electronics/magic/magic-8.0.109.ebuild
+++ b/sci-electronics/magic/magic-8.0.109.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/sci-electronics/magic/magic-8.0.109.ebuild,v 1.1 2012/06/13 14:26:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-8.0.109.ebuild,v 1.2 2012/12/14 10:43:26 ulm Exp $
EAPI=2
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-LICENSE="as-is GPL-2"
+LICENSE="HPND GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index a108720f47a7..6b62362e3f69 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,2 +1 @@
-DIST libint-1.1.2.tar.gz 376882 SHA256 b65d035a1a1dfb917d0777f5cd9cf7b7eee94aaf69563e21f2d7a6048bbf283b
DIST libint-1.1.4.tar.gz 350252 SHA256 f67b13bdf1135ecc93b4cff961c1ff33614d9f8409726ddc8451803776885cff SHA512 9a4011c227fbdee52f95a40659ebb131a2d2422784b35e5c8fc781da250f32bb53207c29e429785c1a59054391f44e1efad2c85b37c5d3a70f2e392a7857805d WHIRLPOOL ac84f3cbf8b21f02a2f3ae5b6b48e4e629c7c3c719fdd31fdaf308d42339250473c55620f1350687e0ff9f203ad835fdadba7ff3e7749f44d19462b5b2e96acc
diff --git a/sci-libs/libint/libint-1.1.2.ebuild b/sci-libs/libint/libint-1.1.2.ebuild
deleted file mode 100644
index c1779b81cd17..000000000000
--- a/sci-libs/libint/libint-1.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libint/libint-1.1.2.ebuild,v 1.6 2012/10/18 20:26:43 jlec Exp $
-
-inherit eutils fortran-2
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="http://www.ccmst.gatech.edu/evaleev/libint/"
-SRC_URI="http://www.ccmst.gatech.edu/evaleev/libint/src/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/dont-append-mcpu.patch
-}
-
-src_compile() {
- sed -i \
- -e "s:^COPTIONS_OPT=.*:COPTIONS_OPT=\"${CFLAGS}\":g" \
- -e "s:^CXXOPTIONS_OPT=.*:CXXOPTIONS_OPT=\"${CXXFLAGS}\":g" \
- "${S}"/configure || die
-
- econf \
- --enable-shared \
- --enable-deriv \
- --enable-r12
- emake || die "emake failed"
-}
-
-src_install() {
- #make DESTDIR="${D}" install || die
- einstall || die
-}
diff --git a/sci-libs/libint/metadata.xml b/sci-libs/libint/metadata.xml
index 630bb7c155f9..458512d7bba4 100644
--- a/sci-libs/libint/metadata.xml
+++ b/sci-libs/libint/metadata.xml
@@ -1,8 +1,8 @@
- sci
-
+ sci
+
libint is two things:
1. a library of C/C++ functions for efficient evaluation of several
kinds of two-body molecular integrals over Gaussian functions;
diff --git a/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild b/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild
index 7acf100e2927..fb7a40234547 100644
--- a/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild
+++ b/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.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/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild,v 1.3 2012/08/04 15:30:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vecmath-objectclub/vecmath-objectclub-1.14.ebuild,v 1.4 2012/12/14 10:45:20 ulm Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="Unofficial free implementation of Sun javax.vecmath by Kenji Hirana
HOMEPAGE="http://www.objectclub.jp/download/vecmath_e"
SRC_URI="http://www.objectclub.jp/download/files/vecmath/${MY_PN}-${PV}.tar.gz"
-LICENSE="as-is"
+LICENSE="HPND"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild b/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
index 23c48feb38a5..921fa85b7994 100644
--- a/sci-mathematics/cvc3/cvc3-2.4.1.ebuild
+++ b/sci-mathematics/cvc3/cvc3-2.4.1.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/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.4 2012/12/05 10:18:57 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/cvc3/cvc3-2.4.1.ebuild,v 1.5 2012/12/14 09:49:53 ulm Exp $
EAPI="5"
@@ -10,7 +10,7 @@ DESCRIPTION="CVC3 is an automatic theorem prover for Satisfiability Modulo Theor
HOMEPAGE="http://www.cs.nyu.edu/acsys/cvc3/index.html"
SRC_URI="http://www.cs.nyu.edu/acsys/cvc3/releases/2.4.1/${P}.tar.gz"
-LICENSE="BSD MIT as-is zchaff? ( zchaff )"
+LICENSE="BSD MIT HPND zchaff? ( zchaff )"
RESTRICT="mirror zchaff? ( bindist )"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 936b2b693b1e..7a1f6dbc7b74 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -2,3 +2,4 @@ DIST maxima-5.18.1.tar.gz 20440947 SHA256 eef1f70503755ec8fb311a13731044e6fff17e
DIST maxima-5.26.0.tar.gz 26047841 SHA256 887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9
DIST maxima-5.27.0.tar.gz 27101764 SHA256 9006803714f1385221c4395697fad53f125a13d29b50b188d045d08e25f8dca7 SHA512 74dcf03c5c603caa54545c05a6f1426ec8207448400289322d193c677fa96eda8098f1296fea582e15342a64a2e048155ef6135a1b0e061f82a842bf0a140959 WHIRLPOOL 86fe53d6f0ad958a958b06912eea774b73bf6a3da6a574bb9c9cbcf0dff471b5e850839f075bae3e4af7d63db898a02171a81692a2ff62107cb67fb14be35cad
DIST maxima-5.28.0.tar.gz 27312348 SHA256 d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda SHA512 1c4de8d543d6ce9fcebceda4b175da80ea3606716d82ebb648cf026cad5878c789d26340a1e2b53bce0c6d02285014c92f83bbbc5eadc076c3dc2c3232508103 WHIRLPOOL 0a17c3261c9f84d9a793e52cc54ee02151e8982dbbcf964a0ee28450a8f4d640fde82e9f54f6bf39c2a6c7bd489555387694e8e1b0b89dfc0c5b9410a1c8026e
+DIST maxima-5.29.1.tar.gz 27148396 SHA256 e4d8558e6eff09aa0b424fd3591a3f309c7f53068640658d40c0b2a690a024dd SHA512 9db7166ed49116c6369d5cf18ff01f54e9dba971e683a4daecbf01d063cd91bd5d188dc5a4e3fc0f7b14493a89841ded4f4a6ceac2bf6060b77c91fb9bc8013b WHIRLPOOL 74fb19706aa199202d74a15e6084f333f67f53760f0465cb9289d07e3a368a5ceeb1a4c5baa852514b07442f5bafc9afc16e996f7962b1a1d214cf0ff5dd6f37
diff --git a/sci-mathematics/maxima/files/maxima-5.29.1-sbcl.patch b/sci-mathematics/maxima/files/maxima-5.29.1-sbcl.patch
new file mode 100644
index 000000000000..66a583e0adba
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.29.1-sbcl.patch
@@ -0,0 +1,8 @@
+diff -r -U1 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
+--- maxima-5.28.0.orig/src/Makefile.am 2012-06-15 12:21:34.000000000 +0700
++++ maxima-5.28.0/src/Makefile.am 2012-08-25 09:32:26.000000000 +0700
+@@ -199,3 +199,3 @@
+ if SBCL
+-EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
++EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval
+ all-local: sharefiles.mk $(SBCL_MAXIMA)
diff --git a/sci-mathematics/maxima/files/maxima-5.29.1-wish.patch b/sci-mathematics/maxima/files/maxima-5.29.1-wish.patch
new file mode 100644
index 000000000000..6fcb0d9ec8e9
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.29.1-wish.patch
@@ -0,0 +1,28 @@
+diff -r -U1 maxima-5.23.1.orig//configure.in maxima-5.23.1//configure.in
+--- maxima-5.23.1.orig//configure.in 2011-01-15 21:54:46.000000000 +0600
++++ maxima-5.23.1//configure.in 2011-01-16 21:00:16.000000000 +0600
+@@ -777,6 +777,11 @@
+ [ --with-wish= Use for Tk wish shell (default wish)],
+- [WISH="${withval}"],
+- [WISH="wish"])
++ [],
++ [with_wish="wish"])
++case "${with_wish}" in
++ no) WISH="none" ;;
++ yes) WISH="wish" ;;
++ *) WISH="${with_wish}" ;;
++esac
+ AC_SUBST(WISH)
+-
++AM_CONDITIONAL(WANT_TK, test x"${with_wish}" != xno)
+
+diff -r -U1 maxima-5.23.1.orig//interfaces/Makefile.am maxima-5.23.1//interfaces/Makefile.am
+--- maxima-5.23.1.orig//interfaces/Makefile.am 2004-04-28 23:34:59.000000000 +0700
++++ maxima-5.23.1//interfaces/Makefile.am 2011-01-16 20:41:38.000000000 +0600
+@@ -1,2 +1,6 @@
++if WANT_TK
+ SUBDIRS = emacs xmaxima
++else
++SUBDIRS = emacs
++endif
+ EXTRA_DIST = bin/xmaxima.iss
diff --git a/sci-mathematics/maxima/files/maxima-5.29.1.patch b/sci-mathematics/maxima/files/maxima-5.29.1.patch
new file mode 100644
index 000000000000..c8bd4191dda8
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.29.1.patch
@@ -0,0 +1,51 @@
+diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
+--- maxima-5.28.0.orig/src/maxima.in 2012-06-15 12:21:34.000000000 +0700
++++ maxima-5.28.0/src/maxima.in 2012-08-15 21:46:37.000000000 +0700
+@@ -138,5 +138,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ fi
+@@ -144,5 +144,5 @@
+ if [ -x "$maxima_image_base" ]; then
+- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -q -norc "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+- exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ fi
+@@ -155,5 +155,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CMUCL_RUNTIME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ fi
+@@ -161,5 +161,5 @@
+ if [ -x "$maxima_image_base" ]; then
+- exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$maxima_image_base" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+- exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ fi
+@@ -183,5 +183,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+- exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ fi
+@@ -196,5 +196,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+- exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ else
+- exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++ exec "@SBCL_NAME@" --core "$maxima_image_base.core" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --no-sysinit --no-userinit --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+ fi
diff --git a/sci-mathematics/maxima/maxima-5.29.1.ebuild b/sci-mathematics/maxima/maxima-5.29.1.ebuild
new file mode 100644
index 000000000000..46392dd840d7
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.29.1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.29.1.ebuild,v 1.1 2012/12/14 09:55:25 grozin Exp $
+
+EAPI=3
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps (the first one is the default)
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+# . - just dev-lisp/, - >= dev-lisp/-
+MIN_VER=( . . 2.6.8_pre[ansi] 10 . . )
+# supports readline: . - no, y - yes
+SUPP_RL=( . . y . . y )
+# . - just --enable-, - --enable-
+CONF_FLAG=( . . . ecl ccl . )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+ sci-visualization/gnuplot[gd]
+ tk? ( dev-lang/tk ) )
+ latex? ( virtual/latex-base )
+ emacs? ( virtual/emacs
+ latex? ( app-emacs/auctex ) )
+ xemacs? ( app-editors/xemacs
+ latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# generating lisp dependencies
+depends() {
+ local LISP DEP
+ LISP=${LISPS[$1]}
+ DEP=${MIN_VER[$1]}
+ if [ "${DEP}" = "." ]; then
+ DEP="dev-lisp/${LISP}"
+ else
+ DEP=">=dev-lisp/${LISP}-${DEP}"
+ fi
+ if [ "${SUPP_RL[$1]}" = "." ]; then
+ DEP="${DEP} app-misc/rlwrap"
+ fi
+ echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+ LISP=${LISPS[${n}]}
+ RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+ if (( ${n} > 0 )); then
+ DEF_DEP="${DEF_DEP} !${LISP}? ( "
+ fi
+done
+
+DEF_DEP="${DEF_DEP} `depends 0`"
+
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+ DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+ ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+ local n=${#LISPS[*]}
+
+ for ((n--; n >= 0; n--)); do
+ use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+ done
+
+ if [ -z "${NLISPS}" ]; then
+ ewarn "No lisp specified in USE flags, choosing ${LISPS[0]} as default"
+ NLISPS=0
+ fi
+}
+
+src_prepare() {
+ # use xdg-open to view ps, pdf
+ epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+
+ # Don't use lisp init files
+ epatch "${FILESDIR}"/${P}.patch
+
+ # ClozureCL (former OpenMCL) executable name is ccl
+ epatch "${FILESDIR}"/${PN}-ccl.patch
+
+ # make xmaxima conditional on tk (wish)
+ epatch "${FILESDIR}"/${P}-wish.patch
+
+ # don't install imaxima, since we have a separate package for it
+ epatch "${FILESDIR}"/${PN}-imaxima.patch
+
+ # remove rmaxima if not needed
+ epatch "${FILESDIR}"/${PN}-rmaxima.patch
+
+ # fix LDFLAGS handling in ecl (#378195)
+ epatch "${FILESDIR}"/${PN}-ecl-ldflags.patch
+
+ # workaround for the broken sbcl
+ epatch "${FILESDIR}"/${P}-sbcl.patch
+
+ # bug #343331
+ rm share/Makefile.in || die
+ rm src/Makefile.in || die
+ touch src/*.mk
+ touch src/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ local CONFS CONF n lang
+ for n in ${NLISPS}; do
+ CONF=${CONF_FLAG[${n}]}
+ if [ ${CONF} = . ]; then
+ CONF=${LISPS[${n}]}
+ fi
+ CONFS="${CONFS} --enable-${CONF}"
+ done
+
+ # enable existing translated doc
+ if use nls; then
+ for lang in ${LANGS}; do
+ if use "linguas_${lang}"; then
+ CONFS="${CONFS} --enable-lang-${lang}"
+ use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+ fi
+ done
+ fi
+
+ econf ${CONFS} $(use_with tk wish) --with-lispdir="${SITELISP}"/${PN}
+}
+
+src_install() {
+ einstall emacsdir="${ED}${SITELISP}/${PN}" || die "einstall failed"
+
+ use tk && make_desktop_entry xmaxima xmaxima \
+ /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+ "Science;Math;Education"
+
+ if use latex; then
+ insinto ${TEXMF}/tex/latex/emaxima
+ doins interfaces/emacs/emaxima/emaxima.sty
+ fi
+
+ # do not use dodoc because interfaces can't read compressed files
+ # read COPYING before attempt to remove it from dodoc
+ insinto /usr/share/${PN}/${PV}/doc
+ doins AUTHORS COPYING README README.lisps || die
+ dodir /usr/share/doc
+ dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+ fi
+
+ # if we use ecls, build an ecls library for maxima
+ if use ecls; then
+ cd src
+ mkdir ./lisp-cache
+ ecl \
+ -eval '(require `asdf)' \
+ -eval '(setf asdf::*user-cache* (truename "./lisp-cache"))' \
+ -eval '(load "maxima-build.lisp")' \
+ -eval '(asdf:make-build :maxima :type :fasl :move-here ".")' \
+ -eval '(quit)'
+ ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+ insinto "${ECLLIB#${EPREFIX}}"
+ newins maxima.fasb maxima.fas
+ fi
+}
+
+pkg_preinst() {
+ # some lisps do not read compress info files (bug #176411)
+ local infofile
+ for infofile in "${ED}"/usr/share/info/*.bz2 ; do
+ bunzip2 "${infofile}"
+ done
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use latex && mktexlsr
+}
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index ea0d0102b743..5a83e2020697 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,19 +1,14 @@
DIST G4ABLA.3.0.tar.gz 54909 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb
DIST G4EMLOW.6.19.tar.gz 14396144 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f
-DIST G4EMLOW.6.2.tar.gz 8389172 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781
-DIST G4NDL.3.13.tar.gz 57034762 SHA256 e994b873032b3d1c0bcc2679275c43354d3e1cd5091da76c8fcd4826536f17a3
DIST G4NDL.3.14.tar.gz 58794491 SHA256 08ff1d4fb0953f2502d88f76fb9db1d4314c975564731f11c9372d0ea992cafa
DIST G4NEUTRONXS.1.0.tar.gz 1186619 SHA256 577d28b7faa41caacb001a30384028cd5e3b7018755ab94a427ce0a7feeab365
DIST G4PII.1.2.tar.gz 3387814 SHA256 80e680d7343ed051bcfffd910c682cfd66980cecd1c0bc435f06c6c740a6f99d
DIST G4PhotonEvaporation.2.1.tar.gz 7504003 SHA256 08ab657a060518c9b7aab03b17628cbb31585ee9512e0f2033f2fb0d7d9b2bc7
-DIST G4RadioactiveDecay.3.2.tar.gz 761070 SHA256 31dc70aa59cb86ef0dbaf96c639e0541b7569d4fc98f92064ecdc8bc4b9c839b
DIST G4RadioactiveDecay.3.3.tar.gz 732628 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1
-DIST PhotonEvaporation.2.0.tar.gz 7506068 SHA256 5aac0ce683ca23274a7736c8e8911d8cf32d2bf33aab33a9a23126664762d61d
DIST RealSurface.1.0.tar.gz 1257863 SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1
DIST geant321_3.21.14.dfsg-8.diff.gz 41909 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1
DIST geant321_3.21.14.dfsg-9.diff.gz 47589 SHA256 419bc2315e2692fe84b353d445cbae7af995d84a6a0290b7f9051ee041243d20
DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4
-DIST geant4.9.2.p02.tar.gz 18822956 SHA256 4d19bb76bf956004481bc433bf4735780ccc6354d3dc53321d532fd283243078
DIST geant4.9.4.p03.tar.gz 25241424 SHA256 5090ca5b506238f16ba2ae2176221a18b6fde06f91180850a109fae1006910c0
-DIST geant4.9.5.p01.tar.gz 28466803 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e
-DIST geant4.9.5.tar.gz 28458437 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597
+DIST geant4.9.5.p02.tar.gz 28491693 SHA256 adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777 SHA512 0081ecdae0b61d8790a7083691d17e3d7727f8c065f412a94d61e2c01ae27d9585d7d91059795da251a34d7305cc04e17eb37d189df8b52f68974c3290272ad6 WHIRLPOOL ce36ba544f18484b6a2b8ffd19b68f126578177806a77a3aa55981254afd8b59a1567b654111879529a31be8e92e5ddf8da46dabc49ad447b40dee8a8f012e3b
+DIST geant4.9.6.tar.gz 25433109 SHA256 3b1caf87664ef35cab25563b2911653701e98c75a9bd6c64f364d1a1213247e5 SHA512 54b2622da86d669728719958dcbcc52dfe58ca2e5ed2d7f43d10b032e4a732363fe54a359417b33c471b29708c6733cb4e3afeda746cc1d3bdec72d0c1df1a19 WHIRLPOOL 892db0b4cae7ffa8c51279ae64d0cc366fe953eca406b2c8f55352a39bab9c80f5b8564a771211c95c3789d70c3d8f092b44e3a61b4cd2515c3e151cae6e8ecd
diff --git a/sci-physics/geant/geant-4.9.2_p02.ebuild b/sci-physics/geant/geant-4.9.2_p02.ebuild
deleted file mode 100644
index 20c0726865bf..000000000000
--- a/sci-physics/geant/geant-4.9.2_p02.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.18 2012/10/24 19:42:46 ulm Exp $
-
-EAPI=2
-
-inherit eutils fortran-2 multilib toolchain-funcs versionator
-
-PV1=$(get_version_component_range 1 ${PV})
-PV2=$(get_version_component_range 2 ${PV})
-PV3=$(get_version_component_range 3 ${PV})
-MY_P=${PN}$(replace_version_separator 3 .)
-
-DESCRIPTION="Toolkit for simulation of passage of particles through matter"
-HOMEPAGE="http://geant4.cern.ch/"
-SRC_COM="http://geant4.web.cern.ch/geant4/support/source"
-SRC_URI="${SRC_COM}/${MY_P}.tar.gz"
-GEANT4_DATA="
- G4NDL.3.13
- G4EMLOW.6.2
- G4RadioactiveDecay.3.2
- PhotonEvaporation.2.0
- G4ABLA.3.0"
-for d in ${GEANT4_DATA}; do
- SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )"
-done
-
-LICENSE="geant4"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="aida athena +data dawn debug examples gdml geant3 global minimal +motif
- +opengl openinventor qt4 +raytracerx static +vrml zlib"
-
-RDEPEND="
- =media-libs/openinventor-2.1.5.10-r3 )
- raytracerx? (
- x11-libs/libX11
- x11-libs/libXmu )
- opengl? (
- virtual/opengl
- athena? ( x11-libs/libXaw3d )
- qt4? ( x11-libs/qt-opengl:4 ) )
- gdml? ( dev-libs/xerces-c )
- geant3? ( sci-physics/geant:3 )
- dawn? ( media-gfx/dawn )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- fortran-2_pkg_setup
- eval unset ${!G4*}
-}
-
-src_prepare() {
- # fix bad zlib dependency
- epatch "${FILESDIR}"/${PN}-4.9.2-zlib.patch
-
- # propagate user's flags and compiler settings
- sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die
- sed -i \
- -e '/CXX.*:=.*g++/d' \
- -e '/FC.*:=.*gfortran/d' \
- -e 's/\(CXXFLAGS.*:=\).*/\1 -ansi/' \
- -e '/CXXFLAGS.*+=.*pipe/d' \
- -e "/CXXFLAGS.*=.*-O2/s|=.*|= ${CXXFLAGS}|" \
- -e "/FCFLAGS.*=.*-O2/s|=.*|= ${FCFLAGS}|" \
- -e "/CCFLAGS.*=.*-O2/s|=.*|= ${CFLAGS}|" \
- -e "s|-Wl,-soname|${LDFLAGS} -Wl,-soname|g" \
- -e "s/libq\*/lib\[q,Q\]t*/g" \
- config/sys/Linux*gmk || die "flag substitution failed"
- sed -i \
- -e 's:g++:$(CXX):g' \
- config/*.gmk || die "sed for forced g++ failed"
-
- # fix forced lib directory
- sed -i \
- -e 's:$(G4LIB)/$(G4SYSTEM):$(G4LIB):g' \
- config/binmake.gmk || die "sed binmake.gmk failed"
- sed -i \
- -e '/$(G4LIB)\/$(G4SYSTEM)/d' \
- config/architecture.gmk || die "sed architecture.gmk failed"
- sed -i \
- -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
- config/common.gmk || die "sed common.gmk failed"
- sed -i \
- -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
- config/moc.gmk || die "sed moc.gmk failed"
- sed -i \
- -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
- -e 's:$(G4BIN)/$(G4SYSTEM):$(G4TMP):g' \
- -e 's:$(G4TMP)/$(G4SYSTEM):$(G4TMP):g' \
- source/GNUmakefile || die "sed GNUmakefile failed"
- sed -i \
- -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \
- config/globlib.gmk || die "sed globlib.gmk failed"
-
- # work around a non defined fortran compiler
- use geant3 && export FC=$(tc-getFC)
- # don't worry about the g++ name of the file, we remove all specific
- export G4SYSTEM=Linux-g++
-}
-
-src_configure() {
- export GEANT4_DIR="/usr/share/${PN}${PV1}"
- # where to put compiled libraries;
- # we set env var G4LIB in src_install()
- # to avoid confusing make
- export GEANT4_LIBDIR=/usr/$(get_libdir)/${PN}${PV1}
- export G4INSTALL="${S}"
- export G4WORKDIR="${S}"
- export G4INCLUDE="${D}/usr/include/${PN}"
- export CLHEP_BASE_DIR=/usr
-
- # parse USE; just set flags of drivers to build, G4*_USE_* vars are set
- # later automatically for G4*_BUILD_*_DRIVER
- use minimal && export G4UI_NONE=y \
- && export G4VIS_NONE=y
-
- use motif && export G4UI_BUILD_XM_SESSION=y
- use athena && export G4UI_BUILD_XAW_SESSION=y
- if use qt4; then
- export G4UI_BUILD_QT_SESSION=y
- export QTLIBS="-L/usr/$(get_libdir)/qt4 -lQtCore -lQtGui"
- export QTFLAGS="-I/usr/include/qt4 -I/usr/include/qt4/Qt"
- use opengl && \
- export GLQTLIBS="${QTLIBS} -lQtOpenGL"
- #export QTFLAGS="${QTFLAGS} -I/usr/include/qt4/QtOpenGL"
- fi
- use dawn && export G4VIS_BUILD_DAWN_DRIVER=y
- use raytracerx && export G4VIS_BUILD_RAYTRACERX_DRIVER=y
- use openinventor && export G4VIS_BUILD_OI_DRIVER=y
- use opengl && export G4VIS_BUILD_OPENGLX_DRIVER=y
- use opengl && use motif && export G4VIS_BUILD_OPENGLXM_DRIVER=y
- use gdml && export G4LIB_BUILD_GDML=y
- use geant3 && export G4LIB_BUILD_G3TOG4=y
- use zlib && export G4LIB_USE_ZLIB=y
- use vrml && export G4VIS_BUILD_VRML_DRIVER=y \
- && export G4VIS_BUILD_VRMLFILE_DRIVER=y
- use aida && export G4ANALYSIS_USE=y
- use data && export G4DATA="${GEANT4_DIR}/data"
- use debug && export G4DEBUG=y || export G4OPTIMIZE=y
-
- # switch to see compiling flags
- export CPPVERBOSE=y
-
- # if shared libs are built, the script will also build static libs
- # with pic flags
- # avoid that by building it twice and removing temporary objects
- export G4LIB_BUILD_SHARED=y
-}
-
-src_compile() {
- cd "${S}/source/"
- einfo "Building shared library"
- emake || die "Building shared geant failed"
-
- if use global; then
- export G4LIB_USE_GRANULAR=y
- einfo "Building granular libraries"
- emake global || die "Building global libraries failed"
- emake || die "Rebuilding shared geant failed"
- fi
-
- if use static; then
- einfo "Building static libraries"
- rm -rf tmp
- export G4LIB_BUILD_STATIC=y ; unset G4LIB_BUILD_SHARED
- emake || die "Building static geant failed"
- fi
-}
-
-g4_create_env_script() {
- # we need to change some variables to the final values since we hide these
- # from make during the compile
- export G4INSTALL=${GEANT4_DIR}
- export G4LIB=${GEANT4_LIBDIR}
- export G4INCLUDE=${G4INCLUDE/${D}/}
- export G4WORKDIR=\${HOME}/${PN}${PV1}
-
- local g4env=99${PN}${PV1}
- cat <<-EOF > ${g4env}
- LDPATH=${G4LIB}
- CLHEP_BASE_DIR=${CLHEP_BASE_DIR}
- EOF
-
- # detailed data file locations
- if use data; then
- G4LEVELGAMMADATA="${G4DATA}/$(basename ${WORKDIR}/PhotonEvaporation*)"
- G4RADIOACTIVEDATA="${G4DATA}/$(basename ${WORKDIR}/RadioactiveDecay*)"
- G4LEDATA="${G4DATA}/$(basename ${WORKDIR}/G4EMLOW*)"
- G4ABLADATA="${G4DATA}/$(basename ${WORKDIR}/G4ABLA*)"
- G4NEUTRONHPCROSSSECTIONS="${G4DATA}/$(basename ${WORKDIR}/G4NDL*)"
- export G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA \
- G4ABLADATA G4NEUTRONHPCROSSSECTIONS
- fi
-
- # read env variables defined upto now
- printenv | grep ^G4 | uniq >> ${g4env}
- # define env vars for capabilities we can build into user projects
- printenv | uniq | \
- sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env}
- doenvd ${g4env} || die "Installing environment scripts failed "
-}
-
-src_install() {
- # install headers via make since we want them in a single directory
- cd "${S}/source/"
- einfo "Installing Geant4 headers"
- emake includes || die 'Installing headers failed'
- cd "${S}"
-
- # but install libraries and Geant library tool manually
- einfo "Installing Geant4 libraries"
- insinto ${GEANT4_LIBDIR}
- insopts -m0755
- doins tmp/*.so || die
- doins tmp/libname.map || die
- insopts -m0644
- if use static; then
- doins tmp/*.a || die
- fi
- exeinto ${GEANT4_LIBDIR}
- doexe tmp/liblist || die
-
- g4_create_env_script
-
- # configs
- insinto ${GEANT4_DIR}
- doins -r config || die
-
- # install data
- if use data; then
- einfo "Installing Geant4 data"
- insinto ${G4DATA}
- pushd "${WORKDIR}" > /dev/null
- for d in ${GEANT4_DATA}; do
- local p=${d/.}
- doins -r *${p/G4} || die "installing data ${d} failed"
- done
- popd > /dev/null
- fi
-
- # doc and examples
- insinto /usr/share/doc/${PF}
- local mypv="${PV1}.${PV2}.${PV3}"
- doins ReleaseNotes/ReleaseNotes${mypv}.html
- [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \
- dodoc ReleaseNotes/Patch${mypv}-*.txt
-
- use examples && doins -r examples
- # TODO: * momo with momo or java flag, and check java stuff
-}
-
-pkg_postinst() {
- elog "Geant4 projects are by default build in \$HOME/geant4."
- elog "If you want to change, set \$G4WORKDIR to another directory."
-}
diff --git a/sci-physics/geant/geant-4.9.5_p01.ebuild b/sci-physics/geant/geant-4.9.5_p02.ebuild
similarity index 89%
rename from sci-physics/geant/geant-4.9.5_p01.ebuild
rename to sci-physics/geant/geant-4.9.5_p02.ebuild
index d5ff9a83eccf..12906d3b82a0 100644
--- a/sci-physics/geant/geant-4.9.5_p01.ebuild
+++ b/sci-physics/geant/geant-4.9.5_p02.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.5 2012/10/24 19:42:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p02.ebuild,v 1.1 2012/12/14 16:51:50 bicatali Exp $
EAPI=4
-inherit cmake-utils eutils fortran-2 versionator
+inherit cmake-utils eutils fortran-2 versionator multilib
PV1=$(get_version_component_range 1 ${PV})
PV2=$(get_version_component_range 2 ${PV})
@@ -19,7 +19,7 @@ LICENSE="geant4"
SLOT="4"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
- raytracerx qt4 static-libs test vrml zlib"
+ raytracerx qt4 static-libs vrml zlib"
RDEPEND="
>=sci-physics/clhep-2.1.1
@@ -37,12 +37,12 @@ S="${WORKDIR}/${MYP}"
PATCHES=(
"${FILESDIR}"/${PN}-4.9.4-zlib.patch
- "${FILESDIR}"/${P}-scripts-only-dataenv.patch )
+ "${FILESDIR}"/${PN}-4.9.5_p01-scripts-only-dataenv.patch )
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DGEANT4_USE_SYSTEM_CLHEP=ON
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+ -DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
$(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so")
$(cmake-utils_use data GEANT4_INSTALL_DATA)
$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
@@ -54,7 +54,6 @@ src_configure() {
$(cmake-utils_use openinventor GEANT4_USE_INVENTOR)
$(cmake-utils_use qt4 GEANT4_USE_QT)
$(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11)
- $(cmake-utils_use test GEANT4_ENABLE_TESTING)
$(cmake-utils_use vrml GEANT4_USE_NETWORKVRML)
$(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB)
$(cmake-utils_use_build static-libs STATIC_LIBS)
diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.6.ebuild
similarity index 80%
rename from sci-physics/geant/geant-4.9.5-r1.ebuild
rename to sci-physics/geant/geant-4.9.6.ebuild
index 2ebd54038578..93937d2276b1 100644
--- a/sci-physics/geant/geant-4.9.5-r1.ebuild
+++ b/sci-physics/geant/geant-4.9.6.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.9 2012/10/24 19:42:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.6.ebuild,v 1.1 2012/12/14 16:51:50 bicatali Exp $
EAPI=4
-inherit cmake-utils eutils fortran-2 versionator
+inherit cmake-utils eutils fortran-2 versionator multilib
PV1=$(get_version_component_range 1 ${PV})
PV2=$(get_version_component_range 2 ${PV})
@@ -18,43 +18,40 @@ SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz"
LICENSE="geant4"
SLOT="4"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor
- raytracerx qt4 static-libs test vrml zlib"
+IUSE="+data dawn examples gdml geant3 motif opengl openinventor
+ raytracerx qt4 static-libs vrml zlib"
RDEPEND="
- >=sci-physics/clhep-2.1.1
+ dev-libs/expat
+ >=sci-physics/clhep-2.1.3
dawn? ( media-gfx/dawn )
gdml? ( dev-libs/xerces-c )
motif? ( x11-libs/motif:0 )
opengl? ( virtual/opengl )
openinventor? ( media-libs/openinventor )
- raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) )
+ raytracerx? ( x11-libs/libX11 x11-libs/libXmu )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}"
S="${WORKDIR}/${MYP}"
-PATCHES=(
- "${FILESDIR}"/${PN}-4.9.4-zlib.patch
- "${FILESDIR}"/${PN}-4.9.5-scripts-only-dataenv.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch )
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DGEANT4_USE_SYSTEM_CLHEP=ON
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+ -DCMAKE_INSTALL_LIBDIR="${EROOT}usr/$(get_libdir)"
$(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so")
$(cmake-utils_use data GEANT4_INSTALL_DATA)
$(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN)
$(cmake-utils_use gdml GEANT4_USE_GDML)
$(cmake-utils_use geant3 GEANT4_USE_G3TOG4)
- $(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD)
$(cmake-utils_use motif GEANT4_USE_XM)
$(cmake-utils_use opengl GEANT4_USE_OPENGL_X11)
$(cmake-utils_use openinventor GEANT4_USE_INVENTOR)
$(cmake-utils_use qt4 GEANT4_USE_QT)
$(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11)
- $(cmake-utils_use test GEANT4_ENABLE_TESTING)
$(cmake-utils_use vrml GEANT4_USE_NETWORKVRML)
$(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB)
$(cmake-utils_use_build static-libs STATIC_LIBS)
diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml
index 7d3677c6e528..837a9e3e4319 100644
--- a/sci-physics/geant/metadata.xml
+++ b/sci-physics/geant/metadata.xml
@@ -1,8 +1,8 @@
- sci-physics
-
+sci-physics
+
Geant simulates the passage of subatomic particles through matter, for
instance, particle detectors. Geant 3 simulations are performed by
linking Fortran code supplied by the user with the Geant libraries,
@@ -11,21 +11,21 @@
Geant 4 is a complete rewrite in C++ with addition of other modern
features and detectors.
-
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 981aacfaf1e9..b8825881b47a 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -6,3 +6,4 @@ DIST iproute2-3.3.0.tar.bz2 416353 SHA256 f328ec01bac64854f477b9440b0bbeae91895b
DIST iproute2-3.4.0.tar.xz 382092 SHA256 38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4 SHA512 b0396ae65faa4b1966726110506fe93a9dfc4584c3287ee0867ae2d010634d0231ee6513e61fb8b0eb3d50d67ec0e1480c83c27ceb005f579df57e6d51f7ef66 WHIRLPOOL dd9d3c36e69ba840b251cd93cb605d69808851c53a0b347d6a1a1e27ecb4c3516a9c3fa943d56f5bdbdb2a545eeac6feb0be51aa4d14d07f1d07d15b764826c0
DIST iproute2-3.5.1.tar.xz 387984 SHA256 36f2674e5436289f3ccfb0a58707aca9dcfa295d06afc36d2117674508f5ef72 SHA512 e94356d07fa6f14fe9531a39b53739fd3a293c381dd4916cbc4722f1c560c2bda5f4d567967bdd4898fd13e74a8d1773d62bd5e6072b764d3032d464cba961c8 WHIRLPOOL 37fa6430f0b604b5b623eb5ef547895cdf7ec147863e15dc2b5ae6f56c85d146b7caee9cb6516083c2f7e952f8343a2a7fecf3a2f606c4d10ca9cd7ffa6292d8
DIST iproute2-3.6.0.tar.xz 395096 SHA256 2d17544da00e3f162139f66891c6ab5492d3cca7cfc8f7b517a5dca3c5560534 SHA512 bce4ca6efd0ff9a6e6f257fe57008bd106674aa8143935687ea2d2956fca2eaf5050f89fbc16b96fd91530a8c853f319d4cd8bb021c67e19ffb679c9b19ef15c WHIRLPOOL 98d6015d0a55ddd4695171550d33f074acc586605d6627af4e3302415caa8d1243abf47ca70b0a6a5f57c505f29be0fe5a281914b69aaa6a3cb34e9abfe1f751
+DIST iproute2-3.7.0.tar.xz 399964 SHA256 102b7b47ccb8397b14a1426c76e0764158cf337251e9ef5d9b38283733429b0e SHA512 17130b8695236a1321ef5d00e888089455f44bb77b6af74b8e6616d4c61341e7db5e25f7687fa23a0dcefeb317c7cafcc8ef753c6371a075c37ae0f99f42d3af WHIRLPOOL 6ffd1d3ea4cf4050c6a9edc2feb161e88942421680cf4e60e97228e590364cd52dc6f68fa5583bb1faf7b3b70df90b7bbd5def0ab076acd0a32b287ecdc723c4
diff --git a/sys-apps/iproute2/iproute2-3.7.0.ebuild b/sys-apps/iproute2/iproute2-3.7.0.ebuild
new file mode 100644
index 000000000000..0fc5a5e5a5e2
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-3.7.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.7.0.ebuild,v 1.1 2012/12/14 06:40:51 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+ inherit git-2
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal"
+
+RDEPEND="!net-misc/arpd
+ iptables? ( >=net-firewall/iptables-1.4.5 )
+ !minimal? ( berkdb? ( sys-libs/db ) )
+ atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ iptables? ( virtual/pkgconfig )
+ sys-devel/bison
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6.27
+ elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+
+S=${WORKDIR}/${P/2} # fluke :/
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+ use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
+
+ sed -i \
+ -e '/^CC =/d' \
+ -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+ -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+ Makefile || die
+
+ # build against system headers
+ rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+ sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+ # don't build arpd if USE=-berkdb #81660
+ use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+
+ use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
+}
+
+src_configure() {
+ tc-export AR CC PKG_CONFIG
+
+ # This sure is ugly. Should probably move into toolchain-funcs at some point.
+ local setns
+ pushd "${T}" >/dev/null
+ echo 'main(){return setns();};' > test.c
+ ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+ echo 'main(){};' > test.c
+ ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+ popd >/dev/null
+
+ cat <<-EOF > Config
+ TC_CONFIG_ATM := $(usex atm y n)
+ TC_CONFIG_XT := $(usex iptables y n)
+ IP_CONFIG_SETNS := ${setns}
+ # Use correct iptables dir, #144265 #293709
+ IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+ EOF
+}
+
+src_install() {
+ if use minimal ; then
+ into /
+ dosbin tc/tc
+ return 0
+ fi
+
+ emake \
+ DESTDIR="${D}" \
+ LIBDIR="${EPREFIX}"/$(get_libdir) \
+ SBINDIR="${EPREFIX}"/sbin \
+ CONFDIR="${EPREFIX}"/etc/iproute2 \
+ DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+ MANDIR="${EPREFIX}"/usr/share/man \
+ ARPDDIR="${EPREFIX}"/var/lib/arpd \
+ install
+
+ dodir /bin
+ mv "${ED}"/{s,}bin/ip || die #330115
+
+ dolib.a lib/libnetlink.a
+ insinto /usr/include
+ doins include/libnetlink.h
+
+ if use berkdb ; then
+ dodir /var/lib/arpd
+ # bug 47482, arpd doesn't need to be in /sbin
+ dodir /usr/bin
+ mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+ fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 880d71b6a100..a25b8f225e63 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.22 2012/06/01 04:26:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.23 2012/12/14 06:40:51 vapier Exp $
EAPI="4"
-inherit eutils multilib toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
#KEYWORDS=""
else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2"
+ SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
@@ -28,6 +28,7 @@ RDEPEND="!net-misc/arpd
!minimal? ( berkdb? ( sys-libs/db ) )
atm? ( net-dialup/linux-atm )"
DEPEND="${RDEPEND}
+ app-arch/xz-utils
iptables? ( virtual/pkgconfig )
sys-devel/bison
sys-devel/flex
@@ -46,6 +47,7 @@ src_prepare() {
# build against system headers
rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+ sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
# don't build arpd if USE=-berkdb #81660
use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
@@ -83,11 +85,17 @@ src_install() {
emake \
DESTDIR="${D}" \
- SBINDIR=/sbin \
- DOCDIR=/usr/share/doc/${PF} \
- MANDIR=/usr/share/man \
+ LIBDIR="${EPREFIX}"/$(get_libdir) \
+ SBINDIR="${EPREFIX}"/sbin \
+ CONFDIR="${EPREFIX}"/etc/iproute2 \
+ DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+ MANDIR="${EPREFIX}"/usr/share/man \
+ ARPDDIR="${EPREFIX}"/var/lib/arpd \
install
+ dodir /bin
+ mv "${ED}"/{s,}bin/ip || die #330115
+
dolib.a lib/libnetlink.a
insinto /usr/include
doins include/libnetlink.h
@@ -95,7 +103,7 @@ src_install() {
if use berkdb ; then
dodir /var/lib/arpd
# bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/sbin
- mv "${ED}"/sbin/arpd "${ED}"/usr/sbin/
+ dodir /usr/bin
+ mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
fi
}
diff --git a/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch b/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch
new file mode 100644
index 000000000000..05a20e673a87
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch
@@ -0,0 +1,27 @@
+diff -Naur llvm-3.1.src/test/ExecutionEngine/2002-12-16-ArgTest.ll llvm.src/test/ExecutionEngine/2002-12-16-ArgTest.ll
+--- llvm-3.1.src/test/ExecutionEngine/2002-12-16-ArgTest.ll 2012-04-12 22:13:57.000000000 +0200
++++ llvm.src/test/ExecutionEngine/2002-12-16-ArgTest.ll 2012-10-08 15:06:30.000000000 +0200
+@@ -1,4 +1,5 @@
+ ; RUN: %lli %s > /dev/null
++; XFAIL: arm
+
+ @.LC0 = internal global [10 x i8] c"argc: %d\0A\00" ; <[10 x i8]*> [#uses=1]
+
+diff -Naur llvm-3.1.src/test/ExecutionEngine/test-fp-no-external-funcs.ll llvm.src/test/ExecutionEngine/test-fp-no-external-funcs.ll
+--- llvm-3.1.src/test/ExecutionEngine/test-fp-no-external-funcs.ll 2012-04-12 22:13:57.000000000 +0200
++++ llvm.src/test/ExecutionEngine/test-fp-no-external-funcs.ll 2012-10-08 15:06:30.000000000 +0200
+@@ -1,4 +1,5 @@
+ ; RUN: %lli %s > /dev/null
++; XFAIL: arm
+
+ define double @test(double* %DP, double %Arg) {
+ %D = load double* %DP ; [#uses=1]
+diff -Naur llvm-3.1.src/test/ExecutionEngine/test-fp.ll llvm.src/test/ExecutionEngine/test-fp.ll
+--- llvm-3.1.src/test/ExecutionEngine/test-fp.ll 2012-04-12 22:13:57.000000000 +0200
++++ llvm.src/test/ExecutionEngine/test-fp.ll 2012-10-08 15:06:30.000000000 +0200
+@@ -1,4 +1,5 @@
+ ; RUN: %lli %s > /dev/null
++; XFAIL: arm
+
+ define double @test(double* %DP, double %Arg) {
+ %D = load double* %DP ; [#uses=1]
diff --git a/sys-devel/llvm/llvm-3.1-r2.ebuild b/sys-devel/llvm/llvm-3.1-r2.ebuild
index 66d74dd654ce..3962e2a3758a 100644
--- a/sys-devel/llvm/llvm-3.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.1-r2.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/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.6 2012/12/01 22:12:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.1-r2.ebuild,v 1.7 2012/12/14 09:46:31 voyageur Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -99,6 +99,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch
epatch "${FILESDIR}"/${P}-ivybridge_support.patch
epatch "${FILESDIR}"/${P}-fix_debug_line_info.patch
+ epatch "${FILESDIR}"/${P}-ExecutionEngine_tests_xfail_arm.patch
# Apply r600 OpenCL-related patches, bug #425688
epatch "${FILESDIR}"/cl-patches/*.patch
diff --git a/sys-devel/llvm/llvm-3.2_rc3.ebuild b/sys-devel/llvm/llvm-3.2_rc3.ebuild
index a0ed2ad627c4..951f4c5752d6 100644
--- a/sys-devel/llvm/llvm-3.2_rc3.ebuild
+++ b/sys-devel/llvm/llvm-3.2_rc3.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/sys-devel/llvm/llvm-3.2_rc3.ebuild,v 1.1 2012/12/07 15:47:52 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2_rc3.ebuild,v 1.2 2012/12/14 10:33:32 voyageur Exp $
EAPI=5
PYTHON_DEPEND="2"
@@ -13,10 +13,10 @@ SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.2_}/${P/_}.src.tar.bz2"
LICENSE="UoI-NCSA"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax"
+IUSE="debug doc gold +libffi multitarget ocaml test udis86 vim-syntax"
DEPEND="dev-lang/perl
- dev-python/docutils
+ dev-python/sphinx
>=sys-devel/make-3.79
>=sys-devel/flex-2.5.4
>=sys-devel/bison-1.875d
@@ -149,6 +149,9 @@ src_configure() {
src_compile() {
emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1
+ emake -C docs -f Makefile.sphinx man
+ use doc && emake -C docs -f Makefile.sphinx html
+
pax-mark m Release/bin/lli
if use test; then
pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
@@ -158,6 +161,9 @@ src_compile() {
src_install() {
emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
+ doman docs/_build/man/*.1
+ use doc && dohtml -r docs/_build/html/
+
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins utils/vim/*.vim
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 0814aec0cf82..e0ed2f63da8a 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.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/sys-devel/llvm/llvm-9999.ebuild,v 1.35 2012/07/27 18:20:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.36 2012/12/14 10:33:32 voyageur Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -14,10 +14,10 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk"
LICENSE="UoI-NCSA"
SLOT="0"
KEYWORDS=""
-IUSE="debug gold +libffi multitarget ocaml test udis86 vim-syntax"
+IUSE="debug doc gold +libffi multitarget ocaml test udis86 vim-syntax"
DEPEND="dev-lang/perl
- dev-python/docutils
+ dev-python/sphinx
>=sys-devel/make-3.79
>=sys-devel/flex-2.5.4
>=sys-devel/bison-1.875d
@@ -142,18 +142,11 @@ src_configure() {
}
src_compile() {
- # generate the manpages
-# cd docs/CommandGuide || die
-# local infiles=( *.rst )
-#
-# cat > Makefile < \$@
-#EOF
-# emake ${infiles[@]/.rst/.1}
-
emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1
+ emake -C docs -f Makefile.sphinx man
+ use doc && emake -C docs -f Makefile.sphinx html
+
pax-mark m Release/bin/lli
if use test; then
pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
@@ -163,6 +156,9 @@ src_compile() {
src_install() {
emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
+ doman docs/_build/man/*.1
+ use doc && dohtml -r docs/_build/html/
+
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins utils/vim/*.vim
diff --git a/sys-devel/make/make-3.82-r4.ebuild b/sys-devel/make/make-3.82-r4.ebuild
index 3248bbb9576d..600cd35af545 100644
--- a/sys-devel/make/make-3.82-r4.ebuild
+++ b/sys-devel/make/make-3.82-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/sys-devel/make/make-3.82-r4.ebuild,v 1.7 2012/12/12 18:31:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r4.ebuild,v 1.8 2012/12/14 17:39:11 jer Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-fs/rarfs/Manifest b/sys-fs/rarfs/Manifest
new file mode 100644
index 000000000000..5a20627b191c
--- /dev/null
+++ b/sys-fs/rarfs/Manifest
@@ -0,0 +1 @@
+DIST rarfs-0.1.1.tar.gz 349283 SHA256 e4855ab457e0be327641fc5aed958da3a06996425de4183055f2aad428ff0c1c SHA512 a374dc2dcd83808296dc0b0b3109fd84771d47956cc30fa16ac53cc768ae5ff717cff2fa22ebcbacdd72b645b75986c5d44e47aa1a52a92f230f1944ceaa8b28 WHIRLPOOL 8f1c613ad0b70aac85c3533b79b5e8599a3765d4e60633b294c307481dedcb5b91b6a30bce40429b153896f2f5e80105554d19fec813f5231fd505ad6611d70f
diff --git a/sys-fs/rarfs/metadata.xml b/sys-fs/rarfs/metadata.xml
new file mode 100644
index 000000000000..b6b8956cde34
--- /dev/null
+++ b/sys-fs/rarfs/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ pinkbyte@gentoo.org
+ Sergey Popov
+
+
diff --git a/sys-fs/rarfs/rarfs-0.1.1.ebuild b/sys-fs/rarfs/rarfs-0.1.1.ebuild
new file mode 100644
index 000000000000..d3834cf3efa2
--- /dev/null
+++ b/sys-fs/rarfs/rarfs-0.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/rarfs/rarfs-0.1.1.ebuild,v 1.2 2012/12/14 08:49:32 pinkbyte Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit python
+
+DESCRIPTION="Fuse module to mount uncompressed RAR archives"
+HOMEPAGE="http://sourceforge.net/projects/rarfs/"
+SRC_URI="mirror://sourceforge/rarfs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-fs/fuse"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_install() {
+ install_prarfs() {
+ python_convert_shebangs -q ${PYTHON_ABI} scripts/prarfs
+ newbin scripts/prarfs prarfs-${PYTHON_ABI}
+ }
+ python_execute_function -q install_prarfs
+ python_generate_wrapper_scripts "${ED}/usr/bin/prarfs"
+
+ dobin src/rarfs
+ dodoc ${DOCS[@]}
+}
diff --git a/sys-kernel/zen-sources/metadata.xml b/sys-kernel/zen-sources/metadata.xml
index c0aef9e7e701..3903cbbd6ebc 100644
--- a/sys-kernel/zen-sources/metadata.xml
+++ b/sys-kernel/zen-sources/metadata.xml
@@ -9,8 +9,5 @@
wired@gentoo.org
Alex Alexander
-
- Clone git tree with --depth 1 to reduce amount of data to download. Use with caution
-
diff --git a/sys-kernel/zen-sources/zen-sources-9999.ebuild b/sys-kernel/zen-sources/zen-sources-3.6.9999.ebuild
similarity index 89%
rename from sys-kernel/zen-sources/zen-sources-9999.ebuild
rename to sys-kernel/zen-sources/zen-sources-3.6.9999.ebuild
index 05002d0f7cfe..64586d8abe65 100644
--- a/sys-kernel/zen-sources/zen-sources-9999.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-3.6.9999.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/sys-kernel/zen-sources/zen-sources-9999.ebuild,v 1.6 2012/12/11 19:51:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-3.6.9999.ebuild,v 1.1 2012/12/14 19:27:43 hwoarang Exp $
EAPI="2"
@@ -15,6 +15,7 @@ CKV='2.6.99'
ETYPE="sources"
+EGIT_BRANCH="${PV/.9999}/master"
EGIT_REPO_URI="git://github.com/damentz/zen-kernel.git
https://github.com/damentz/zen-kernel.git"
@@ -25,7 +26,7 @@ K_NOSETEXTRAVERSION="don't_set_it"
DESCRIPTION="The Zen Kernel Live Sources"
HOMEPAGE="http://zen-kernel.org"
-IUSE="+minimal"
+IUSE=""
KEYWORDS=""
@@ -37,8 +38,5 @@ pkg_setup(){
ewarn "Git zen-sources are extremely unsupported, even from the upstream"
ewarn "developers. Use them at your own risk and don't bite us if your"
ewarn "system explodes"
- if use minimal; then
- EGIT_OPTIONS="--depth 1"
- fi
kernel-2_pkg_setup
}
diff --git a/sys-kernel/zen-sources/zen-sources-3.7.9999.ebuild b/sys-kernel/zen-sources/zen-sources-3.7.9999.ebuild
new file mode 100644
index 000000000000..681b48dcc045
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-3.7.9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/zen-sources/zen-sources-3.7.9999.ebuild,v 1.1 2012/12/14 19:27:43 hwoarang Exp $
+
+EAPI="2"
+
+COMPRESSTYPE=".lzma"
+K_PREPATCHED="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE=0
+# If these are not set, you will get weird behavior from kernel-2, due to the
+# huge $PV that is used otherwise.
+CKV='2.6.99'
+
+ETYPE="sources"
+
+EGIT_BRANCH="${PV/.9999}/master"
+EGIT_REPO_URI="git://github.com/damentz/zen-kernel.git
+ https://github.com/damentz/zen-kernel.git"
+
+inherit kernel-2 git-2
+detect_version
+
+K_NOSETEXTRAVERSION="don't_set_it"
+DESCRIPTION="The Zen Kernel Live Sources"
+HOMEPAGE="http://zen-kernel.org"
+
+IUSE=""
+
+KEYWORDS=""
+
+K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
+${HOMEPAGE}, also go to #zen-sources on freenode"
+
+pkg_setup(){
+ ewarn "Be carefull!! You are about to install live kernel sources."
+ ewarn "Git zen-sources are extremely unsupported, even from the upstream"
+ ewarn "developers. Use them at your own risk and don't bite us if your"
+ ewarn "system explodes"
+ kernel-2_pkg_setup
+}
diff --git a/virtual/python-argparse/python-argparse-1.ebuild b/virtual/python-argparse/python-argparse-1.ebuild
index 8a5abe11979c..6a8d97b7e625 100644
--- a/virtual/python-argparse/python-argparse-1.ebuild
+++ b/virtual/python-argparse/python-argparse-1.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/virtual/python-argparse/python-argparse-1.ebuild,v 1.1 2012/10/29 13:55:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-argparse/python-argparse-1.ebuild,v 1.2 2012/12/14 16:10:29 mgorny Exp $
EAPI=4
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} jython2_5 )
@@ -23,8 +23,6 @@ setup_globals() {
case "${i}" in
python2_5|python2_6|jython2_5)
local flag=python_targets_${i}
- # Note: add USE-deps when dev-python/argparse starts
- # supporting PYTHON_TARGETS
RDEPEND+=" ${flag}? ( dev-python/argparse[${flag}] )"
;;
*)
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index 9e4a42f35712..f3b85720e3e2 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,2 +1,2 @@
-DIST pshs-0.2.1.tar.bz2 73754 RMD160 607e27902be6db81ec938b96ab981c3eacb27a44 SHA1 cf2874237548e8cff26998eafa47ee2b6ee4334c SHA256 3219a824a508ba4305e83900368e460c248bf23765ae6f126b980cdc939138af
-DIST pshs-0.2.tar.bz2 71756 RMD160 c2ef615dbc693da329dd7ca15e7e166f985ace85 SHA1 680ab8ffc3a805263791ec2b986b81c7c24e062c SHA256 9e02ffb80aaa6e2d736999298ce7788dd4d549b407ae49a1964505153d2a46ac
+DIST pshs-0.2.1.tar.bz2 73754 SHA256 3219a824a508ba4305e83900368e460c248bf23765ae6f126b980cdc939138af SHA512 5684f6dea087b2a91265437eefd59baf9ee3052adc120a5d1cbc9fe06c471fcc484320359bd0dd0b68806916a1135e11f9a51dd87b1ffebf64602e6e938fe553 WHIRLPOOL 73891f2527116c0e85dae7a126963726f71b422d3d14e4932e3dfeb4cc34b1e6572e2d7eb33aade498debb851080e297607b0f757b5e3b62475a137ce51b32b1
+DIST pshs-0.2.tar.bz2 71756 SHA256 9e02ffb80aaa6e2d736999298ce7788dd4d549b407ae49a1964505153d2a46ac SHA512 7dffea2759531d889eebf4c311bcb92eb4c40bd4600c5b548dc0717de134a4cc445f31d89d29edc2d1588388659b8f5271190df689a3ec2349b2ae1b749f3ea5 WHIRLPOOL 71d2ff9936c7c83a32a9d606f2acce84d0701ab582e69afd3d11384e370e433631076571e9e874087f6e21d9cbad6ac891fbeb587c276add2196dec56798c08e
diff --git a/www-servers/pshs/metadata.xml b/www-servers/pshs/metadata.xml
index 98eabec92224..b0edd912f598 100644
--- a/www-servers/pshs/metadata.xml
+++ b/www-servers/pshs/metadata.xml
@@ -10,8 +10,6 @@
using libmagic (sys-apps/file)
Use libnetlink (sys-apps/iproute2) to
get network interface addresses
- Enable port forwarding using UPnP
- via net-libs/miniupnpc
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 5054edbc4f45..0a96d5e5daaa 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1 +1 @@
-DIST libdockapp-0.6.1.tar.bz2 155920 RMD160 f8976acc0c644e33f966ff120c42ea858be3d5f5 SHA1 7cc917f91020ba188b822cc43ef37fff8dbd0ecf SHA256 eacae024ce6f2bdaba50f18bd18a27a9b4a3e290300f92048fdb11ebd273bd9f
+DIST libdockapp-0.6.1.tar.bz2 155920 SHA256 eacae024ce6f2bdaba50f18bd18a27a9b4a3e290300f92048fdb11ebd273bd9f
diff --git a/x11-libs/libdockapp/libdockapp-0.6.1.ebuild b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
index 1eb527b6a6d2..b7044a730680 100644
--- a/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/libdockapp-0.6.1.ebuild,v 1.12 2010/12/02 14:14:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/libdockapp-0.6.1.ebuild,v 1.13 2012/12/14 10:41:30 voyageur Exp $
inherit eutils autotools
@@ -10,7 +10,7 @@ DESCRIPTION="Window Maker Dock Applet Library"
SRC_URI="http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/${P}.tar.bz2"
HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
-LICENSE="as-is"
+LICENSE="MIT public-domain"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
diff --git a/x11-plugins/wmdate/Manifest b/x11-plugins/wmdate/Manifest
index 0367ee92cb14..22bb856c9c11 100644
--- a/x11-plugins/wmdate/Manifest
+++ b/x11-plugins/wmdate/Manifest
@@ -1 +1 @@
-DIST wmdate-0.7.tar.gz 10645 RMD160 d16dd5f0683ac3e02be1159e32263339951064ea SHA1 55112f243f927a4354bd36d7c469d8a2d8bed8b0 SHA256 e246e38a7488470d271dc5262f526462821fa4337c3e07bda8b9b3f9e7b8d975
+DIST wmdate-0.7.tar.gz 10645 SHA256 e246e38a7488470d271dc5262f526462821fa4337c3e07bda8b9b3f9e7b8d975
diff --git a/x11-plugins/wmdate/wmdate-0.7.ebuild b/x11-plugins/wmdate/wmdate-0.7.ebuild
index 58fce18db3df..30a96ea87f0b 100644
--- a/x11-plugins/wmdate/wmdate-0.7.ebuild
+++ b/x11-plugins/wmdate/wmdate-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/wmdate-0.7.ebuild,v 1.12 2010/09/13 08:01:26 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/wmdate-0.7.ebuild,v 1.13 2012/12/14 10:43:17 voyageur Exp $
inherit eutils toolchain-funcs
@@ -8,7 +8,7 @@ DESCRIPTION="yet another date-display dock application"
HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/applications.php"
SRC_URI="http://solfertje.student.utwente.nl/~dalroi/${PN}/files/${P}.tar.gz"
-LICENSE="as-is"
+LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index ca643862e588..007edcb0aa92 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -5,5 +5,4 @@ DIST e16-1.0.6.tar.gz 2212263 SHA256 6ab09e326420982a3b828538bae3f1ea4a2e45b8d5f
DIST e16-1.0.7.tar.gz 2223518 SHA256 d36cf57e4125b173608a6f4cbfa53d91f59f047579fe6a40939874293cfe71bc SHA512 ce9c6108e2d87fa669f774577ed48b9a35e5e9b52d0703f20563bfd23918a542b3833023fc5f98967cc1a3da864d47de4747bbd228c49e53b6e9dc505c3a6b0b WHIRLPOOL 33e0bd6cf6f36a7b1af60b92dd6fccb4805ea2ac9daa47d54902cfdba6338cb2a170d6f3afd0fa0f5a335e994c7d564e2a2eb1816ed6b32f6f53102a8ed35fc4
DIST e16-1.0.8.tar.gz 2243485 SHA256 794d842ec30a29e0d6a85a3bd40120151c27419d77d2fd5759b49862063be27f SHA512 f8d8687a40defdbec385ab007351501a2bd5d39addc6d096655ee57b0384e59aa374c9d1860fa81f5405751e706015b920712c9607b04182916d9a5b7bfe22e7 WHIRLPOOL a558555b955951c9ccd039898d6e8b2219ae284f839ca921fe89bfebbf1ae9257826187c65ab81564cb074b1cb17cfd75bddfea7e02492796be6d05be62c237c
DIST e16-1.0.9.tar.gz 2256543 SHA256 d435840a4a429cb22f241d7889e82827061f6ef5ccd9bbc8720af51dee053d27 SHA512 75dc4c784bb70a22b5baa6462024164a10bcea325aa479d2c856f8d214910f36fba865f78017f5c71847991015e7164ecb3959b9ee6d8e531c1b938bd5f61d2a WHIRLPOOL 1c11956dee0905a5465bbc900c3e5fb5ded702b091d3e1bb93738101a82efda82270e5b1fb530e3980077a53fecdb6136bbc4b9c564136bf82ec475fc851cdbc
-DIST enlightenment-0.17.0-beta.tar.bz2 21595172 SHA256 0abd0a3f94b340e2fca1bb26e0616f3f475d1d937bed7be307d17ae944558262 SHA512 f675b0a152cd1b0a845bc012773662999c7e3b22c41f72b3854f7b69ef36b112406610f2dc89ae9bac520e963dd3a30101a52d8f7ae941c4ff3975483cd3ebfd WHIRLPOOL 8a1f3fd2da03f3a6814f19e0589910ee99e68b24a2cb5c058bc558e20e1edd9c1a4063ab9fc875cbaf54050775fbd3e8fa11d7776cb91d573fa1fdae9eb8ca6f
-DIST enlightenment-0.17.0-gamma.tar.bz2 21699991 SHA256 928fe7d1421adf4caddd20b3c92bbf84864e37b34102197efcdb5f33bc424fae SHA512 237c9ed6bb59e256a952a917ba12801fb05376c014dfbf009f3cc60f8019f9f5250856f3a4204b851d23c9841d644774e13b320cbd8897df0782db684346a04a WHIRLPOOL 49b3bea20cb2ace81d8065146264bbb5c784fc84b8df0d8cbaad124b5b405b9f67cf6085a29c0393997f5d56363181adc7803390056afccbcdd37fdf31297aee
+DIST enlightenment-0.17.0-lucky.tar.bz2 21725785 SHA256 f0e348286d8289b1cdd1513383bd37070a037507278c949e904554cb23bee75d SHA512 70bf10a8f5aa4e5c2c8e04583570d4c278a545c2e8c7a7edb64b61178123b1a75843501bbd141aa995b50ae8d558e6b36a0f2139f05a6d739a0ee03f66ac2bac WHIRLPOOL 1ff8f9f33877259909887d301d59b5535c2c201626fb3ca851c0e6b9d3741ffefc77ef1b31a8b7fbe8e5f1e2c75eda41cde8793206ea8f67b4b55f833203d9d2
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild
deleted file mode 100644
index a6fdc4094dcb..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta.ebuild,v 1.1 2012/12/08 20:19:30 tommy Exp $
-
-EAPI="2"
-
-MY_P=${P/_beta/-beta}
-
-inherit enlightenment
-
-DESCRIPTION="Enlightenment DR17 window manager"
-SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0.17"
-
-# The @ is just an anchor to expand from
-__EVRY_MODS=""
-__CONF_MODS="
- +@applications +@dialogs +@display +@edgebindings
- +@interaction +@intl +@keybindings +@menus
- +@paths +@performance +@randr +@shelves +@theme
- +@window-manipulation +@window-remembers"
-__NORM_MODS="
- @access +@backlight +@battery +@clock +@comp +@connman +@cpufreq +@dropshadow
- +@everything +@fileman +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2
- +@mixer +@msgbus +@notification +@pager +@quickaccess @shot +@start
- +@syscon +@systray +@tasks +@temperature +@tiling +@winlist +@wizard +@xkbswitch"
-IUSE_E_MODULES="
- ${__CONF_MODS//@/enlightenment_modules_conf-}
- ${__NORM_MODS//@/enlightenment_modules_}"
-
-IUSE="emotion pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
-
-RDEPEND="
- pam? ( sys-libs/pam )
- >=dev-libs/efreet-1.7.1
- >=dev-libs/eio-1.7.1
- >=dev-libs/eina-1.7.1[mempool-chained]
- || ( >=dev-libs/ecore-1.7.1[X,evas,inotify] >=dev-libs/ecore-1.7.1[xcb,evas,inotify] )
- >=media-libs/edje-1.7.2
- >=dev-libs/e_dbus-1.7.1[libnotify,udev?]
- ukit? ( >=dev-libs/e_dbus-1.7.1[udev] )
- enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] )
- enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.1[curl] )
- || ( >=media-libs/evas-1.7.1[eet,X,jpeg,png] >=media-libs/evas-1.7.1[eet,xcb,jpeg,png] )
- >=dev-libs/eeze-1.7.1
- emotion? ( >=media-libs/emotion-1.7.0 )
- x11-libs/xcb-util-keysyms"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/quickstart.diff
- enlightenment_src_prepare
-}
-
-src_configure() {
- export MY_ECONF="
- --disable-install-sysactions
- --disable-elementary
- $(use_enable doc)
- --disable-device-hal
- $(use_enable emotion)
- --disable-mount-hal
- $(use_enable nls)
- $(use_enable pam)
- --enable-device-udev
- $(use_enable udev mount-eeze)
- $(use_enable ukit mount-udisks)
- --disable-physics
- "
- local u c
- for u in ${IUSE_E_MODULES} ; do
- u=${u#+}
- c=${u#enlightenment_modules_}
- MY_ECONF+=" $(use_enable ${u} ${c})"
- done
- enlightenment_src_configure
-}
-
-src_install() {
- enlightenment_src_install
- insinto /etc/enlightenment
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf || die
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
similarity index 77%
rename from x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild
rename to x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
index 9dc40041961e..e81613b92512 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta1.ebuild,v 1.1 2012/12/13 20:16:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_beta2.ebuild,v 1.1 2012/12/14 20:13:45 tommy Exp $
EAPI="2"
-MY_P=${P/_beta1/-gamma}
+MY_P=${P/_beta2/-lucky}
-inherit enlightenment
+inherit autotools enlightenment
DESCRIPTION="Enlightenment DR17 window manager"
SRC_URI="http://download.enlightenment.org/releases/${MY_P}.tar.bz2"
@@ -34,18 +34,18 @@ IUSE="emotion pam spell static-libs +udev ukit ${IUSE_E_MODULES}"
RDEPEND="
pam? ( sys-libs/pam )
- >=dev-libs/efreet-1.7.1
- >=dev-libs/eio-1.7.1
- >=dev-libs/eina-1.7.1[mempool-chained]
- || ( >=dev-libs/ecore-1.7.1[X,evas,inotify] >=dev-libs/ecore-1.7.1[xcb,evas,inotify] )
- >=media-libs/edje-1.7.2
+ >=dev-libs/efreet-1.7.3
+ >=dev-libs/eio-1.7.3
+ >=dev-libs/eina-1.7.3[mempool-chained]
+ || ( >=dev-libs/ecore-1.7.3[X,evas,inotify] >=dev-libs/ecore-1.7.3[xcb,evas,inotify] )
+ >=media-libs/edje-1.7.3
>=dev-libs/e_dbus-1.7.1[libnotify,udev?]
ukit? ( >=dev-libs/e_dbus-1.7.1[udev] )
enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] )
- enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.1[curl] )
- || ( >=media-libs/evas-1.7.1[eet,X,jpeg,png] >=media-libs/evas-1.7.1[eet,xcb,jpeg,png] )
+ enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.3[curl] )
+ || ( >=media-libs/evas-1.7.3[eet,X,jpeg,png] >=media-libs/evas-1.7.3[eet,xcb,jpeg,png] )
>=dev-libs/eeze-1.7.1
- emotion? ( >=media-libs/emotion-1.7.0 )
+ emotion? ( >=media-libs/emotion-1.7.3 )
x11-libs/xcb-util-keysyms"
DEPEND="${RDEPEND}"
@@ -53,6 +53,8 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/quickstart.diff
+ sed -i 's:efl_version="1.7.3":efl_version="1.7.1":g' configure.ac
+ eautoreconf
enlightenment_src_prepare
}