diff --git a/app-editors/editra/editra-0.6.76.ebuild b/app-editors/editra/editra-0.6.76.ebuild
index 0b62912b081e..4b7dd86a8bee 100644
--- a/app-editors/editra/editra-0.6.76.ebuild
+++ b/app-editors/editra/editra-0.6.76.ebuild
@@ -1,10 +1,11 @@
-# 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/app-editors/editra/editra-0.6.76.ebuild,v 1.1 2011/10/02 23:48:17 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.6.76.ebuild,v 1.3 2012/02/28 11:51:10 patrick Exp $
EAPI=2
SUPPORT_PYTHON_ABIS=1
PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils eutils fdo-mime python
@@ -25,8 +26,6 @@ DEPEND=">=dev-python/wxpython-2.8.9.2:2.8
RDEPEND="${DEPEND}
spell? ( dev-python/pyenchant )"
-RESTRICT_PYTHON_ABIS="3.*"
-
S="${WORKDIR}"/${MY_PN}-${PV}
src_compile() {
diff --git a/app-editors/editra/editra-0.6.89.ebuild b/app-editors/editra/editra-0.6.89.ebuild
index 1ab22cdd6b29..05fca7bc8d7a 100644
--- a/app-editors/editra/editra-0.6.89.ebuild
+++ b/app-editors/editra/editra-0.6.89.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.6.89.ebuild,v 1.1 2012/02/20 08:07:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/editra/editra-0.6.89.ebuild,v 1.3 2012/02/28 11:51:10 patrick Exp $
EAPI=2
SUPPORT_PYTHON_ABIS=1
PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils eutils fdo-mime python
@@ -25,8 +26,6 @@ DEPEND=">=dev-python/wxpython-2.8.9.2:2.8
RDEPEND="${DEPEND}
spell? ( dev-python/pyenchant )"
-RESTRICT_PYTHON_ABIS="3.*"
-
S="${WORKDIR}"/${MY_PN}-${PV}
src_compile() {
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index 5be2bf4f8d4e..4f133f9d34ef 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.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/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.14 2012/02/27 21:29:20 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.15 2012/02/28 09:30:29 scarabeus Exp $
EAPI=4
@@ -495,9 +495,8 @@ pkg_postinst() {
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- if ! use cups ; then
- ewarn 'You will need net-print/cups to be able to print with libreoffice.'
- fi
+ use cups || \
+ ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
}
pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 3a5deb64a43c..2630de2fc06a 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.28 2012/02/27 21:44:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.29 2012/02/28 09:30:29 scarabeus Exp $
EAPI=4
@@ -499,7 +499,7 @@ pkg_postinst() {
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
use cups || \
- ewarn 'You will need net-print/cups to be able to print with libreoffice.'
+ ewarn 'You will need net-print/cups to be able to print and export to PDF with libreoffice.'
}
pkg_postrm() {
diff --git a/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch b/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch
new file mode 100644
index 000000000000..2ed0308af74d
--- /dev/null
+++ b/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch
@@ -0,0 +1,11 @@
+--- openjdk/sun/print/Win32PrintService.java.orig 2012-02-26 17:56:16.751000012 +0100
++++ openjdk/sun/print/Win32PrintService.java 2012-02-26 17:56:37.182000012 +0100
+@@ -119,7 +119,7 @@
+ Chromaticity.class
+ };
+
+- // conversion from 1/100 Inch (.NET) to µm (Java)
++ // conversion from 1/100 Inch (.NET) to m (Java)
+ private static final int INCH100_TO_MYM = 254;
+ private static final int MATCH_DIFF = 500; // 0.5 mm
+
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
index 231d63827d3a..c05ec1094118 100644
--- a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.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/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.1 2012/01/21 13:49:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.2 2012/02/28 08:30:16 pacho Exp $
EAPI="4"
@@ -21,12 +21,15 @@ RDEPEND=">=dev-lang/mono-2
DEPEND="${RDEPEND}
!dev-dotnet/ikvm-bin
>=dev-dotnet/nant-0.85
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.6:1.6
app-arch/unzip
dev-util/pkgconfig
app-arch/sharutils"
src_prepare() {
+ # Fix unmappable character for encoding ASCII, bug #399729
+ epatch "${FILESDIR}"/${PN}-0.46.0.2-unmappable-character.patch
+
# We cannot rely on Mono Crypto Service Provider as it doesn't work inside
# sandbox, we simply hard-code the path to a bundled key like Debian does.
epatch "${FILESDIR}"/${PN}-0.46.0.1-key.patch
diff --git a/dev-lang/php/files/eblits/src_configure-v53.eblit b/dev-lang/php/files/eblits/src_configure-v53.eblit
index 027758dbd57c..04bc455aaad6 100644
--- a/dev-lang/php/files/eblits/src_configure-v53.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v53.eblit
@@ -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/files/eblits/src_configure-v53.eblit,v 1.3 2012/02/27 22:04:47 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v 1.4 2012/02/28 10:59:13 mabi Exp $
eblit-php-src_configure() {
addpredict /usr/share/snmp/mibs/.index
@@ -164,7 +164,7 @@ eblit-php-src_configure() {
# Oracle support
if use oci8-instant-client ; then
my_conf+="
- $(use_with oci8-instant-client oci8)
+ $(use_with oci8-instant-client oci8)"
fi
# PDO support
diff --git a/dev-lang/php/files/eblits/src_configure-v54.eblit b/dev-lang/php/files/eblits/src_configure-v54.eblit
index 09ebc14959b1..bc17877c5916 100644
--- a/dev-lang/php/files/eblits/src_configure-v54.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v54.eblit
@@ -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/files/eblits/src_configure-v54.eblit,v 1.2 2012/02/27 22:04:47 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.3 2012/02/28 11:02:54 olemarkus Exp $
eblit-php-src_configure() {
addpredict /usr/share/snmp/mibs/.index
@@ -162,7 +162,7 @@ eblit-php-src_configure() {
# Oracle support
if use oci8-instant-client ; then
my_conf+="
- $(use_with oci8-instant-client oci8)
+ $(use_with oci8-instant-client oci8)"
fi
# PDO support
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 650caa7b1112..cc4202808d87 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1 +1,2 @@
DIST apr-1.4.5.tar.bz2 754763 RMD160 d2a966c1b143416cd3655cf849cb5d3cb1ca2c5f SHA1 517de5e3cc1e3be810d9bc95508ab66bb8ebe7cb SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e
+DIST apr-1.4.6.tar.bz2 785724 RMD160 ca496323a921f71ed28695ede94ff4fc00df9b0d SHA1 1a72fc9d89a378590ef243399396169426d1f6cf SHA256 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc
diff --git a/dev-libs/apr/apr-1.4.6.ebuild b/dev-libs/apr/apr-1.4.6.ebuild
new file mode 100644
index 000000000000..2b002ef2878f
--- /dev/null
+++ b/dev-libs/apr/apr-1.4.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6.ebuild,v 1.1 2012/02/28 08:08:16 idl0r Exp $
+
+EAPI="4"
+
+inherit autotools eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
+
+RDEPEND="uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+ # Ensure that system libtool is used.
+ sed -e 's:${installbuilddir}/libtool:/usr/bin/libtool:' -i apr-config.in || die "sed failed"
+ sed -e 's:@LIBTOOL@:$(SHELL) /usr/bin/libtool:' -i build/apr_rules.mk.in || die "sed failed"
+
+ AT_M4DIR="build" eautoreconf
+ elibtoolize
+
+ epatch "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+ local myconf
+
+ if use older-kernels-compatibility; then
+ local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+ export apr_cv_accept4="no"
+ export apr_cv_dup3="no"
+ export apr_cv_epoll_create1="no"
+ export apr_cv_sock_cloexec="no"
+ fi
+
+ if use urandom; then
+ myconf+=" --with-devrandom=/dev/urandom"
+ else
+ myconf+=" --with-devrandom=/dev/random"
+ fi
+
+ if ! use uuid; then
+ local apr_cv_osuuid
+ export apr_cv_osuuid="no"
+ fi
+
+ CONFIG_SHELL="/bin/bash" econf \
+ --enable-layout=gentoo \
+ --enable-nonportable-atomics \
+ --enable-threads \
+ ${myconf}
+
+ rm -f libtool
+}
+
+src_compile() {
+ emake
+
+ if use doc; then
+ emake dox
+ fi
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name "*.la" -exec rm -f {} +
+
+ if use doc; then
+ dohtml -r docs/dox/html/*
+ fi
+
+ if ! use static-libs; then
+ find "${ED}" -name "*.a" -exec rm -f {} +
+ fi
+
+ # This file is only used on AIX systems, which Gentoo is not,
+ # and causes collisions between the SLOTs, so remove it.
+ rm -f "${ED}usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml
index 7a90328af9c1..b3e439228262 100644
--- a/dev-libs/apr/metadata.xml
+++ b/dev-libs/apr/metadata.xml
@@ -1,13 +1,13 @@
-apache
-
- apache-bugs@gentoo.org
-
-
+ apache
+
+ apache-bugs@gentoo.org
+
+
diff --git a/dev-libs/expat/expat-2.0.1-r6.ebuild b/dev-libs/expat/expat-2.0.1-r6.ebuild
index f1c013273c41..2a5583f4ba3e 100644
--- a/dev-libs/expat/expat-2.0.1-r6.ebuild
+++ b/dev-libs/expat/expat-2.0.1-r6.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/expat/expat-2.0.1-r6.ebuild,v 1.3 2012/02/27 15:17:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r6.ebuild,v 1.4 2012/02/28 10:35:34 ssuominen Exp $
EAPI=4
inherit eutils libtool toolchain-funcs
@@ -35,11 +35,11 @@ src_configure() {
if use unicode; then
pushd "${S}"-buildu >/dev/null
- CPPFLAGS+=" -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
+ CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
pushd "${S}"-buildw >/dev/null
- CFLAGS+=" -fshort-wchar" CPPFLAGS+=" -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
+ CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
popd >/dev/null
fi
}
diff --git a/dev-ruby/bourne/Manifest b/dev-ruby/bourne/Manifest
new file mode 100644
index 000000000000..f0e4e068dee4
--- /dev/null
+++ b/dev-ruby/bourne/Manifest
@@ -0,0 +1 @@
+DIST bourne-1.1.0.gem 17408 RMD160 751ccf35d6d134c7ae3d053abbbaf73c2621fbf8 SHA1 ad1c973caf239c24c02f373bcddb51f1f686b2dd SHA256 999a39c2e31dacd82a5b793354ce39afaab3c0189c9ef2a760c4b25aa9b99a29
diff --git a/dev-ruby/bourne/bourne-1.1.0.ebuild b/dev-ruby/bourne/bourne-1.1.0.ebuild
new file mode 100644
index 000000000000..1506390843fd
--- /dev/null
+++ b/dev-ruby/bourne/bourne-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bourne/bourne-1.1.0.ebuild,v 1.1 2012/02/28 11:04:24 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_TEST="default"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extends mocha to allow detailed tracking and querying of stub and mock invocations."
+HOMEPAGE="http://github.com/thoughtbot/bourne"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/mocha-0.10*"
+
+all_ruby_prepare() {
+ sed -i \
+ -e '/git ls-files/d' \
+ -e '/dependency.*mocha/s:= 0.10.4:~> 0.10.3:' \
+ "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+ sed -i -e '/bundler/d' Rakefile || die
+}
diff --git a/dev-ruby/bourne/metadata.xml b/dev-ruby/bourne/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/bourne/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/cocaine/Manifest b/dev-ruby/cocaine/Manifest
new file mode 100644
index 000000000000..1b7217f18421
--- /dev/null
+++ b/dev-ruby/cocaine/Manifest
@@ -0,0 +1 @@
+DIST cocaine-0.2.1.gem 8704 RMD160 f3cf916358cc9e1a1844279cfe578fa1f9e7ff22 SHA1 6a8b62702a6a38dd71ad381d70dcad0f5b003798 SHA256 ceda8dae6dc695f36363a8a38b26895e9ace92cc09d4efb7156e48706d984cdf
diff --git a/dev-ruby/cocaine/cocaine-0.2.1.ebuild b/dev-ruby/cocaine/cocaine-0.2.1.ebuild
new file mode 100644
index 000000000000..a28ff852db5b
--- /dev/null
+++ b/dev-ruby/cocaine/cocaine-0.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cocaine/cocaine-0.2.1.ebuild,v 1.1 2012/02/28 11:09:34 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_TEST="default"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A small library for doing command lines"
+HOMEPAGE="http://www.thoughtbot.com/projects/cocaine"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/bourne
+ dev-ruby/mocha
+ dev-ruby/rspec
+ )"
+
+all_ruby_prepare() {
+ sed -i \
+ -e '/git ls-files/d' \
+ -e '/dependency.*mocha/s:= 0.10.4:~> 0.10.3:' \
+ "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+ rm Gemfile* || die
+
+ sed -i -e '/bundler/d' Rakefile || die
+}
diff --git a/dev-ruby/cocaine/metadata.xml b/dev-ruby/cocaine/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/cocaine/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/eclass/mozconfig-3.eclass b/eclass/mozconfig-3.eclass
index 8e953cd39a33..b499b4b45cdc 100644
--- a/eclass/mozconfig-3.eclass
+++ b/eclass/mozconfig-3.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/mozconfig-3.eclass,v 1.28 2012/02/28 03:49:41 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-3.eclass,v 1.29 2012/02/28 05:04:25 anarchy Exp $
#
# mozconfig.eclass: the new mozilla.eclass
@@ -36,7 +36,7 @@ mozconfig_config() {
if has bindist ${IUSE}; then
mozconfig_use_enable !bindist official-branding
- if [[ ${PN} == firefox ]] ; then
+ if [[ ${PN} == firefox ]] && use bindist ; then
mozconfig_annotate '' --with-branding=browser/branding/aurora
fi
fi
diff --git a/media-gfx/dispcalgui/dispcalgui-0.7.0.7.ebuild b/media-gfx/dispcalgui/dispcalgui-0.7.0.7.ebuild
index 34c4b7d03e20..29df2358d3d6 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.7.0.7.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.7.0.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.7.0.7.ebuild,v 1.1 2011/06/06 10:59:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.7.0.7.ebuild,v 1.2 2012/02/28 12:27:28 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils fdo-mime
diff --git a/media-gfx/dispcalgui/dispcalgui-0.7.3.7.ebuild b/media-gfx/dispcalgui/dispcalgui-0.7.3.7.ebuild
index 140606363648..94a4add18997 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.7.3.7.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.7.3.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.7.3.7.ebuild,v 1.1 2011/09/30 17:13:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.7.3.7.ebuild,v 1.2 2012/02/28 12:27:28 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils fdo-mime
diff --git a/media-gfx/dispcalgui/dispcalgui-0.7.8.9.ebuild b/media-gfx/dispcalgui/dispcalgui-0.7.8.9.ebuild
index c4567bf75247..d85a35f1f8e6 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.7.8.9.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.7.8.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.7.8.9.ebuild,v 1.1 2011/11/18 20:21:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.7.8.9.ebuild,v 1.2 2012/02/28 12:27:28 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils fdo-mime
diff --git a/media-gfx/dispcalgui/dispcalgui-0.8.1.9.ebuild b/media-gfx/dispcalgui/dispcalgui-0.8.1.9.ebuild
index 81eca391e232..c1bffff17989 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.8.1.9.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.8.1.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.8.1.9.ebuild,v 1.1 2011/12/30 09:16:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.8.1.9.ebuild,v 1.2 2012/02/28 12:27:28 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils fdo-mime
diff --git a/media-gfx/dispcalgui/dispcalgui-0.8.5.2.ebuild b/media-gfx/dispcalgui/dispcalgui-0.8.5.2.ebuild
index 3a8ddda81c94..c37521c0a0f6 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.8.5.2.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.8.5.2.ebuild
@@ -1,11 +1,11 @@
# 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-0.8.5.2.ebuild,v 1.2 2012/02/14 17:18:15 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.8.5.2.ebuild,v 1.3 2012/02/28 12:27:28 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
inherit distutils fdo-mime
diff --git a/media-gfx/dispcalgui/dispcalgui-0.8.9.3.ebuild b/media-gfx/dispcalgui/dispcalgui-0.8.9.3.ebuild
index bb441eaeee4d..4e4000e17a80 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.8.9.3.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.8.9.3.ebuild
@@ -1,11 +1,11 @@
# 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-0.8.9.3.ebuild,v 1.1 2012/02/14 21:21:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.8.9.3.ebuild,v 1.2 2012/02/28 12:27:28 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
inherit distutils fdo-mime
diff --git a/media-gfx/fontypython/fontypython-0.4.2.3.ebuild b/media-gfx/fontypython/fontypython-0.4.2.3.ebuild
index 024b74b9c6ed..97ca7c9663c1 100644
--- a/media-gfx/fontypython/fontypython-0.4.2.3.ebuild
+++ b/media-gfx/fontypython/fontypython-0.4.2.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.2.3.ebuild,v 1.8 2011/03/04 22:26:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontypython/fontypython-0.4.2.3.ebuild,v 1.9 2012/02/28 12:29:39 patrick Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
inherit distutils multilib python
diff --git a/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild b/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild
index 79367c055cd5..6976a4454a5b 100644
--- a/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild
+++ b/media-sound/quodlibet/quodlibet-2.3.92-r1.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/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild,v 1.2 2012/02/21 17:59:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild,v 1.3 2012/02/28 13:16:02 patrick Exp $
EAPI=4
PYTHON_DEPEND="2:2.7"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="2.5 2.6 3.* *-jython 2.7-pypy-*"
inherit distutils eutils
diff --git a/metadata/cache/dev-dotnet/ikvm-0.46.0.2 b/metadata/cache/dev-dotnet/ikvm-0.46.0.2
index e8cf05184830..f4f48391e52c 100644
--- a/metadata/cache/dev-dotnet/ikvm-0.46.0.2
+++ b/metadata/cache/dev-dotnet/ikvm-0.46.0.2
@@ -1,4 +1,4 @@
->=dev-lang/mono-2 dev-libs/glib !dev-dotnet/ikvm-bin >=dev-dotnet/nant-0.85 >=virtual/jdk-1.6 app-arch/unzip dev-util/pkgconfig app-arch/sharutils >=dev-java/java-config-2.1.9-r1
+>=dev-lang/mono-2 dev-libs/glib !dev-dotnet/ikvm-bin >=dev-dotnet/nant-0.85 >=virtual/jdk-1.6:1.6 app-arch/unzip dev-util/pkgconfig app-arch/sharutils >=dev-java/java-config-2.1.9-r1
>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.1.9-r1
0
http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.2.zip
diff --git a/metadata/cache/dev-libs/apr-1.4.6 b/metadata/cache/dev-libs/apr-1.4.6
new file mode 100644
index 000000000000..f65133c79755
--- /dev/null
+++ b/metadata/cache/dev-libs/apr-1.4.6
@@ -0,0 +1,22 @@
+uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )
+1
+mirror://apache/apr/apr-1.4.6.tar.bz2
+
+http://apr.apache.org/
+Apache-2.0
+Apache Portable Runtime Library
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils libtool multilib portability toolchain-funcs user
+doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid
+
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/bourne-1.1.0 b/metadata/cache/dev-ruby/bourne-1.1.0
new file mode 100644
index 000000000000..6978a6bdca22
--- /dev/null
+++ b/metadata/cache/dev-ruby/bourne-1.1.0
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/mocha-0.10*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/mocha-0.10*[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/mocha-0.10*[ruby_targets_ree18] ) ruby_targets_jruby? ( =dev-ruby/mocha-0.10*[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/bourne-1.1.0.gem
+
+http://github.com/thoughtbot/bourne
+MIT
+Extends mocha to allow detailed tracking and querying of stub and mock invocations.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/cocaine-0.2.1 b/metadata/cache/dev-ruby/cocaine-0.2.1
new file mode 100644
index 000000000000..d7fc86ecdb34
--- /dev/null
+++ b/metadata/cache/dev-ruby/cocaine-0.2.1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/bourne[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] dev-ruby/rspec[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bourne[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] dev-ruby/rspec[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bourne[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] dev-ruby/rspec[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/bourne[ruby_targets_jruby] dev-ruby/mocha[ruby_targets_jruby] dev-ruby/rspec[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+0
+mirror://rubygems/cocaine-0.2.1.gem
+
+http://www.thoughtbot.com/projects/cocaine
+MIT
+A small library for doing command lines
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/metasploit-3.3.3 b/metadata/cache/net-analyzer/metasploit-3.3.3
deleted file mode 100644
index 6c6cffd33125..000000000000
--- a/metadata/cache/net-analyzer/metasploit-3.3.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/ruby dev-ruby/rubygems gtk? ( dev-ruby/ruby-libglade2 ) sqlite? ( dev-ruby/sqlite3-ruby dev-ruby/activerecord ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord )
-3.3
-http://www.metasploit.com/releases/framework-3.3.3.tar.bz2
-
-http://www.metasploit.org/
-BSD
-Advanced open-source framework for developing, testing, and using vulnerability exploit code
-~amd64 ~ppc ~sparc ~x86
-
-gtk sqlite postgres
-
-
-
-
-
-install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/metasploit-3.4.0 b/metadata/cache/net-analyzer/metasploit-3.4.0
deleted file mode 100644
index fa489c0a3349..000000000000
--- a/metadata/cache/net-analyzer/metasploit-3.4.0
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/ruby dev-ruby/rubygems gtk? ( dev-ruby/ruby-libglade2 ) sqlite? ( dev-ruby/sqlite3-ruby dev-ruby/activerecord ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord )
-3.4
-http://www.metasploit.com/releases/framework-3.4.0.tar.bz2
-
-http://www.metasploit.org/
-BSD
-Advanced open-source framework for developing, testing, and using vulnerability exploit code
-~amd64 ~ppc ~sparc ~x86
-
-gtk sqlite postgres
-
-
-
-
-
-install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/metasploit-3.4.1 b/metadata/cache/net-analyzer/metasploit-3.4.1
deleted file mode 100644
index f300e8d590f1..000000000000
--- a/metadata/cache/net-analyzer/metasploit-3.4.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/ruby dev-ruby/rubygems gtk? ( dev-ruby/ruby-libglade2 ) sqlite? ( dev-ruby/sqlite3-ruby dev-ruby/activerecord ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord )
-3.4
-http://www.metasploit.com/releases/framework-3.4.1.tar.bz2
-
-http://www.metasploit.org/
-BSD
-Advanced open-source framework for developing, testing, and using vulnerability exploit code
-~amd64 ~ppc ~sparc ~x86
-
-gtk sqlite postgres
-
-
-
-
-
-install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/metasploit-3.5.0 b/metadata/cache/net-analyzer/metasploit-3.5.0
deleted file mode 100644
index f25553641019..000000000000
--- a/metadata/cache/net-analyzer/metasploit-3.5.0
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/ruby dev-ruby/rubygems gtk? ( dev-ruby/ruby-libglade2 ) sqlite? ( dev-ruby/sqlite3-ruby dev-ruby/activerecord ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord )
-3.5
-http://www.metasploit.com/releases/framework-3.5.0.tar.bz2
-
-http://www.metasploit.org/
-BSD
-Advanced open-source framework for developing, testing, and using vulnerability exploit code
-~amd64 ~ppc ~sparc ~x86
-
-gtk sqlite postgres
-
-
-
-
-
-install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/metasploit-3.6.0 b/metadata/cache/net-analyzer/metasploit-3.6.0
deleted file mode 100644
index 3177a113a6bf..000000000000
--- a/metadata/cache/net-analyzer/metasploit-3.6.0
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/ruby dev-ruby/rubygems gtk? ( dev-ruby/ruby-libglade2 ) sqlite? ( dev-ruby/sqlite3-ruby dev-ruby/activerecord ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord )
-3.6
-http://updates.metasploit.com/data/releases/framework-3.6.0.tar.bz2
-
-http://www.metasploit.org/
-BSD
-Advanced open-source framework for developing, testing, and using vulnerability exploit code
-~amd64 ~ppc ~sparc ~x86
-
-gtk sqlite postgres
-
-
-
-
-
-install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/metasploit-3.7.0 b/metadata/cache/net-analyzer/metasploit-3.7.0
deleted file mode 100644
index 70848ab8493c..000000000000
--- a/metadata/cache/net-analyzer/metasploit-3.7.0
+++ /dev/null
@@ -1,22 +0,0 @@
-
-dev-lang/ruby dev-ruby/rubygems gtk? ( dev-ruby/ruby-libglade2 ) sqlite? ( dev-ruby/sqlite3-ruby dev-ruby/activerecord ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord )
-3.7
-http://updates.metasploit.com/data/releases/framework-3.7.0.tar.bz2
-
-http://www.metasploit.org/
-BSD
-Advanced open-source framework for developing, testing, and using vulnerability exploit code
-~amd64 ~ppc ~sparc ~x86
-
-gtk sqlite postgres
-
-
-
-
-
-install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/metasploit-4.1.4 b/metadata/cache/net-analyzer/metasploit-4.2.0
similarity index 86%
rename from metadata/cache/net-analyzer/metasploit-4.1.4
rename to metadata/cache/net-analyzer/metasploit-4.2.0
index 4002fc75c024..13d867288b56 100644
--- a/metadata/cache/net-analyzer/metasploit-4.1.4
+++ b/metadata/cache/net-analyzer/metasploit-4.2.0
@@ -1,7 +1,7 @@
dev-lang/ruby dev-ruby/rubygems gui? ( virtual/jre ) mysql? ( dev-ruby/mysql-ruby dev-ruby/activerecord[mysql] ) postgres? ( dev-ruby/ruby-postgres dev-ruby/activerecord[postgres] )
4.1
-http://downloads.metasploit.com/data/releases/framework-latest.tar.bz2
+http://updates.metasploit.com/data/releases/framework-4.2.0.tar.bz2
http://www.metasploit.org/
BSD
diff --git a/metadata/cache/net-firewall/ufw-0.30.1-r3 b/metadata/cache/net-firewall/ufw-0.30.1-r3
deleted file mode 100644
index c34ebb53bf96..000000000000
--- a/metadata/cache/net-firewall/ufw-0.30.1-r3
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=net-firewall/iptables-1.4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://launchpad.net/ufw/0.30/0.30.1/+download/ufw-0.30.1.tar.gz
-test
-http://launchpad.net/ufw
-GPL-3
-A program used to manage a netfilter firewall
-~amd64 ~x86
-bash-completion-r1 distutils eutils linux-info multilib portability python toolchain-funcs user versionator
-examples
-
-
-
-3
-
-compile install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-firewall/ufw-0.30.1-r2 b/metadata/cache/net-firewall/ufw-0.30.1-r4
similarity index 69%
rename from metadata/cache/net-firewall/ufw-0.30.1-r2
rename to metadata/cache/net-firewall/ufw-0.30.1-r4
index c34ebb53bf96..94323b565c9f 100644
--- a/metadata/cache/net-firewall/ufw-0.30.1-r2
+++ b/metadata/cache/net-firewall/ufw-0.30.1-r4
@@ -1,4 +1,4 @@
->=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+sys-devel/gettext >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
>=net-firewall/iptables-1.4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
0
http://launchpad.net/ufw/0.30/0.30.1/+download/ufw-0.30.1.tar.gz
@@ -12,9 +12,9 @@ examples
-3
+4
-compile install postinst postrm prepare setup
+compile install postinst postrm prepare pretend setup
diff --git a/metadata/cache/net-mail/automx-0.8_beta1 b/metadata/cache/net-mail/automx-0.8_beta1
new file mode 100644
index 000000000000..6f4bd4337533
--- /dev/null
+++ b/metadata/cache/net-mail/automx-0.8_beta1
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+dev-python/lxml || ( www-apache/mod_wsgi www-servers/uwsgi ) tools? ( net-dns/bind-tools ) tools? ( net-misc/wget ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://www.automx.org/download/automx-0.8_beta1.tar.gz
+
+http://www.automx.org
+GPL-3
+A mail user agent auto configuration service
+~amd64 ~x86
+multilib python toolchain-funcs
+doc +tools
+
+
+
+4
+
+install postinst postrm setup
+
+
+
+
+
diff --git a/metadata/cache/net-misc/ofono-1.0 b/metadata/cache/net-misc/ofono-1.0
new file mode 100644
index 000000000000..365ab21718d2
--- /dev/null
+++ b/metadata/cache/net-misc/ofono-1.0
@@ -0,0 +1,22 @@
+>=sys-apps/dbus-1.2.24 >=dev-libs/glib-2.16 bluetooth? ( >=net-wireless/bluez-4.61 ) caps? ( sys-libs/libcap-ng ) udev? ( >=sys-fs/udev-143 ) examples? ( dev-python/dbus-python ) tools? ( dev-libs/libusb:1 ) dev-util/pkgconfig !=sys-apps/dbus-1.2.24 >=dev-libs/glib-2.16 bluetooth? ( >=net-wireless/bluez-4.61 ) caps? ( sys-libs/libcap-ng ) udev? ( >=sys-fs/udev-143 ) examples? ( dev-python/dbus-python ) tools? ( dev-libs/libusb:1 )
+0
+mirror://kernel/linux/network/ofono/ofono-1.0.tar.bz2
+
+http://ofono.org/
+GPL-2
+Open Source mobile telephony (GSM/UMTS) daemon.
+~arm ~amd64 ~x86
+multilib systemd toolchain-funcs
++atmodem bluetooth +caps +cdmamodem examples +isimodem +phonesim threads tools +udev
+
+
+
+2
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-misc/rsync-3.0.9 b/metadata/cache/net-misc/rsync-3.0.9
index 0246dbe7690d..f44290fb0f0c 100644
--- a/metadata/cache/net-misc/rsync-3.0.9
+++ b/metadata/cache/net-misc/rsync-3.0.9
@@ -6,7 +6,7 @@ http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz
http://rsync.samba.org/
GPL-3
File transfer program to keep remote files into sync
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
eutils flag-o-matic multilib portability toolchain-funcs user
acl iconv ipv6 static xattr
diff --git a/metadata/cache/net-p2p/ncdc-1.7 b/metadata/cache/net-p2p/ncdc-1.7
deleted file mode 100644
index a6ff29453562..000000000000
--- a/metadata/cache/net-p2p/ncdc-1.7
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2:2 sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig
-app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2:2 sys-libs/gdbm sys-libs/ncurses:5
-0
-http://dev.yorhel.nl/download/ncdc-1.7.tar.gz
-
-http://dev.yorhel.nl/ncdc
-MIT
-ncurses directconnect client
-~amd64 ~ppc ~sparc ~x86
-base eutils multilib portability toolchain-funcs user
-
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/ncdc-1.8 b/metadata/cache/net-p2p/ncdc-1.8-r1
similarity index 62%
rename from metadata/cache/net-p2p/ncdc-1.8
rename to metadata/cache/net-p2p/ncdc-1.8-r1
index 387d044a5e52..d6a79324cc1a 100644
--- a/metadata/cache/net-p2p/ncdc-1.8
+++ b/metadata/cache/net-p2p/ncdc-1.8-r1
@@ -1,5 +1,5 @@
-app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig
-app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 sys-libs/gdbm sys-libs/ncurses:5
+app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig
+app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5
0
http://dev.yorhel.nl/download/ncdc-1.8.tar.gz
diff --git a/metadata/cache/net-p2p/ncdc-9999 b/metadata/cache/net-p2p/ncdc-9999
index aca02689891a..6cd020fff70d 100644
--- a/metadata/cache/net-p2p/ncdc-9999
+++ b/metadata/cache/net-p2p/ncdc-9999
@@ -1,5 +1,5 @@
-app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig dev-util/makeheaders || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
-app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 sys-libs/gdbm sys-libs/ncurses:5
+app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig dev-util/makeheaders || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5
0
diff --git a/metadata/cache/rox-base/xdg-menu-1.5 b/metadata/cache/rox-base/xdg-menu-1.5
index fbffec3d92ae..75d90474ffac 100644
--- a/metadata/cache/rox-base/xdg-menu-1.5
+++ b/metadata/cache/rox-base/xdg-menu-1.5
@@ -1,4 +1,4 @@
-sys-devel/gettext >=app-admin/eselect-python-20091230 =dev-lang/python-2* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+sys-devel/gettext >=app-admin/eselect-python-20091230 =dev-lang/python-2* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
>=dev-python/pyxdg-0.14 >=dev-python/dbus-python-0.80.2 gnome-base/gnome-menus >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=rox-base/rox-2.1.0 >=rox-base/rox-lib-2.0.0
0
mirror://sourceforge/xdg-menu/XDG-Menu-1.5.tgz
@@ -6,7 +6,7 @@ mirror://sourceforge/xdg-menu/XDG-Menu-1.5.tgz
http://xdg-menu.sourceforge.net/
GPL-2
XDG-Menu is a ROX Menu Application that is XDG Compliant.
-~amd64 ~ppc ~sparc ~x86
+amd64 ~ppc ~sparc ~x86
autotools eutils libtool multilib portability python rox toolchain-funcs user
diff --git a/metadata/cache/sci-biology/picard-1.63 b/metadata/cache/sci-biology/picard-1.63
new file mode 100644
index 000000000000..a24d93235f9d
--- /dev/null
+++ b/metadata/cache/sci-biology/picard-1.63
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.6 dev-java/ant-apache-bcel:0 app-arch/zip dev-vcs/subversion net-misc/rsync >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-apache-bcel >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
+0
+
+
+http://picard.sourceforge.net/
+Apache-2.0
+Java-based command-line utilities that manipulate SAM files
+~amd64
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability subversion toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-biology/prank-081202 b/metadata/cache/sci-biology/prank-081202
deleted file mode 100644
index 45c349642949..000000000000
--- a/metadata/cache/sci-biology/prank-081202
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.ebi.ac.uk/goldman-srv/prank/src/prank.src.081202.tgz
-
-http://www.ebi.ac.uk/goldman-srv/prank/prank/
-GPL-2
-Probabilistic Alignment Kit
-~amd64 ~x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sci-biology/prank-091016 b/metadata/cache/sci-biology/prank-091016
deleted file mode 100644
index 1643a46cbacb..000000000000
--- a/metadata/cache/sci-biology/prank-091016
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.ebi.ac.uk/goldman-srv/prank/src/prank/prank.src.091016.tgz
-
-http://www.ebi.ac.uk/goldman-srv/prank/prank/
-GPL-2
-Probabilistic Alignment Kit
-~amd64 ~x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sci-biology/prank-100311 b/metadata/cache/sci-biology/prank-100311
deleted file mode 100644
index 31192691972b..000000000000
--- a/metadata/cache/sci-biology/prank-100311
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.ebi.ac.uk/goldman-srv/prank/src/prank/prank.src.100311.tgz
-
-http://www.ebi.ac.uk/goldman-srv/prank/prank/
-GPL-2
-Probabilistic Alignment Kit
-~amd64 ~x86
-
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/sci-biology/prank-111130 b/metadata/cache/sci-biology/prank-111130
new file mode 100644
index 000000000000..fac7dc7fad48
--- /dev/null
+++ b/metadata/cache/sci-biology/prank-111130
@@ -0,0 +1,22 @@
+
+
+0
+http://prank-msa.googlecode.com/files/prank.src.111130.tgz
+
+http://code.google.com/p/prank-msa/ http://www.ebi.ac.uk/goldman-srv/prank/prank/
+GPL-3
+Probabilistic Alignment Kit
+~amd64 ~x86
+multilib toolchain-funcs
+
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-biology/primer3-1.1.4 b/metadata/cache/sci-biology/primer3-1.1.4
deleted file mode 100644
index bae3601f84c4..000000000000
--- a/metadata/cache/sci-biology/primer3-1.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl
-
-0
-mirror://sourceforge/primer3/primer3-1.1.4.tar.gz
-
-http://primer3.sourceforge.net/
-whitehead
-Primer Design for PCR reactions
-amd64 ~ppc ~ppc64 ~sparc x86
-
-
-
-
-
-
-
-compile install test
-
-
-
-
-
diff --git a/metadata/cache/sci-biology/primer3-2.3.0 b/metadata/cache/sci-biology/primer3-2.3.0
new file mode 100644
index 000000000000..293947a3549b
--- /dev/null
+++ b/metadata/cache/sci-biology/primer3-2.3.0
@@ -0,0 +1,22 @@
+dev-lang/perl
+
+0
+mirror://sourceforge/primer3/primer3-2.3.0.tar.gz
+
+http://primer3.sourceforge.net/
+GPL-2
+Primer Design for PCR reactions
+~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+multilib toolchain-funcs
+
+
+
+
+3
+
+compile install prepare test
+
+
+
+
+
diff --git a/metadata/cache/sci-libs/mc-1.5 b/metadata/cache/sci-libs/mc-1.5
index 3211bacd6a10..5a39897c5562 100644
--- a/metadata/cache/sci-libs/mc-1.5
+++ b/metadata/cache/sci-libs/mc-1.5
@@ -1,5 +1,5 @@
-virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack doc? ( media-gfx/graphviz app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack
+virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack doc? ( media-gfx/graphviz app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack
0
http://www.fetk.org/codes/download/mc-1.5.tar.gz
@@ -7,14 +7,14 @@ http://fetk.org/codes/mc/index.html
GPL-2
2D/3D AFEM code for nonlinear geometric PDE
~amd64 ~x86 ~amd64-linux ~x86-linux
-autotools eutils fortran-2 libtool multilib portability toolchain-funcs user
-debug doc
+autotools autotools-utils eutils fortran-2 libtool multilib portability toolchain-funcs user
+debug doc static-libs
-2
+4
-configure install prepare setup
+compile configure install prepare setup test
diff --git a/metadata/cache/sys-block/megamgr-5.20-r2 b/metadata/cache/sys-block/megamgr-5.20-r2
index 7029a47b4075..74c88783d5a0 100644
--- a/metadata/cache/sys-block/megamgr-5.20-r2
+++ b/metadata/cache/sys-block/megamgr-5.20-r2
@@ -2,7 +2,7 @@ app-arch/unzip
0
http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/ut_linux_mgr_5.20.zip
-mirror
+mirror fetch
http://www.lsi.com
LSI
LSI Logic MegaRAID Text User Interface management tool
@@ -14,7 +14,7 @@ multilib toolchain-funcs
3
-install setup
+install nofetch setup
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 751ace762a54..aac18322eb6e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Feb 2012 04:36:46 +0000
+Tue, 28 Feb 2012 13:36:55 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 751ace762a54..2b5dbbf66fb1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Feb 2012 04:36:46 +0000
+Tue, 28 Feb 2012 13:36:56 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dc8cddb8190b..d4e7af520ad8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Feb 2012 04:36:48 +0000
+Tue, 28 Feb 2012 13:36:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 792b4be632d6..9b8384bfe2a2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Feb 28 04:36:46 UTC 2012
+Tue Feb 28 13:36:55 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b88177efbbde..c8a8a2d4c02b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 28 Feb 2012 05:00:01 +0000
+Tue, 28 Feb 2012 14:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index dae956ad5836..2600cf48cceb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1330403701 Tue Feb 28 04:35:01 2012 UTC
+1330436101 Tue Feb 28 13:35:01 2012 UTC
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 71aa655b9aaa..08e2cae529cd 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,9 +1,3 @@
DIST framework-2.7.tar.gz 5800216 RMD160 cfdf2705522c845bb4405413207a7df0f3873b94 SHA1 da5d41dfa13e549aacd4fbf2994877cbe80ceed9 SHA256 516952772aaa8982628460b927c9119850925f870903c5a131a9c9f0390cf77f
-DIST framework-3.3.3.tar.bz2 23438382 RMD160 7af61daff176cbbe6455abecefe8323acf561238 SHA1 6c6e257f21ad55328e45fbc04020c3c2a9ca9b78 SHA256 a650778f7946a7f113acd716023978fd94f01325e9a4cf6342fb00ba3f6a2c0b
-DIST framework-3.4.0.tar.bz2 31099089 RMD160 7e5c2a58fd8ac91a80f5113e8e2eb30d9c047d00 SHA1 41cfbd4fa879003cdc69f0aadab188bcc1ac0371 SHA256 da734592a7192747fd66c05459d27daeb3e49aea92dd5dadc3305a6b8ee081e8
-DIST framework-3.4.1.tar.bz2 32779137 RMD160 30200656cfd0907b1ff60cf115695e02143602af SHA1 21a8acccf282ef48801d4769fa3865437ea4d667 SHA256 65f1e627822f320cf885e20f59a96a85844b1b7780f9299943b4fa671f4dba00
-DIST framework-3.5.0.tar.bz2 42254784 RMD160 090d557574b8e98e461f9de2bb95f604d74cf645 SHA1 15e72afdfdc374f74a6eb07969174855b6d02361 SHA256 bb1cd6e70547b039672d2087a580fe4a29199098a78030a6e50779687dccbed7
-DIST framework-3.6.0.tar.bz2 47125266 RMD160 afdbce02626ac994d8351d69846a5033758c2783 SHA1 1c78cd774204d6edd6e795ef1dff36d49836f530 SHA256 a113cf9e1a499377807990e506acad83afee18845a148a02747087132fac39a7
-DIST framework-3.7.0.tar.bz2 49488660 RMD160 56c76a7d24372f48f5d84da1713acbc7f54590af SHA1 8ca60e75b90da4555274b5fb3a20a152c581aa02 SHA256 1e39a0de7e4b6cc4144b5ea47b3598e6edf27ac00abac5d84e1fec04b7f95dc5
DIST framework-4.0.0.tar.bz2 79515768 RMD160 f8eedb9d68f30b245217b4ed40308dcd351d37c5 SHA1 f1768564be92abcea3ea34fde14acb1af4d52f1d SHA256 45c3c379ea82e46d8efef9cbbe0afa8ae8df98e50f2642afcea84a86c83c5a50
-DIST framework-latest.tar.bz2 77862536 RMD160 33b8e617105552e611356dd337fa29fc84a45362 SHA1 f978b82d0b5d65e2958006aa9a6fca01573b9539 SHA256 f172b46ce6ea19845bfcf919017190bc0b17bc6631259d814c0b639a4a896467
+DIST framework-4.2.0.tar.bz2 78756418 RMD160 e212010bf44f949e177b193daa336a6461b4fd26 SHA1 f5ddc56a1f6dd4885edc6849428bf33179c66653 SHA256 24095059ea718dc1288f0a6653eb64e057132242531b8fa520ff15b1d121dcec
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.1-conf b/net-analyzer/metasploit/files/msfrpcd-4.2-conf
similarity index 100%
rename from net-analyzer/metasploit/files/msfrpcd-4.1-conf
rename to net-analyzer/metasploit/files/msfrpcd-4.2-conf
diff --git a/net-analyzer/metasploit/files/msfrpcd-4.1-initd b/net-analyzer/metasploit/files/msfrpcd-4.2-initd
similarity index 88%
rename from net-analyzer/metasploit/files/msfrpcd-4.1-initd
rename to net-analyzer/metasploit/files/msfrpcd-4.2-initd
index 7527d9c7cf78..400eac9bfe14 100644
--- a/net-analyzer/metasploit/files/msfrpcd-4.1-initd
+++ b/net-analyzer/metasploit/files/msfrpcd-4.2-initd
@@ -1,9 +1,9 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.1-initd,v 1.1 2012/01/12 08:14:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfrpcd-4.2-initd,v 1.1 2012/02/28 08:09:31 patrick Exp $
-VERSION=4.0
+VERSION=4.2
PIDFILE=/var/run/msfrpcd${VERSION}.pid
start() {
diff --git a/net-analyzer/metasploit/files/msfweb3.2.confd b/net-analyzer/metasploit/files/msfweb3.2.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.2.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.2.initd b/net-analyzer/metasploit/files/msfweb3.2.initd
deleted file mode 100644
index 0618169b8a01..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.2.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.2.initd,v 1.1 2009/07/08 09:09:41 pva Exp $
-
-PIDFILE=/var/run/msfweb3.2.pid
-
-start() {
- ebegin "Starting msfweb3.2"
- start-stop-daemon --start --quiet --background --startas msfweb3.2 --exec /usr/lib/metasploit3.2/msfweb \
- --pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
- eend $?
- einfo "Note: msfweb3.2 is started but needs some before it serves clients."
-}
-
-stop() {
- ebegin "Stopping msfweb"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb3.3.confd b/net-analyzer/metasploit/files/msfweb3.3.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.3.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.3.initd b/net-analyzer/metasploit/files/msfweb3.3.initd
deleted file mode 100644
index 430fc65ba7c1..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.3.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.3.initd,v 1.1 2010/03/01 12:52:51 patrick Exp $
-
-PIDFILE=/var/run/msfweb3.3.pid
-
-start() {
- ebegin "Starting msfweb3.3"
- start-stop-daemon --start --quiet --background --startas msfweb3.3 --exec /usr/lib/metasploit3.3/msfweb \
- --pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
- eend $?
- einfo "Note: msfweb3.3 is started but needs some before it serves clients."
-}
-
-stop() {
- ebegin "Stopping msfweb"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb3.4.confd b/net-analyzer/metasploit/files/msfweb3.4.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.4.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.4.initd b/net-analyzer/metasploit/files/msfweb3.4.initd
deleted file mode 100644
index 971b13f1e228..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.4.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.4.initd,v 1.1 2010/05/19 02:42:03 patrick Exp $
-
-PIDFILE=/var/run/msfweb3.4.pid
-
-start() {
- ebegin "Starting msfweb3.4"
- start-stop-daemon --start --quiet --background --startas msfweb3.4 --exec /usr/lib/metasploit3.4/msfweb \
- --pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
- eend $?
- einfo "Note: msfweb3.4 is started but needs some before it serves clients."
-}
-
-stop() {
- ebegin "Stopping msfweb"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/files/msfweb3.confd b/net-analyzer/metasploit/files/msfweb3.confd
deleted file mode 100644
index b0cf87e6dfaf..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/metasploit
-
-# Bind to the following IP instead of the loopback address
-IPADDR=127.0.0.1
-
-# Bind to the following TCP port instead of default 55555
-PORT=55555
-
-# All options
-MSF_OPTS="-a $IPADDR -p $PORT"
diff --git a/net-analyzer/metasploit/files/msfweb3.initd b/net-analyzer/metasploit/files/msfweb3.initd
deleted file mode 100644
index 67cba7696014..000000000000
--- a/net-analyzer/metasploit/files/msfweb3.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb3.initd,v 1.1 2007/09/09 11:56:21 cedk Exp $
-
-PIDFILE=/var/run/msfweb3.pid
-
-start() {
- ebegin "Starting msfweb3"
- start-stop-daemon --start --quiet --background --startas /usr/bin/msfweb3 --exec /usr/bin/ruby \
- --pidfile ${PIDFILE} --make-pidfile -- ${MSF_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping msfweb"
- start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/net-analyzer/metasploit/metasploit-3.3.3.ebuild b/net-analyzer/metasploit/metasploit-3.3.3.ebuild
deleted file mode 100644
index d3c6c44e79e6..000000000000
--- a/net-analyzer/metasploit/metasploit-3.3.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.3.3.ebuild,v 1.1 2010/03/01 12:52:52 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.3"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
- dev-ruby/rubygems
- gtk? ( dev-ruby/ruby-libglade2 )
- sqlite? ( dev-ruby/sqlite3-ruby
- dev-ruby/activerecord )
- postgres? ( dev-ruby/ruby-postgres
- dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
- if [[ "${SRC_URI}" != "" ]] ; then
- # svn sources...
- find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
- fi
-
- # should be as simple as copying everything into the target...
- dodir /usr/lib/${PN}${SLOT}
- cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
- rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
- dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
- dodir /usr/bin/
- use gtk || rm msfgui
- for file in msf*; do
- dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
- done
-
- chown -R root:0 "${D}"
-
- newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
- || die "newinitd failed"
- newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
- || die "newconfd failed"
-}
-
-pkg_postinst() {
- if [[ "${SRC_URI}" == "" ]] ; then
- elog "If you wish to update ${PN} manually simply run:"
- elog
- elog "ESVN_REVISION= emerge =${PF}"
- elog
- elog "where is either HEAD (in case you wish to get all updates)"
- elog "or specific revision number. But NOTE, this update will vanish"
- elog "next time you reemerge ${PN}. To make update permanent either"
- elog "create ebuild with specific revision number inside your overlay"
- elog "or report revision bump bug at http://bugs.gentoo.org ."
- elog
- elog "In case you use portage it's also possible to create"
- elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION="
- elog "content. Then each time you run emerge ${PN} you'll have said"
- elog " installed. For example, if you run"
- elog " # mkdir -p /etc/portage/env/${CATEGORY}"
- elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
- elog "each time you reemerge ${PN} it'll be updated to get all possible"
- elog "updates for framework-${PV%_p*} branch."
- elog "You can do similar things in paludis using /etc/paludis/bashrc."
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.4.0.ebuild b/net-analyzer/metasploit/metasploit-3.4.0.ebuild
deleted file mode 100644
index ac747ff6b7e2..000000000000
--- a/net-analyzer/metasploit/metasploit-3.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.4.0.ebuild,v 1.1 2010/05/19 02:42:04 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
- dev-ruby/rubygems
- gtk? ( dev-ruby/ruby-libglade2 )
- sqlite? ( dev-ruby/sqlite3-ruby
- dev-ruby/activerecord )
- postgres? ( dev-ruby/ruby-postgres
- dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
- if [[ "${SRC_URI}" != "" ]] ; then
- # svn sources...
- find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
- fi
-
- # should be as simple as copying everything into the target...
- dodir /usr/lib/${PN}${SLOT}
- cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
- rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
- dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
- dodir /usr/bin/
- use gtk || rm msfgui
- for file in msf*; do
- dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
- done
-
- chown -R root:0 "${D}"
-
- newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
- || die "newinitd failed"
- newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
- || die "newconfd failed"
-}
-
-pkg_postinst() {
- if [[ "${SRC_URI}" == "" ]] ; then
- elog "If you wish to update ${PN} manually simply run:"
- elog
- elog "ESVN_REVISION= emerge =${PF}"
- elog
- elog "where is either HEAD (in case you wish to get all updates)"
- elog "or specific revision number. But NOTE, this update will vanish"
- elog "next time you reemerge ${PN}. To make update permanent either"
- elog "create ebuild with specific revision number inside your overlay"
- elog "or report revision bump bug at http://bugs.gentoo.org ."
- elog
- elog "In case you use portage it's also possible to create"
- elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION="
- elog "content. Then each time you run emerge ${PN} you'll have said"
- elog " installed. For example, if you run"
- elog " # mkdir -p /etc/portage/env/${CATEGORY}"
- elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
- elog "each time you reemerge ${PN} it'll be updated to get all possible"
- elog "updates for framework-${PV%_p*} branch."
- elog "You can do similar things in paludis using /etc/paludis/bashrc."
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.4.1.ebuild b/net-analyzer/metasploit/metasploit-3.4.1.ebuild
deleted file mode 100644
index 71ae2854e86f..000000000000
--- a/net-analyzer/metasploit/metasploit-3.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.4.1.ebuild,v 1.1 2010/09/04 18:55:42 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
- dev-ruby/rubygems
- gtk? ( dev-ruby/ruby-libglade2 )
- sqlite? ( dev-ruby/sqlite3-ruby
- dev-ruby/activerecord )
- postgres? ( dev-ruby/ruby-postgres
- dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
- if [[ "${SRC_URI}" != "" ]] ; then
- # svn sources...
- find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
- fi
-
- # should be as simple as copying everything into the target...
- dodir /usr/lib/${PN}${SLOT}
- cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
- rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
- dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
- dodir /usr/bin/
- use gtk || rm msfgui
- for file in msf*; do
- dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
- done
-
- chown -R root:0 "${D}"
-
- newinitd "${FILESDIR}"/msfweb${SLOT}.initd msfweb${SLOT} \
- || die "newinitd failed"
- newconfd "${FILESDIR}"/msfweb${SLOT}.confd msfweb${SLOT} \
- || die "newconfd failed"
-}
-
-pkg_postinst() {
- if [[ "${SRC_URI}" == "" ]] ; then
- elog "If you wish to update ${PN} manually simply run:"
- elog
- elog "ESVN_REVISION= emerge =${PF}"
- elog
- elog "where is either HEAD (in case you wish to get all updates)"
- elog "or specific revision number. But NOTE, this update will vanish"
- elog "next time you reemerge ${PN}. To make update permanent either"
- elog "create ebuild with specific revision number inside your overlay"
- elog "or report revision bump bug at http://bugs.gentoo.org ."
- elog
- elog "In case you use portage it's also possible to create"
- elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION="
- elog "content. Then each time you run emerge ${PN} you'll have said"
- elog " installed. For example, if you run"
- elog " # mkdir -p /etc/portage/env/${CATEGORY}"
- elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
- elog "each time you reemerge ${PN} it'll be updated to get all possible"
- elog "updates for framework-${PV%_p*} branch."
- elog "You can do similar things in paludis using /etc/paludis/bashrc."
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.5.0.ebuild b/net-analyzer/metasploit/metasploit-3.5.0.ebuild
deleted file mode 100644
index cf2c8b473c37..000000000000
--- a/net-analyzer/metasploit/metasploit-3.5.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.5.0.ebuild,v 1.2 2010/11/14 23:16:38 patrick Exp $
-
-SRC_URI="http://www.metasploit.com/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
- dev-ruby/rubygems
- gtk? ( dev-ruby/ruby-libglade2 )
- sqlite? ( dev-ruby/sqlite3-ruby
- dev-ruby/activerecord )
- postgres? ( dev-ruby/ruby-postgres
- dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
- if [[ "${SRC_URI}" != "" ]] ; then
- # svn sources...
- find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
- fi
-
- # should be as simple as copying everything into the target...
- dodir /usr/lib/${PN}${SLOT}
- cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
- rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
- dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
- dodir /usr/bin/
- use gtk || rm msfgui
- for file in msf*; do
- dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
- done
-
- chown -R root:0 "${D}"
-
-}
-
-pkg_postinst() {
- if [[ "${SRC_URI}" == "" ]] ; then
- elog "If you wish to update ${PN} manually simply run:"
- elog
- elog "ESVN_REVISION= emerge =${PF}"
- elog
- elog "where is either HEAD (in case you wish to get all updates)"
- elog "or specific revision number. But NOTE, this update will vanish"
- elog "next time you reemerge ${PN}. To make update permanent either"
- elog "create ebuild with specific revision number inside your overlay"
- elog "or report revision bump bug at http://bugs.gentoo.org ."
- elog
- elog "In case you use portage it's also possible to create"
- elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION="
- elog "content. Then each time you run emerge ${PN} you'll have said"
- elog " installed. For example, if you run"
- elog " # mkdir -p /etc/portage/env/${CATEGORY}"
- elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
- elog "each time you reemerge ${PN} it'll be updated to get all possible"
- elog "updates for framework-${PV%_p*} branch."
- elog "You can do similar things in paludis using /etc/paludis/bashrc."
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.6.0.ebuild b/net-analyzer/metasploit/metasploit-3.6.0.ebuild
deleted file mode 100644
index 0611c83a993c..000000000000
--- a/net-analyzer/metasploit/metasploit-3.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.6.0.ebuild,v 1.1 2011/04/18 09:26:10 patrick Exp $
-
-SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.6"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
- dev-ruby/rubygems
- gtk? ( dev-ruby/ruby-libglade2 )
- sqlite? ( dev-ruby/sqlite3-ruby
- dev-ruby/activerecord )
- postgres? ( dev-ruby/ruby-postgres
- dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
- if [[ "${SRC_URI}" != "" ]] ; then
- # svn sources...
- find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
- fi
-
- # should be as simple as copying everything into the target...
- dodir /usr/lib/${PN}${SLOT}
- cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
- rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
- dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
- dodir /usr/bin/
- use gtk || rm msfgui
- for file in msf*; do
- dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
- done
-
- chown -R root:0 "${D}"
-
-}
-
-pkg_postinst() {
- if [[ "${SRC_URI}" == "" ]] ; then
- elog "If you wish to update ${PN} manually simply run:"
- elog
- elog "ESVN_REVISION= emerge =${PF}"
- elog
- elog "where is either HEAD (in case you wish to get all updates)"
- elog "or specific revision number. But NOTE, this update will vanish"
- elog "next time you reemerge ${PN}. To make update permanent either"
- elog "create ebuild with specific revision number inside your overlay"
- elog "or report revision bump bug at http://bugs.gentoo.org ."
- elog
- elog "In case you use portage it's also possible to create"
- elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION="
- elog "content. Then each time you run emerge ${PN} you'll have said"
- elog " installed. For example, if you run"
- elog " # mkdir -p /etc/portage/env/${CATEGORY}"
- elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
- elog "each time you reemerge ${PN} it'll be updated to get all possible"
- elog "updates for framework-${PV%_p*} branch."
- elog "You can do similar things in paludis using /etc/paludis/bashrc."
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-3.7.0.ebuild b/net-analyzer/metasploit/metasploit-3.7.0.ebuild
deleted file mode 100644
index ab5fe6a421bb..000000000000
--- a/net-analyzer/metasploit/metasploit-3.7.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-3.7.0.ebuild,v 1.1 2011/05/07 17:01:11 patrick Exp $
-
-SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-
-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
-HOMEPAGE="http://www.metasploit.org/"
-
-LICENSE="BSD"
-SLOT="3.7"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gtk sqlite postgres"
-
-# Note we use bundled gems (see data/msfweb/vendor/rails/) as upstream voted for
-# such solution, bug #247787
-RDEPEND="dev-lang/ruby
- dev-ruby/rubygems
- gtk? ( dev-ruby/ruby-libglade2 )
- sqlite? ( dev-ruby/sqlite3-ruby
- dev-ruby/activerecord )
- postgres? ( dev-ruby/ruby-postgres
- dev-ruby/activerecord )"
-DEPEND=""
-
-S=${WORKDIR}/msf3
-
-src_install() {
- if [[ "${SRC_URI}" != "" ]] ; then
- # svn sources...
- find "${S}" -type d -name ".svn" -print0 | xargs -0 -n1 rm -R
- fi
-
- # should be as simple as copying everything into the target...
- dodir /usr/lib/${PN}${SLOT}
- cp -R "${S}"/* "${D}"/usr/lib/${PN}${SLOT} || die "Copy files failed"
-
- # do not remove LICENSE, bug #238137
- dodir /usr/share/doc/${PF}
- cp -R "${S}"/{documentation,README} "${D}"/usr/share/doc/${PF}
- rm -Rf "${D}"/usr/lib/${PN}${SLOT}/documentation "${D}"/usr/lib/${PN}${SLOT}/README
- dosym /usr/share/doc/${PF}/documentation /usr/lib/${PN}${SLOT}/documentation
-
- dodir /usr/bin/
- use gtk || rm msfgui
- for file in msf*; do
- dosym /usr/lib/${PN}${SLOT}/${file} /usr/bin/${file}${SLOT}
- done
-
- chown -R root:0 "${D}"
-
-}
-
-pkg_postinst() {
- if [[ "${SRC_URI}" == "" ]] ; then
- elog "If you wish to update ${PN} manually simply run:"
- elog
- elog "ESVN_REVISION= emerge =${PF}"
- elog
- elog "where is either HEAD (in case you wish to get all updates)"
- elog "or specific revision number. But NOTE, this update will vanish"
- elog "next time you reemerge ${PN}. To make update permanent either"
- elog "create ebuild with specific revision number inside your overlay"
- elog "or report revision bump bug at http://bugs.gentoo.org ."
- elog
- elog "In case you use portage it's also possible to create"
- elog "/etc/portage/env/${CATEGORY}/${PN} file with ESVN_REVISION="
- elog "content. Then each time you run emerge ${PN} you'll have said"
- elog " installed. For example, if you run"
- elog " # mkdir -p /etc/portage/env/${CATEGORY}"
- elog " # echo ESVN_REVISION=HEAD >> /etc/portage/env/${CATEGORY}/${PN}"
- elog "each time you reemerge ${PN} it'll be updated to get all possible"
- elog "updates for framework-${PV%_p*} branch."
- elog "You can do similar things in paludis using /etc/paludis/bashrc."
- fi
-}
diff --git a/net-analyzer/metasploit/metasploit-4.1.4.ebuild b/net-analyzer/metasploit/metasploit-4.2.0.ebuild
similarity index 88%
rename from net-analyzer/metasploit/metasploit-4.1.4.ebuild
rename to net-analyzer/metasploit/metasploit-4.2.0.ebuild
index 906d4bf17bc9..dd5ade5883b3 100644
--- a/net-analyzer/metasploit/metasploit-4.1.4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.2.0.ebuild
@@ -1,13 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.1.4.ebuild,v 1.1 2012/01/12 08:14:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-4.2.0.ebuild,v 1.1 2012/02/28 08:09:31 patrick Exp $
EAPI="3"
inherit eutils
-#SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
-# Naughty upstream ... no versioning at the moment
-SRC_URI="http://downloads.metasploit.com/data/releases/framework-latest.tar.bz2"
+SRC_URI="http://updates.metasploit.com/data/releases/framework-${PV}.tar.bz2"
DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
HOMEPAGE="http://www.metasploit.org/"
@@ -78,7 +76,7 @@ src_install() {
# Avoid useless revdep-rebuild trigger #377617
dodir /etc/revdep-rebuild/
echo "SEARCH_DIRS_MASK=\"/usr/lib*/${PN}${SLOT}/data/john\"" > \
- ${D}/etc/revdep-rebuild/70-${PN}-${SLOT}
+ "${D}"/etc/revdep-rebuild/70-${PN}-${SLOT}
}
pkg_postinst() {
diff --git a/net-firewall/ufw/files/ufw-0.30.1-encoding.patch b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch
new file mode 100644
index 000000000000..a4626ef0cff0
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch
@@ -0,0 +1,15 @@
+Fixes usage with ufw-frontends.
+upstream bug report: https://bugs.launchpad.net/ufw/+bug/921758
+--- src/util.py
++++ src/util.py
+@@ -205,8 +205,9 @@
+
+ def open_file_read(f):
+ '''Opens the specified file read-only'''
++ import codecs
+ try:
+- orig = open(f, 'r')
++ orig = codecs.open(f, 'r', "UTF-8")
+ except Exception:
+ raise
+
diff --git a/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch b/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch
new file mode 100644
index 000000000000..b924012790e4
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch
@@ -0,0 +1,21 @@
+This patch fixes strings substitution in common.py during package
+build with ebuild supporting installation for multiple Python versions.
+
+With support for multiple Python versions in the ebuild, seems the
+file isn't copied from staging/ to build-*/lib/ufw/ after being
+modified. That's why the copy needs to be done "manually" here.
+The issue occurs with "setup.py build -b build-XXX" followed by
+"setup.py build -b build-XXX install".
+
+probably related: https://bugs.launchpad.net/ufw/+bug/819600
+--- setup.py
++++ setup.py
+@@ -89,6 +89,8 @@
+ "-i",
+ "s%#SHARE_DIR#%" + real_sharedir + "%g",
+ os.path.join('staging', file)])
++ self.copy_file(os.path.join('staging', file),
++ os.path.join(self.build_base, "lib", "ufw"))
+
+ # Now byte-compile everything
+ super(Install, self).run()
diff --git a/net-firewall/ufw/ufw-0.30.1-r2.ebuild b/net-firewall/ufw/ufw-0.30.1-r2.ebuild
deleted file mode 100644
index 64b37228008a..000000000000
--- a/net-firewall/ufw/ufw-0.30.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.30.1-r2.ebuild,v 1.3 2011/09/13 06:35:49 pva Exp $
-
-EAPI=3
-PYTHON_DEPEND="2:2.5"
-
-inherit versionator bash-completion-r1 eutils linux-info distutils
-
-MY_PV_12=$(get_version_component_range 1-2)
-DESCRIPTION="A program used to manage a netfilter firewall"
-HOMEPAGE="http://launchpad.net/ufw"
-SRC_URI="http://launchpad.net/ufw/${MY_PV_12}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=">=net-firewall/iptables-1.4"
-
-# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
-RESTRICT="test"
-
-pkg_setup() {
- local CONFIG_CHECK="~PROC_FS ~NETFILTER_XT_MATCH_COMMENT ~IP6_NF_MATCH_HL \
- ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT \
- ~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
-
- if kernel_is -ge 2 6 39; then
- CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
- else
- CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
- fi
-
- check_extra_config
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # Allow to remove unnecessary build time dependency
- # on net-firewall/iptables.
- epatch "${FILESDIR}"/${PN}-dont-check-iptables.patch
- # Move files away from /lib/ufw.
- epatch "${FILESDIR}"/${PN}-move-path.patch
- # Set as enabled by default. User can enable or disable
- # the service by adding or removing it to/from a runlevel.
- sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
- || die "sed failed (ufw.conf)"
-}
-
-src_install() {
- newconfd "${FILESDIR}"/ufw.confd ufw || die "inserting a file to conf.d failed"
- newinitd "${FILESDIR}"/ufw-2.initd ufw || die "inserting a file to init.d failed"
- if use examples; then
- dodoc doc/rsyslog.example || die "inserting example rsyslog configuration failed"
- insinto /usr/share/doc/${PF}/examples
- doins examples/* || die "inserting example files failed"
- fi
- distutils_src_install
- newbashcomp shell-completion/bash ${PN} || die "newbashcomp failed"
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- if path_exists -o "${EROOT}"lib/ufw/user{,6}.rules; then
- ewarn "Attention!"
- ewarn "User configuration from /lib/ufw is now placed in /etc/ufw/user."
- ewarn "Please stop ufw, copy .rules files from ${EROOT}lib/ufw"
- ewarn "to ${EROOT}etc/ufw/user/ and start ufw again."
- fi
- echo
- elog "Remember to enable ufw add it to your boot sequence:"
- elog "-- # ufw enable"
- elog "-- # rc-update add ufw boot"
-}
diff --git a/net-firewall/ufw/ufw-0.30.1-r3.ebuild b/net-firewall/ufw/ufw-0.30.1-r4.ebuild
similarity index 75%
rename from net-firewall/ufw/ufw-0.30.1-r3.ebuild
rename to net-firewall/ufw/ufw-0.30.1-r4.ebuild
index d05d12ece1e6..d043b6d3936b 100644
--- a/net-firewall/ufw/ufw-0.30.1-r3.ebuild
+++ b/net-firewall/ufw/ufw-0.30.1-r4.ebuild
@@ -1,9 +1,11 @@
-# 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/net-firewall/ufw/ufw-0.30.1-r3.ebuild,v 1.2 2011/09/13 06:35:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.30.1-r4.ebuild,v 1.1 2012/02/28 11:42:22 scarabeus Exp $
-EAPI=3
+EAPI=4
PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
inherit versionator bash-completion-r1 eutils linux-info distutils
@@ -17,13 +19,13 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples"
-DEPEND=""
+DEPEND="sys-devel/gettext"
RDEPEND=">=net-firewall/iptables-1.4"
# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
RESTRICT="test"
-pkg_setup() {
+pkg_pretend() {
local CONFIG_CHECK="~PROC_FS ~NETFILTER_XT_MATCH_COMMENT ~IP6_NF_MATCH_HL \
~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT \
~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
@@ -35,7 +37,9 @@ pkg_setup() {
fi
check_extra_config
- python_set_active_version 2
+}
+
+pkg_setup() {
python_pkg_setup
}
@@ -45,6 +49,10 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-dont-check-iptables.patch
# Move files away from /lib/ufw.
epatch "${FILESDIR}"/${PN}-move-path.patch
+ # Allows correct build with SUPPORT_PYTHON_ABIS="1" (see comment in the file).
+ epatch "${FILESDIR}"/${P}-python-abis.patch
+ # Fixes usage with ufw-frontends (bug ref. inside the patch).
+ epatch "${FILESDIR}"/${P}-encoding.patch
# Set as enabled by default. User can enable or disable
# the service by adding or removing it to/from a runlevel.
sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
@@ -52,23 +60,25 @@ src_prepare() {
}
src_install() {
- newconfd "${FILESDIR}"/ufw.confd ufw || die "inserting a file to conf.d failed"
- newinitd "${FILESDIR}"/ufw-2.initd ufw || die "inserting a file to init.d failed"
+ newconfd "${FILESDIR}"/ufw.confd ufw
+ newinitd "${FILESDIR}"/ufw-2.initd ufw
# users normally would want it
insinto /usr/share/doc/${PF}/logging
- doins -r "${FILESDIR}"/syslog-ng || die "inserting syslog-ng configuration failed"
+ doins -r "${FILESDIR}"/syslog-ng
insinto /usr/share/doc/${PF}/logging/rsyslog
- doins "${FILESDIR}"/rsyslog/* || die "inserting rsyslog configuration failed"
- doins doc/rsyslog.example || die "inserting rsyslog.example failed"
+ doins "${FILESDIR}"/rsyslog/*
+ doins doc/rsyslog.example
if use examples; then
insinto /usr/share/doc/${PF}/examples
- doins examples/* || die "inserting example files failed"
+ doins examples/*
fi
distutils_src_install
- newbashcomp shell-completion/bash ${PN} || die "newbashcomp failed"
+ domo locales/mo/*.mo
+ rm -r "${ED}"usr/share/${PN}/messages || die
+ newbashcomp shell-completion/bash ${PN}
}
pkg_postinst() {
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
new file mode 100644
index 000000000000..fad4c57d1a45
--- /dev/null
+++ b/net-mail/automx/Manifest
@@ -0,0 +1 @@
+DIST automx-0.8_beta1.tar.gz 75001 RMD160 8845f2878c885d855c7346c318c43f989a8cebf1 SHA1 1874fffd87f6e804bd109b43e7f393d1cbd8778d SHA256 0910e0eb129e18537d118f972ca25a7be7fec0459a8a0eb6a6315da00bebc442
diff --git a/net-mail/automx/automx-0.8_beta1.ebuild b/net-mail/automx/automx-0.8_beta1.ebuild
new file mode 100644
index 000000000000..f9f93d048fa1
--- /dev/null
+++ b/net-mail/automx/automx-0.8_beta1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/automx-0.8_beta1.ebuild,v 1.1 2012/02/28 13:14:40 mschiff Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6:2.7"
+SUPPORT_PYTHON_ABIS="1"
+inherit python
+
+DESCRIPTION="A mail user agent auto configuration service"
+HOMEPAGE="http://www.automx.org"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +tools"
+
+DEPEND=""
+RDEPEND="
+ dev-python/lxml
+ || ( www-apache/mod_wsgi www-servers/uwsgi )
+ tools? ( net-dns/bind-tools )
+ tools? ( net-misc/wget )
+ "
+
+RESTRICT_PYTHON_ABIS="2.[45]"
+
+#src_prepare() {
+# python_copy_sources
+# python_src_prepare
+#}
+
+src_install() {
+ if use doc; then
+ dodoc INSTALL CREDITS
+ dohtml -r doc/html/*
+
+ docinto examples
+ dodoc doc/examples/*
+ fi
+
+ doman doc/man/man5/*
+
+ if use tools; then
+ exeinto /usr/bin
+ doexe src/automx-test
+ doman doc/man/man1/automx-test.1
+ fi
+
+ installation() {
+ insinto $(python_get_sitedir)/${PN}
+ doins src/automx/*
+ }
+ python_execute_function installation
+}
+
+pkg_postinst() {
+ python_mod_optimize $PN
+ use doc && einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
+}
+
+pkg_postrm() {
+ python_mod_cleanup $PN
+}
diff --git a/net-mail/automx/metadata.xml b/net-mail/automx/metadata.xml
new file mode 100644
index 000000000000..7a3ee03acf06
--- /dev/null
+++ b/net-mail/automx/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ mschiff@gentoo.org
+ Marc Schiffbauer
+
+
+
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 79c4389fc8c4..802fcb961c5c 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,2 +1,3 @@
DIST ofono-0.50.tar.bz2 815007 RMD160 115ecce37fa6594bb89aa4b729aad2221c85410a SHA1 12dbc746feb3be77d04995ffadc41f2d991ecad4 SHA256 f8f8dd917847a007e4d441b949efc4d28dc3644526d5293016844c2536c65ff9
DIST ofono-0.51.tar.bz2 819103 RMD160 c7e269af76e851ed3d5d33105586a1fde80b2198 SHA1 cc09943ffd301ff9e906af3bbfa404b8721fb9ea SHA256 309c484728fb0d9f9570331b0818c2335bf713aef118b1c679e3e397f2b606ac
+DIST ofono-1.0.tar.bz2 834592 RMD160 3578c43c7dc04d9a25b122a48e1044e046d27ba1 SHA1 15f8c365089728e28ccc46871497c38b2785c909 SHA256 7733e1628fac6ef4d8aa3e536a5c284c3ba8e76277fc7e28b7e146c3c5ddebfa
diff --git a/net-misc/ofono/ofono-1.0.ebuild b/net-misc/ofono/ofono-1.0.ebuild
new file mode 100644
index 000000000000..5d57bae86ca0
--- /dev/null
+++ b/net-misc/ofono/ofono-1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-1.0.ebuild,v 1.1 2012/02/28 11:27:56 nirbheek Exp $
+
+EAPI="2"
+
+inherit multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon."
+HOMEPAGE="http://ofono.org/"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+IUSE="+atmodem bluetooth +caps +cdmamodem examples +isimodem +phonesim threads tools +udev"
+
+RDEPEND=">=sys-apps/dbus-1.2.24
+ >=dev-libs/glib-2.16
+ bluetooth? ( >=net-wireless/bluez-4.61 )
+ caps? ( sys-libs/libcap-ng )
+ udev? ( >=sys-fs/udev-143 )
+ examples? ( dev-python/dbus-python )
+ tools? ( dev-libs/libusb:1 )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_prepare() {
+ default
+
+ # Fix build with newer glib due to G_DISABLE_SINGLE_INCLUDES
+ grep -lre '' "${S}" | while read i; do
+ sed -ie 's:glib/gtypes.h:glib.h:' "${i}" || die "Unable to sed \"$i\""
+ done
+}
+
+src_configure() {
+ econf \
+ $(use_enable caps capng) \
+ $(use_enable threads) \
+ $(use_enable udev) \
+ $(use_enable isimodem) \
+ $(use_enable atmodem) \
+ $(use_enable cdmamodem) \
+ $(use_enable bluetooth) \
+ $(use_enable phonesim) \
+ $(use_enable tools) \
+ --enable-test \
+ --localstatedir=/var \
+ --with-systemdunitdir="$(systemd_get_unitdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ if ! use examples ; then
+ rm -rf "${D}/usr/$(get_libdir)/ofono/test"
+ fi
+
+ if use tools ; then
+ dobin tools/{auto-enable,huawei-audio} || die
+ fi
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+ dodoc ChangeLog AUTHORS doc/*.txt
+}
diff --git a/net-misc/rsync/rsync-3.0.9.ebuild b/net-misc/rsync/rsync-3.0.9.ebuild
index 403cb3e58e78..eeffa6f76b1a 100644
--- a/net-misc/rsync/rsync-3.0.9.ebuild
+++ b/net-misc/rsync/rsync-3.0.9.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/net-misc/rsync/rsync-3.0.9.ebuild,v 1.1 2011/10/30 23:18:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-3.0.9.ebuild,v 1.2 2012/02/28 07:09:05 jdhore Exp $
EAPI="2"
@@ -12,7 +12,7 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P/_/}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="acl iconv ipv6 static xattr"
DEPEND=">=dev-libs/popt-1.5
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index c3d9cdad3b47..53e72b22b1b9 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,2 +1 @@
-DIST ncdc-1.7.tar.gz 309915 RMD160 ba988863a74581f91c4fc53f88bee34a640f9c2c SHA1 d31d9b48351aa322afb57c6db44fbc4c66f4df4b SHA256 5198a88d797bcd246e9d33080b9e07ce747fd14e5146902175055676b6d8145f
DIST ncdc-1.8.tar.gz 313804 RMD160 67dfb6ef61d3ea6f308c7619ec413c0ac27f9d6e SHA1 7163b3097df33552598faf6f9aea675104f3d8b1 SHA256 361c0e0c20a81ecaa66a68bf82fc792395219d2d03ed18f75db3ca2133549def
diff --git a/net-p2p/ncdc/ncdc-1.7.ebuild b/net-p2p/ncdc/ncdc-1.7.ebuild
deleted file mode 100644
index 6829e37f7fbc..000000000000
--- a/net-p2p/ncdc/ncdc-1.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ncdc/ncdc-1.7.ebuild,v 1.1 2011/12/30 23:59:20 xmw Exp $
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="http://dev.yorhel.nl/ncdc"
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
- dev-db/sqlite:3
- dev-libs/glib:2
- dev-libs/libxml2:2
- sys-libs/gdbm
- sys-libs/ncurses:5"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-DOCS=( ChangeLog README )
-
-src_install() {
- base_src_install
- dobin util/ncdc-gen-cert
-}
diff --git a/net-p2p/ncdc/ncdc-1.8.ebuild b/net-p2p/ncdc/ncdc-1.8-r1.ebuild
similarity index 78%
rename from net-p2p/ncdc/ncdc-1.8.ebuild
rename to net-p2p/ncdc/ncdc-1.8-r1.ebuild
index fec1c19c515d..33b39f3655bb 100644
--- a/net-p2p/ncdc/ncdc-1.8.ebuild
+++ b/net-p2p/ncdc/ncdc-1.8-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-p2p/ncdc/ncdc-1.8.ebuild,v 1.1 2012/02/13 23:20:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ncdc/ncdc-1.8-r1.ebuild,v 1.1 2012/02/28 13:02:36 xmw Exp $
EAPI=4
@@ -18,6 +18,7 @@ RDEPEND="app-arch/bzip2
dev-lang/perl
dev-libs/glib:2
dev-libs/libxml2:2
+ net-libs/glib-networking
sys-libs/gdbm
sys-libs/ncurses:5"
DEPEND="${RDEPEND}
diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index 8ba57aa68e0b..5846349618d2 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-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/net-p2p/ncdc/ncdc-9999.ebuild,v 1.3 2012/02/13 23:20:06 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ncdc/ncdc-9999.ebuild,v 1.4 2012/02/28 13:06:38 xmw Exp $
EAPI=4
@@ -22,6 +22,7 @@ RDEPEND="app-arch/bzip2
dev-lang/perl
dev-libs/glib:2
dev-libs/libxml2:2
+ net-libs/glib-networking
sys-libs/gdbm
sys-libs/ncurses:5"
DEPEND="${RDEPEND}
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 0baa06ffee38..69d1fa0b21bb 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -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/arch/amd64/use.mask,v 1.30 2012/02/04 10:42:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.31 2012/02/28 10:55:16 ssuominen Exp $
# Unmask the flag which corresponds to ARCH.
-amd64
@@ -125,10 +125,9 @@ gamess
alsa_cards_cs5535audio
# 2006/06/07 - Danny van Dyk
-# Profile cleanup: No info about these
-asm
+# FIXME. Unknown mask reason. Has effect on qpopper
+# and tpop3d.
drac
-vidix
# 2006/02/05 - Donnie Berkholz
# Modular X: mask for architectures on which they aren't available
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index b9d8620c4fe6..1cb86e70009d 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,11 +1,15 @@
# Copyright 1999-2012 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.29 2012/02/04 10:42:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.30 2012/02/28 10:58:18 ssuominen Exp $
# Unmask the flag which corresponds to ARCH.
-x86
-# Justin Lecher (04. Feb 2012)
+# Samuli Suominen (28 Feb 2012)
+# Unmasking vidix for x86 which is masked in base/use.mask for others
+-vidix
+
+# Justin Lecher (04 Feb 2012)
# Unmask because deps are keyworded
-zeitgeist
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7d2154cdd3f2..64deb61d93e9 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.135 2012/02/24 17:37:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.136 2012/02/28 10:52:58 ssuominen Exp $
+
+# masking here, and unmasking in arch/x86/use.mask
+vidix
# Not ready "yet", bug #405593. (phajdan.jr@)
tcb
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3e59b9a99c61..bcbb8dcfd498 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3919,6 +3919,7 @@ net-libs/xulrunner:ipc - Use inter-process communication between tabs and plugin
net-libs/xulrunner:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
net-libs/xulrunner:webm - Use system libvpx media-libs/libvpx
net-libs/zeromq:pgm - 0MQ is build with 'Pragmatic General Multicast' (RFC 3208) support using the excellent OpenPGM implementation.
+net-mail/automx:tools - Install additional tool: automx-test
net-mail/courier-imap:trashquota - include deleted messages, and the Trash folder, in the estimated quota usage for maildirs
net-mail/cyrus-imapd:replication - Enable replication support in the cyrus imap server
net-mail/cyrus-imapd:sieve - Enable sieve support
diff --git a/rox-base/xdg-menu/xdg-menu-1.5.ebuild b/rox-base/xdg-menu/xdg-menu-1.5.ebuild
index ef4f5cf03384..22af2b84dd03 100644
--- a/rox-base/xdg-menu/xdg-menu-1.5.ebuild
+++ b/rox-base/xdg-menu/xdg-menu-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/xdg-menu/xdg-menu-1.5.ebuild,v 1.1 2011/10/22 02:29:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/xdg-menu/xdg-menu-1.5.ebuild,v 1.2 2012/02/28 08:39:19 chainsaw Exp $
ROX_LIB_VER=2.0.0
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-python/pyxdg-0.14
diff --git a/sci-biology/picard/picard-1.63.ebuild b/sci-biology/picard/picard-1.63.ebuild
new file mode 100644
index 000000000000..ccec0120b474
--- /dev/null
+++ b/sci-biology/picard/picard-1.63.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/picard/picard-1.63.ebuild,v 1.1 2012/02/28 05:27:53 weaver Exp $
+
+EAPI=4
+
+#ESVN_REPO_URI="https://picard.svn.sourceforge.net/svnroot/picard/trunk"
+ESVN_REPO_URI="https://picard.svn.sourceforge.net/svnroot/picard/tags/${PV}"
+
+EANT_BUILD_TARGET="all"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_NEEDS_TOOLS="true"
+WANT_ANT_TASKS="ant-apache-bcel"
+
+inherit subversion java-pkg-2 java-ant-2
+
+DESCRIPTION="Java-based command-line utilities that manipulate SAM files"
+HOMEPAGE="http://picard.sourceforge.net/"
+SRC_URI=""
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64"
+
+COMMON_DEPS=""
+DEPEND=">=virtual/jdk-1.6
+ dev-java/ant-apache-bcel:0
+ app-arch/zip
+ ${COMMON_DEPS}"
+RDEPEND=">=virtual/jre-1.6
+ ${COMMON_DEPS}"
+
+src_install() {
+ cd dist
+ for i in *-${PV}.jar; do java-pkg_newjar $i ${i/-${PV}/}; rm $i; done
+ java-pkg_dojar *.jar
+ for i in *.jar; do java-pkg_dolauncher ${i/.jar/} --jar $i; done
+}
diff --git a/sci-biology/prank/Manifest b/sci-biology/prank/Manifest
index 7ad53e6ecf64..8f16bde0dcf7 100644
--- a/sci-biology/prank/Manifest
+++ b/sci-biology/prank/Manifest
@@ -1,4 +1,2 @@
-DIST prank.src.081202.tgz 127430 RMD160 fa2710350c4e1fcc6f5093687bfd77ac7ac74f15 SHA1 cb3394a7fca63339138ba20d667a9d1ef3bb3071 SHA256 8ce5349b77c323bb230a7f4cb9de85a1c0e1bb3f46af81b9519ac5c34d441a78
-DIST prank.src.091016.tgz 134450 RMD160 c488d4209e13a3c4530d58b212f2edc9c441a934 SHA1 9613bdea5fcb7b72564c7487eaa0195f166c1683 SHA256 2df02c1957c71db2bcb8e5e646fb6fa679aeb4e6633fc112d5cf684de9467098
-DIST prank.src.100311.tgz 137717 RMD160 60d488e5bcc446cfb198e69da6433d0037cf53c5 SHA1 2f26a9cb421614a82eacb845b2b0c93ddcb413dd SHA256 224dd85527ff106531852cbcb9dd467905e9dd8cb6fca66cbc1aa18bc53fa2fe
DIST prank.src.100701.tgz 115444 RMD160 f1c2b6bb321beb3c168fb8888dc6fe62d8e2e280 SHA1 796433bb4db1cc433153bad48d5be790c3824b8c SHA256 2ba63fc8f998a86e6fc688170b03f831eeb8d8deda95cbf0986e8a3a3b09ec79
+DIST prank.src.111130.tgz 133330 RMD160 2397a3e31a51bbaf27dd93fa391466aeabd42cbe SHA1 e87713c3435f9531a420ff26dc91182387dc1661 SHA256 61473a6b7b199f2d05e35a31adf813a2813decc9aa1429de118b62a51d7aac14
diff --git a/sci-biology/prank/files/prank-081202-gcc44.patch b/sci-biology/prank/files/prank-081202-gcc44.patch
deleted file mode 100644
index d3e25444bbaa..000000000000
--- a/sci-biology/prank/files/prank-081202-gcc44.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur prank.orig/src/guidetree.cpp prank/src/guidetree.cpp
---- prank.orig/src/guidetree.cpp 2008-11-28 17:06:39.000000000 +0200
-+++ prank/src/guidetree.cpp 2009-08-10 10:58:57.000000000 +0300
-@@ -18,6 +18,8 @@
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-
-+#include
-+
- #include "guidetree.h"
- #include "pwhirschberg.h"
- #include "pwsite.h"
-diff -ur prank.orig/src/node.cpp prank/src/node.cpp
---- prank.orig/src/node.cpp 2008-12-02 15:24:08.000000000 +0200
-+++ prank/src/node.cpp 2009-08-10 11:00:53.000000000 +0300
-@@ -18,6 +18,7 @@
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-
-+#include
- #include
- #include
- #include
-diff -ur prank.orig/src/terminalnode.cpp prank/src/terminalnode.cpp
---- prank.orig/src/terminalnode.cpp 2008-09-04 16:13:51.000000000 +0300
-+++ prank/src/terminalnode.cpp 2009-08-10 11:01:41.000000000 +0300
-@@ -17,6 +17,8 @@
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-+
-+#include
- #include
- #include "terminalnode.h"
- #include "config.h"
diff --git a/sci-biology/prank/prank-081202.ebuild b/sci-biology/prank/prank-081202.ebuild
deleted file mode 100644
index 39a871fb684c..000000000000
--- a/sci-biology/prank/prank-081202.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-081202.ebuild,v 1.3 2009/08/10 08:00:34 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Probabilistic Alignment Kit"
-HOMEPAGE="http://www.ebi.ac.uk/goldman-srv/prank/prank/"
-SRC_URI="http://www.ebi.ac.uk/goldman-srv/prank/src/prank.src.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc44.patch
- perl -i -pe 's/(CC|CXX|CFLAGS|CXXFLAGS)\s*=/#/' "${S}/Makefile" || die
-}
-
-src_install() {
- dobin prank || die "dobin failed"
-}
diff --git a/sci-biology/prank/prank-091016.ebuild b/sci-biology/prank/prank-091016.ebuild
deleted file mode 100644
index 7f4ada0f0c32..000000000000
--- a/sci-biology/prank/prank-091016.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-091016.ebuild,v 1.2 2009/10/29 02:04:18 weaver Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Probabilistic Alignment Kit"
-HOMEPAGE="http://www.ebi.ac.uk/goldman-srv/prank/prank/"
-SRC_URI="http://www.ebi.ac.uk/goldman-srv/prank/src/prank/prank.src.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-081202-gcc44.patch
- perl -i -pe 's/(CC|CXX|CFLAGS|CXXFLAGS)\s*=/#/' "${S}/Makefile" || die
-}
-
-src_install() {
- dobin prank || die "dobin failed"
-}
diff --git a/sci-biology/prank/prank-100311.ebuild b/sci-biology/prank/prank-100311.ebuild
deleted file mode 100644
index b3985c573534..000000000000
--- a/sci-biology/prank/prank-100311.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-100311.ebuild,v 1.1 2010/03/23 07:41:51 weaver Exp $
-
-EAPI="2"
-
-DESCRIPTION="Probabilistic Alignment Kit"
-HOMEPAGE="http://www.ebi.ac.uk/goldman-srv/prank/prank/"
-SRC_URI="http://www.ebi.ac.uk/goldman-srv/prank/src/prank/prank.src.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/src
-
-src_prepare() {
- perl -i -pe 's/(CC|CXX|CFLAGS|CXXFLAGS)\s*=/#/' "${S}/Makefile" || die
-}
-
-src_install() {
- dobin prank || die "dobin failed"
-}
diff --git a/sci-biology/prank/prank-111130.ebuild b/sci-biology/prank/prank-111130.ebuild
new file mode 100644
index 000000000000..1f97dbf0ad4b
--- /dev/null
+++ b/sci-biology/prank/prank-111130.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-111130.ebuild,v 1.1 2012/02/28 05:37:06 weaver Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Probabilistic Alignment Kit"
+HOMEPAGE="http://code.google.com/p/prank-msa/ http://www.ebi.ac.uk/goldman-srv/prank/prank/"
+SRC_URI="http://prank-msa.googlecode.com/files/prank.src.${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/prank-msa/src"
+
+src_prepare() {
+ sed -i -e "s/\$(LINK)/& \$(LDFLAGS)/" Makefile || die
+}
+
+src_compile() {
+ emake LINK="$(tc-getCXX)" CFLAGS="${CFLAGS}" \
+ CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die
+}
+
+src_install() {
+ dobin prank || die
+}
diff --git a/sci-biology/primer3/Manifest b/sci-biology/primer3/Manifest
index 8597cdaf7a1c..781b858b63b5 100644
--- a/sci-biology/primer3/Manifest
+++ b/sci-biology/primer3/Manifest
@@ -1,2 +1,3 @@
DIST primer3-1.1.4.tar.gz 974628 RMD160 87535d123d4c00b64eb763e4e567c5c83fde6b54 SHA1 fcabf7d8aa31c5568bd130b318c3ead4a1b9aa3a SHA256 1cb045791afd3c4033956a65687ca0c1b1a6607ac84705bf4ed7d7151691980b
DIST primer3-2.2.3.tar.gz 2284282 RMD160 040b41649f5bfc17214502b2ba5e98d1a5afd73f SHA1 20c6a00455b86a5712c1e297930f2624fca45881 SHA256 2e68d638119bfcac12571da351cf261e28a3dd4b32c89074ce17065931a98774
+DIST primer3-2.3.0.tar.gz 2596929 RMD160 4e27aeca7ffd78287e143088d2dffd99a6617d13 SHA1 22d4283e1fcc17c660c78e8b407d5051a414dbc2 SHA256 6b6721f8ae3b45dc8ac81d6a230012f79d56f840274e88dc5001ec718625e834
diff --git a/sci-biology/primer3/primer3-1.1.4.ebuild b/sci-biology/primer3/primer3-1.1.4.ebuild
deleted file mode 100644
index 441d554cd21a..000000000000
--- a/sci-biology/primer3/primer3-1.1.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-1.1.4.ebuild,v 1.3 2011/11/23 08:10:50 jlec Exp $
-
-DESCRIPTION="Primer Design for PCR reactions"
-HOMEPAGE="http://primer3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="whitehead"
-IUSE=""
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-S="${WORKDIR}/src"
-
-src_compile() {
- emake -e || die
-}
-
-src_test () {
- make primer_test || die
-}
-
-src_install () {
- dobin long_seq_tm_test ntdpal oligotm primer3_core || die \
- "Could not install program."
- dodoc ../{how-to-cite.txt,README.txt,example} || die \
- "Could not install documentation."
-}
diff --git a/sci-biology/primer3/primer3-2.3.0.ebuild b/sci-biology/primer3/primer3-2.3.0.ebuild
new file mode 100644
index 000000000000..eb61728f235a
--- /dev/null
+++ b/sci-biology/primer3/primer3-2.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.0.ebuild,v 1.1 2012/02/28 05:41:15 weaver Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Primer Design for PCR reactions"
+HOMEPAGE="http://primer3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_prepare() {
+ if [[ ${CHOST} == *-darwin* ]]; then
+ sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile || die
+ fi
+ perl -i -ne 's/\$\(CPP\)/'$(tc-getCXX)'/; print unless /^(CC|CPP|CFLAGS|LDFLAGS)\s*=/' src/Makefile || die
+ sed \
+ -e '/oligotm/s:-o $@:$(LDFLAGS) -o $@:g' \
+ -e '/long_seq_tm_test/s:-o $@:$(LDFLAGS) -o $@:g' \
+ -e 's:CFLAGS:CXXFLAGS:g' \
+ -i src/Makefile || die
+}
+
+src_compile() {
+ emake -C src || die
+}
+
+src_test () {
+ emake -C test || die
+}
+
+src_install () {
+ dobin src/{long_seq_tm_test,ntdpal,oligotm,primer3_core} || die \
+ "Could not install program."
+ dodoc src/release_notes.txt example primer3_manual.htm || die \
+ "Could not install documentation."
+ insinto /opt/primer3_config
+ doins -r src/primer3_config/* primer3*settings.txt || die
+}
diff --git a/sci-libs/mc/files/mc-1.5-unbundle.patch b/sci-libs/mc/files/mc-1.5-unbundle.patch
new file mode 100644
index 000000000000..5a9a97241980
--- /dev/null
+++ b/sci-libs/mc/files/mc-1.5-unbundle.patch
@@ -0,0 +1,58 @@
+ configure.ac | 38 ++++++--------------------------------
+ 1 files changed, 6 insertions(+), 32 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6198ac0..4b1b169 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -191,44 +191,18 @@ dnl # -----------------------
+ dnl # HANDLE THE BLAS LIBRARY
+ dnl # -----------------------
+ blas_lib="";
+-AC_MSG_CHECKING([whether your environment defines FETK_BLAS_LIBRARY])
+-if test -n "${FETK_BLAS_LIBRARY}"; then
+- AC_MSG_RESULT([yes])
+- blas_lib_path="-L${FETK_BLAS_LIBRARY} ";
+-else
+- AC_MSG_RESULT([no])
+- blas_lib_path="-L${FETK_LIBRARY} ";
+-fi
+-LDFLAGS_SAVE=${LDFLAGS};
+-LDFLAGS=${blas_lib_path};
+-blas_use="";
+-AC_CHECK_LIB(blas,dscal_,
+- [blas_use="yes";blas_lib="${blas_lib_path}-lblas";AC_DEFINE(HAVE_BLAS)],
+- [blas_use="";blas_lib=""],
+- [${blas_lib_path}-lblas ${vf2c_lib}])
+-LDFLAGS=${LDFLAGS_SAVE};
++blas_lib_path="";
++PKG_CHECK_MODULES([BLAS], [blas])
++blas_lib="${BLAS_LIBS}";
+ AC_SUBST(blas_lib)
+
+ dnl # -------------------------
+ dnl # HANDLE THE LAPACK LIBRARY
+ dnl # -------------------------
+ lapack_lib="";
+-AC_MSG_CHECKING([whether your environment defines FETK_LAPACK_LIBRARY])
+-if test -n "${FETK_LAPACK_LIBRARY}"; then
+- AC_MSG_RESULT([yes])
+- lapack_lib_path="-L${FETK_LAPACK_LIBRARY} ";
+-else
+- AC_MSG_RESULT([no])
+- lapack_lib_path="-L${FETK_LIBRARY} ";
+-fi
+-LDFLAGS_SAVE=${LDFLAGS};
+-LDFLAGS=${lapack_lib_path};
+-lapack_use="";
+-AC_CHECK_LIB(lapack,dsysv_,
+- [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack";AC_DEFINE(HAVE_LAPACK)],
+- [lapack_use="";lapack_lib=""],
+- [${lapack_lib_path}-llapack ${blas_lib} ${vf2c_lib}])
+-LDFLAGS=${LDFLAGS_SAVE};
++lapack_lib_path="";
++PKG_CHECK_MODULES([LAPACK], [lapack])
++lapack_lib="${LAPACK_LIBS}"
+ AC_SUBST(lapack_lib)
+
+ dnl # --------------------------
diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5.ebuild
index 722e00a4d8e7..0339acc531f3 100644
--- a/sci-libs/mc/mc-1.5.ebuild
+++ b/sci-libs/mc/mc-1.5.ebuild
@@ -1,10 +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/sci-libs/mc/mc-1.5.ebuild,v 1.3 2011/06/21 15:12:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mc/mc-1.5.ebuild,v 1.4 2012/02/28 12:57:17 jlec Exp $
-EAPI="2"
+EAPI=4
-inherit autotools eutils fortran-2 multilib
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils fortran-2 multilib
DESCRIPTION="2D/3D AFEM code for nonlinear geometric PDE"
HOMEPAGE="http://fetk.org/codes/mc/index.html"
@@ -13,7 +15,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-2"
-IUSE="debug doc"
+IUSE="debug doc static-libs"
RDEPEND="
virtual/fortran
@@ -24,7 +26,9 @@ RDEPEND="
sci-libs/gamer
sci-libs/punc
sci-libs/superlu
- sci-libs/umfpack"
+ sci-libs/umfpack
+ virtual/blas
+ virtual/lapack"
DEPEND="
${RDEPEND}
doc? (
@@ -33,26 +37,29 @@ DEPEND="
S="${WORKDIR}"/${PN}
+PATCHES=(
+ "${FILESDIR}"/1.4-superlu.patch
+ "${FILESDIR}"/1.4-overflow.patch
+ "${FILESDIR}"/1.4-multilib.patch
+ "${FILESDIR}"/1.4-doc.patch
+ "${FILESDIR}"/${P}-unbundle.patch
+ )
+
src_prepare() {
- epatch \
- "${FILESDIR}"/1.4-superlu.patch \
- "${FILESDIR}"/1.4-overflow.patch \
- "${FILESDIR}"/1.4-multilib.patch \
- "${FILESDIR}"/1.4-doc.patch
sed \
-e 's:AMD_order:amd_order:g' \
-e 's:UMFPACK_numeric:umfpack_di_numeric:g' \
-e 's:buildg_:matvec_:g' \
-i configure.ac || die
- eautoreconf
+ autotools-utils_src_prepare
}
src_configure() {
local fetk_include
local fetk_lib
- local myconf
+ local myeconfargs
- use doc || myconf="${myconf} --with-doxygen= --with-dot="
+ use doc || myeconfargs+=( --with-doxygen= --with-dot= )
fetk_include="${EPREFIX}"/usr/include
fetk_lib="${EPREFIX}"/usr/$(get_libdir)
@@ -69,14 +76,11 @@ src_configure() {
export FETK_CGCODE_LIBRARY="${fetk_lib}"
export FETK_PMG_LIBRARY="${fetk_lib}"
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable debug vdebug) \
- --disable-triplet \
- --enable-shared \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
+ myeconfargs+=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable debug vdebug)
+ --disable-triplet
+ --enable-shared
+ )
+ autotools-utils_src_configure
}
diff --git a/sci-libs/mc/metadata.xml b/sci-libs/mc/metadata.xml
index c6856dc7f2cf..210ad0db014c 100644
--- a/sci-libs/mc/metadata.xml
+++ b/sci-libs/mc/metadata.xml
@@ -1,8 +1,8 @@
-sci
-
- jlec@gentoo.org
-
+ sci
+
+ jlec@gentoo.org
+
diff --git a/sci-libs/mmtk/mmtk-2.7.3.ebuild b/sci-libs/mmtk/mmtk-2.7.3.ebuild
index 9a2dfb64530f..c7f161bbf1e5 100644
--- a/sci-libs/mmtk/mmtk-2.7.3.ebuild
+++ b/sci-libs/mmtk/mmtk-2.7.3.ebuild
@@ -1,12 +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/sci-libs/mmtk/mmtk-2.7.3.ebuild,v 1.2 2011/01/07 11:36:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mmtk/mmtk-2.7.3.ebuild,v 1.4 2012/02/28 12:41:48 patrick Exp $
EAPI="2"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
inherit distutils
diff --git a/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild b/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild
index 5019bddabd66..ffd8583d3ba7 100644
--- a/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild
+++ b/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild
@@ -1,12 +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/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild,v 1.8 2011/06/26 10:22:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild,v 1.9 2012/02/28 12:50:40 patrick Exp $
EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils multilib
diff --git a/sys-block/megamgr/megamgr-5.20-r2.ebuild b/sys-block/megamgr/megamgr-5.20-r2.ebuild
index 0ea595f86e73..3452441f40d6 100644
--- a/sys-block/megamgr/megamgr-5.20-r2.ebuild
+++ b/sys-block/megamgr/megamgr-5.20-r2.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/sys-block/megamgr/megamgr-5.20-r2.ebuild,v 1.2 2011/07/07 17:15:17 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megamgr/megamgr-5.20-r2.ebuild,v 1.3 2012/02/28 05:40:58 idl0r Exp $
EAPI="3"
@@ -20,12 +20,18 @@ IUSE=""
DEPEND="app-arch/unzip"
RDEPEND=""
-RESTRICT="mirror"
+RESTRICT="mirror fetch"
S="${WORKDIR}"
QA_PRESTRIPPED="/opt/bin/megamgr"
+pkg_nofetch() {
+ einfo "Upstream has implement a mandatory clickthrough EULA for distfile download"
+ einfo "Please visit $SRC_URI"
+ einfo "And place $A in ${DISTDIR}"
+}
+
pkg_setup() {
use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; }
}
diff --git a/sys-devel/clang/clang-3.0-r3.ebuild b/sys-devel/clang/clang-3.0-r3.ebuild
index a7614f7e0225..e9bd61a12dda 100644
--- a/sys-devel/clang/clang-3.0-r3.ebuild
+++ b/sys-devel/clang/clang-3.0-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0-r3.ebuild,v 1.2 2012/02/21 13:49:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0-r3.ebuild,v 1.3 2012/02/28 09:09:31 grobian Exp $
EAPI=3
@@ -48,7 +48,7 @@ src_prepare() {
sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
-i tools/clang/lib/Driver/Tools.cpp \
|| die "gold plugin path sed failed"
- # Properly detect Gentoo's binutils-apple version
+ # Properly detect Gentoo's binutils-apple version (committed in trunk)
epatch "${FILESDIR}"/${PN}-3.0-gentoo-binutils-apple.patch
# Specify python version
python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 0078a9d3959e..a180f27e0ba3 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-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/clang/clang-9999.ebuild,v 1.25 2012/02/21 13:49:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.26 2012/02/28 09:09:31 grobian Exp $
EAPI=4
@@ -49,8 +49,6 @@ src_prepare() {
sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
-i tools/clang/lib/Driver/Tools.cpp \
|| die "gold plugin path sed failed"
- # Properly detect Gentoo's binutils-apple version
- epatch "${FILESDIR}"/${PN}-3.0-gentoo-binutils-apple.patch
# Specify python version
python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
diff --git a/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch b/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch
index 4164138ab79a..944ccaf4fa20 100644
--- a/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch
+++ b/sys-devel/clang/files/clang-3.0-gentoo-binutils-apple.patch
@@ -1,5 +1,6 @@
http://llvm.org/bugs/show_bug.cgi?id=8339
https://bugs.gentoo.org/show_bug.cgi?id=395013
+http://llvm.org/viewvc/llvm-project?view=rev&revision=151612
Tweak version detection bit to cope with Gentoo's slightly different
output for ld -v.
diff --git a/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild b/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild
index 93e6549058c2..d7ac78141887 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.0-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/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild,v 1.2 2012/02/12 09:16:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.0-r2.ebuild,v 1.3 2012/02/28 13:22:57 jlec Exp $
EAPI="3"
inherit confutils qt4-build
@@ -178,12 +178,12 @@ src_install() {
doins "${S}"/tools/designer/src/lib/sdk/* || die
# touch the available graphics systems
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${D}/usr/share/qt4/graphicssystems/"
- echo "default" > "${D}/usr/share/qt4/graphicssystems/raster" ||
- die "could not touch ${D}/usr/share/qt4/graphicssystems/raster"
- touch "${D}/usr/share/qt4/graphicssystems/native" ||
- die "could not touch ${D}/usr/share/qt4/graphicssystems/native"
+ mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
+ die "could not create ${ED}/usr/share/qt4/graphicssystems/"
+ echo "default" > "${ED}/usr/share/qt4/graphicssystems/raster" ||
+ die "could not touch ${ED}/usr/share/qt4/graphicssystems/raster"
+ touch "${ED}/usr/share/qt4/graphicssystems/native" ||
+ die "could not touch ${ED}/usr/share/qt4/graphicssystems/native"
# install private headers
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild
index e417d4a6a3b3..6d8802614f8b 100644
--- a/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild
+++ b/x11-libs/qt-opengl/qt-opengl-4.8.0-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/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild,v 1.1 2012/02/05 13:02:29 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.8.0-r2.ebuild,v 1.2 2012/02/28 13:30:35 jlec Exp $
EAPI="3"
inherit qt4-build
@@ -50,8 +50,8 @@ src_install() {
qt4-build_src_install
#touch the available graphics systems
- mkdir -p "${D}/usr/share/qt4/graphicssystems/" ||
- die "could not create ${D}/usr/share/qt4/graphicssystems/"
- echo "experimental" > "${D}/usr/share/qt4/graphicssystems/opengl" ||
- die "could not touch ${D}/usr/share/qt4/graphicssystems/opengl"
+ mkdir -p "${ED}/usr/share/qt4/graphicssystems/" ||
+ die "could not create ${ED}/usr/share/qt4/graphicssystems/"
+ echo "experimental" > "${ED}/usr/share/qt4/graphicssystems/opengl" ||
+ die "could not touch ${ED}/usr/share/qt4/graphicssystems/opengl"
}