diff --git a/app-admin/eselect-rails/Manifest b/app-admin/eselect-rails/Manifest
index 4875c0e662fc..56fb7594228a 100644
--- a/app-admin/eselect-rails/Manifest
+++ b/app-admin/eselect-rails/Manifest
@@ -1,3 +1,3 @@
-DIST eselect-rails-0.15.tar.bz2 1686 RMD160 bfced28d53d32b6d91b86c2808be2d9f366c987f SHA1 c81ab749117dabf614586b74ebe69a9c0a7d0b8b SHA256 36dc89390d6842795e8fccd3c2219ee05d2b34c8639bfb57504d465659d276b6
DIST eselect-rails-0.16.tar.bz2 1630 RMD160 122f9ab25b7241cdee07d0b04718e1d3b856e838 SHA1 cd323953262ce303adae7acdb7c839065c9e9762 SHA256 d3f7210e98a81c6923d8250f2286b6cbb37facb443a8ed4d00d43a25e3cfbc52
DIST eselect-rails-0.17.tar.bz2 1623 RMD160 dca3c89f1d8376dc5fa533d1cc0d021c7ec4e560 SHA1 087d1fbad35cbcf307f0e490b0822fb288e8abf0 SHA256 de8e2378cde1447622921f8a867ded482f6ebfd0e02cfd7355ac30b5b56a8b4f
+DIST eselect-rails-0.18.tar.bz2 1628 RMD160 179ea9cdb908367b5f3ccd08580da24aecfd59be SHA1 597a1394a145cc85b78891505c3f8f3a4c444633 SHA256 6dfcefd74cfb10e83c59d8594bd9e1d39ea40071b2c3a9a3e601a6107aa49671
diff --git a/app-admin/eselect-rails/eselect-rails-0.15.ebuild b/app-admin/eselect-rails/eselect-rails-0.18.ebuild
similarity index 56%
rename from app-admin/eselect-rails/eselect-rails-0.15.ebuild
rename to app-admin/eselect-rails/eselect-rails-0.18.ebuild
index 27458c15fcb3..1abacb86e509 100644
--- a/app-admin/eselect-rails/eselect-rails-0.15.ebuild
+++ b/app-admin/eselect-rails/eselect-rails-0.18.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.15.ebuild,v 1.7 2009/05/28 16:10:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.18.ebuild,v 1.1 2011/12/30 09:21:52 graaff Exp $
DESCRIPTION="Manages Ruby on Rails symlinks"
HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~flameeyes/ruby-team/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
-RDEPEND=">=app-admin/eselect-1.0.10"
+RDEPEND=">=app-admin/eselect-1.2.0"
src_install() {
insinto /usr/share/eselect/modules
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 160d049fa8d1..daedb1aa4422 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,2 +1,2 @@
DIST bluefish-1.0.7.tar.bz2 1495619 RMD160 7ce8a7c8873cd0ef84dd6486551976593544a8dc SHA1 c61d6271c49e9fa8c728724e6aadde33a227bdea SHA256 68cb74b993ad31a86083e8eed482b2f5b4d523806538ea9bc42bfa8b4c0a1110
-DIST bluefish-2.0.3.tar.bz2 3477615 RMD160 0a82d8973b201014bcc03fbe09896472bfcdf3c1 SHA1 ab6b16d50faca169c25001d5a26ca8b84ddb1019 SHA256 d6637cc6bf4863f1eeff7504ebeb143f31fbe239b2f2d1f32e7487e141541ffe
+DIST bluefish-2.2.1.tar.bz2 3501247 RMD160 75626423216cdd9bb621f3063baba278ce3bbd76 SHA1 f7b2e9915e196c971c6bcca04d8d6b87efab1ae6 SHA256 4366133f3ff6b9c51943b1498188262b94a3fe2d4cf9118b6b42aac599634921
diff --git a/app-editors/bluefish/bluefish-2.0.3.ebuild b/app-editors/bluefish/bluefish-2.2.1.ebuild
similarity index 73%
rename from app-editors/bluefish/bluefish-2.0.3.ebuild
rename to app-editors/bluefish/bluefish-2.2.1.ebuild
index af33f26e651f..494bad96df57 100644
--- a/app-editors/bluefish/bluefish-2.0.3.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.0.3.ebuild,v 1.1 2011/06/05 09:33:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.1.ebuild,v 1.2 2011/12/30 13:47:48 scarabeus Exp $
-EAPI=3
+EAPI=4
PYTHON_DEPEND="python? 2"
@@ -17,22 +17,33 @@ HOMEPAGE="http://bluefish.openoffice.nl/"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
-IUSE="gucharmap nls python spell"
+IUSE="gtk3 nls python spell"
RDEPEND="
- >=x11-libs/gtk+-2.12:2
+ gtk3? (
+ x11-libs/gtk+:3
+ gnome-extra/gucharmap:2.90
+ )
+ !gtk3? (
+ >=x11-libs/gtk+-2.12:2
+ gnome-extra/gucharmap:0
+ )
spell? ( app-text/enchant )"
-
DEPEND="${RDEPEND}
>=dev-libs/glib-2.16:2
dev-libs/libxml2:2
dev-util/pkgconfig
x11-libs/pango
- gucharmap? ( gnome-extra/gucharmap )
- nls? ( sys-devel/gettext dev-util/intltool )"
+ nls? (
+ sys-devel/gettext
+ dev-util/intltool
+ )"
S=${WORKDIR}/${MY_P}
+# there actually is just some broken manpage checkup -> not bother
+RESTRICT="test"
+
pkg_setup() {
if use python ; then
python_set_active_version 2
@@ -40,32 +51,23 @@ pkg_setup() {
fi
}
-src_prepare () {
- intltoolize --copy --force || die "intltoolize failed"
- for po_dir in src/plugin_*/po ; do
- cp po/Makefile.in.in ${po_dir}
- done
-
- # Fixes automagic installation of charmap plugin
- # Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=570990
- epatch "${FILESDIR}"/${PN}-2.0.0-gucharmap-automagic.patch
- eautoreconf
-}
+# Never eautoreconf this package as gettext breaks completely (no translations
+# even if it compiles afterwards)!
src_configure() {
econf \
- --docdir="/usr/share/doc/${PF}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
--disable-dependency-tracking \
--disable-update-databases \
--disable-xml-catalog-update \
$(use_enable nls) \
$(use_enable spell spell-check) \
- $(use_enable gucharmap charmap) \
+ $(use_with !gtk3 gtk2) \
$(use_enable python)
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ default
find "${ED}" -name '*.la' -exec rm -f {} +
}
diff --git a/app-editors/bluefish/files/bluefish-2.0.0-gucharmap-automagic.patch b/app-editors/bluefish/files/bluefish-2.0.0-gucharmap-automagic.patch
deleted file mode 100644
index d6097c6d6e00..000000000000
--- a/app-editors/bluefish/files/bluefish-2.0.0-gucharmap-automagic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.ac.old 2009-12-17 03:11:30.000000000 +0100
-+++ configure.ac 2010-01-23 00:16:11.000000000 +0100
-@@ -421,29 +421,38 @@
-
- PKG_CHECK_MODULES([BLUEFISH_REQUIRED], [$BF_dependencies])
-
--# optionally build the charmap plugin if gucharmap is available
--PKG_CHECK_MODULES(
-- [CHARMAP_PLUGIN],
-- [gucharmap-2],
-- [
-- build_charmap_plugin=yes
-- AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).])
-- ],
-- [PKG_CHECK_MODULES(
-+# build the charmap plugin
-+
-+AC_ARG_ENABLE(
-+ [charmap],
-+ AC_HELP_STRING(
-+ [--enable-charmap],
-+ [enable (or disable) the charmap plugin needs gucharmap @<:@default=no@:>@]
-+ )
-+)
-+
-+if test "x$enable_charmap" != "xno"; then
-+ PKG_CHECK_MODULES(
- [CHARMAP_PLUGIN],
-- [gucharmap >= 2.20],
-+ [gucharmap-2],
- [
- build_charmap_plugin=yes
-- AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).])
-+ AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).])
- ],
-- [
-- build_charmap_plugin=no
-- AC_MSG_WARN([Disabling the building of the charmap plugin.])
-- AC_MSG_WARN([Install gucharmap/gucharmap2 (>= 2.20) library/headers to build the plugin.])
-- ]
-- )]
--)
--AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"])
-+ [PKG_CHECK_MODULES(
-+ [CHARMAP_PLUGIN],
-+ [gucharmap >= 2.20],
-+ [
-+ build_charmap_plugin=yes
-+ AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).])
-+ ],
-+ )]
-+ )
-+ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"])
-+else
-+ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xno"])
-+ AC_MSG_NOTICE([Disable building charmap plugin.])
-+fi
-
- AC_SEARCH_LIBS([nanosleep], [posix4 rt])
-
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index e7e7c2341e85..3e6273fe0bbc 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -3,6 +3,6 @@
hanno@gentoo.org
diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
index 113a95c78bc0..8746d785e4df 100644
--- a/dev-java/junit/junit-4.10.ebuild
+++ b/dev-java/junit/junit-4.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.10.ebuild,v 1.1 2011/12/25 21:42:29 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.10.ebuild,v 1.2 2011/12/30 12:14:33 fordfrog Exp $
# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
@@ -67,7 +67,7 @@ src_test() {
mkdir classes || die "Unable to create build directory for tests"
local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
- ejavac -classpath ${cp} -d classes $(find junit/tests -name "*.java")
+ ejavac -classpath ${cp} -d classes $(find junit/tests org/junit/tests -name "*.java")
java -classpath ${cp}:classes org.junit.runner.JUnitCore junit.tests.AllTests \
|| die "Tests failed."
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 1c02fb291200..6dd324d3fb97 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,6 +4,5 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 RMD160 d8c845a356f732dff656a21589cd
DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
-DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fcdec3ede5b1f1 SHA1 588512b2149850b3e6de1ac20c79b54aea074eff SHA256 e907cc65ec38cf9e01995432cc7925c18d03cdbc0dd6baa8f82df2bae83c8486
DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.22.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.22.ebuild
deleted file mode 100644
index d3efc10d78f6..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.22.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.22.ebuild,v 1.2 2011/12/14 18:57:46 ago Exp $
-
-EAPI="2"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
- cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
- rm -fR */*/build.xml
- einfo "Removing bundled jars and classes"
- find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
-}
-
-src_install() {
- java-pkg_dojar "${S}"/output/build/lib/*.jar
- use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-lang/jimtcl/jimtcl-9999.ebuild b/dev-lang/jimtcl/jimtcl-9999.ebuild
index 2ff602979670..17acb7ab1c63 100644
--- a/dev-lang/jimtcl/jimtcl-9999.ebuild
+++ b/dev-lang/jimtcl/jimtcl-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v 1.3 2011/08/04 12:15:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v 1.4 2011/12/30 09:54:46 hwoarang Exp $
EAPI="2"
@@ -17,8 +17,7 @@ IUSE="static-libs"
src_configure() {
! use static-libs && myconf=--with-jim-shared
- econf ${myconf} \
- --with-jim-ext=nvp
+ econf ${myconf}
}
src_compile() {
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 7277bc47e59e..31dcbeeb0d63 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1 +1,2 @@
DIST libgusb-0.1.2.tar.xz 256960 RMD160 5061d4cab78f032aa48e2b2aa8f0482433f5d789 SHA1 418fa44bdbddfada595b400f2cdcbc7487f58140 SHA256 1653a3f1f62957aa41734a63e13b72e611c6a1fdd28bd03955cfbba2d637a236
+DIST libgusb-0.1.3.tar.xz 256844 RMD160 c75f21cea18c409f2ae058a9fd8e8046cdc78b4a SHA1 6fc81a3b1aad42bc8041c9c9c26a029df57c2870 SHA256 4eebb56700d9366c513bfa8f9321a60388f61bade0236a90d66854caea97f0e6
diff --git a/dev-libs/libgusb/libgusb-0.1.3.ebuild b/dev-libs/libgusb/libgusb-0.1.3.ebuild
new file mode 100644
index 000000000000..cf95c621f19f
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgusb/libgusb-0.1.3.ebuild,v 1.1 2011/12/30 14:19:17 ssuominen Exp $
+
+EAPI=4
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://gitorious.org/gusb/"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs"
+
+# udev is effectively a required dependency: configuring with --disable-gudev
+# causes build failures
+RDEPEND=">=dev-libs/glib-2.28
+ dev-libs/libusb:1
+ || ( sys-fs/udev[gudev] sys-fs/udev[extras] )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ dev-libs/libxslt
+ dev-util/pkgconfig"
+# eautoreconf requires dev-util/gtk-doc-am
+
+# Tests try to access usb devices in /dev
+RESTRICT="test"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ rm -f "${ED}"usr/lib*/${PN}.la
+}
diff --git a/dev-libs/libpqxx/libpqxx-4.0.ebuild b/dev-libs/libpqxx/libpqxx-4.0.ebuild
index f2b050732542..088d7559a892 100644
--- a/dev-libs/libpqxx/libpqxx-4.0.ebuild
+++ b/dev-libs/libpqxx/libpqxx-4.0.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-4.0.ebuild,v 1.2 2011/12/30 08:44:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-4.0.ebuild,v 1.3 2011/12/30 14:53:54 jer Exp $
EAPI="4"
inherit eutils
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL."
SRC_URI="http://pqxx.org/download/software/${PN}/${P}.tar.gz"
diff --git a/dev-ruby/coffee-rails/Manifest b/dev-ruby/coffee-rails/Manifest
new file mode 100644
index 000000000000..7e366394b26a
--- /dev/null
+++ b/dev-ruby/coffee-rails/Manifest
@@ -0,0 +1 @@
+DIST coffee-rails-3.1.1.gem 6656 RMD160 6d469a7ce77111d2809fc99d8a354e132fe3542a SHA1 2a9f69de86775c480c29099c7f288256835959ea SHA256 8448caaad3fe3330715e1b4f5c044ff0f3b9fd86d72de1e02fab984d45b02fd9
diff --git a/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild b/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild
new file mode 100644
index 000000000000..f11a555c0898
--- /dev/null
+++ b/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coffee-rails/coffee-rails-3.1.1.ebuild,v 1.1 2011/12/30 13:31:44 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Coffee Script adapter for the Rails asset pipeline."
+HOMEPAGE="https://github.com/rails/coffee-rails"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
+ dev-ruby/railties:3.1"
+
+all_ruby_prepare() {
+ # Test fails on whitespace differences:
+ # https://github.com/rails/coffee-rails/issues/20
+ rm test/template_handler_test.rb || die
+}
diff --git a/dev-ruby/coffee-rails/metadata.xml b/dev-ruby/coffee-rails/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/coffee-rails/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
new file mode 100644
index 000000000000..1b1df705c201
--- /dev/null
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -0,0 +1 @@
+DIST coffee-script-source-1.2.0.gem 43520 RMD160 41748d4d5aa5fb97574d6e362b495e065d5d54b7 SHA1 1f125fc8749871ca13b72fedcd93877e5f23f9dc SHA256 77c2dd4f55a571a0ee030958f10c7b95ff258297cad6de6eec9e962a24ad978d
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.2.0.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.2.0.ebuild
new file mode 100644
index 000000000000..298dfd7b9780
--- /dev/null
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coffee-script-source/coffee-script-source-1.2.0.ebuild,v 1.1 2011/12/30 13:18:46 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler."
+HOMEPAGE="https://github.com/rails/coffee-rails"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
diff --git a/dev-ruby/coffee-script-source/metadata.xml b/dev-ruby/coffee-script-source/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/coffee-script-source/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/coffee-script/Manifest b/dev-ruby/coffee-script/Manifest
new file mode 100644
index 000000000000..774fec1d82ee
--- /dev/null
+++ b/dev-ruby/coffee-script/Manifest
@@ -0,0 +1 @@
+DIST coffee-script-2.2.0.gem 5120 RMD160 8e4a97c9cff87eafb1c81b1b8a6b8ebb576f79aa SHA1 f63e4a5a86295e3011c9e561fe8a9177468abb08 SHA256 acdd9f907950cfcf2342bc621ac9d11c9b0f34e2be8ab02de7845c673fb96c8c
diff --git a/dev-ruby/coffee-script/coffee-script-2.2.0.ebuild b/dev-ruby/coffee-script/coffee-script-2.2.0.ebuild
new file mode 100644
index 000000000000..414861f3c076
--- /dev/null
+++ b/dev-ruby/coffee-script/coffee-script-2.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/coffee-script/coffee-script-2.2.0.ebuild,v 1.1 2011/12/30 13:21:15 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CoffeeScript is a bridge to the official CoffeeScript compiler."
+HOMEPAGE="https://github.com/rails/coffee-rails"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/coffee-script-source dev-ruby/execjs"
diff --git a/dev-ruby/coffee-script/metadata.xml b/dev-ruby/coffee-script/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/coffee-script/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/execjs/Manifest b/dev-ruby/execjs/Manifest
new file mode 100644
index 000000000000..e5bf2d74dbe3
--- /dev/null
+++ b/dev-ruby/execjs/Manifest
@@ -0,0 +1 @@
+DIST execjs-1.2.13-git.tgz 13576 RMD160 293c9f31ff7bd32156c6973544e96b8bf7f58d88 SHA1 ca3108ea688e6e1a94c46864f70fa14ce1d86168 SHA256 751b9bccd917549b1202d02c5eaa5093dba769c8c3a8d1d881cb6121dd3c63cc
diff --git a/dev-ruby/execjs/execjs-1.2.13.ebuild b/dev-ruby/execjs/execjs-1.2.13.ebuild
new file mode 100644
index 000000000000..79f9b28bdc99
--- /dev/null
+++ b/dev-ruby/execjs/execjs-1.2.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-1.2.13.ebuild,v 1.1 2011/12/30 12:39:32 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor."
+HOMEPAGE="https://github.com/lautis/uglifier"
+SRC_URI="https://github.com/sstephenson/execjs/tarball/v${PV} -> ${P}-git.tgz"
+RUBY_S="sstephenson-execjs-*"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/multi_json-1.0"
+
+# execjs supports various javascript runtimes. They are listed in order
+# as per the documentation. For now only include the ones already in the
+# tree.
+
+# therubyracer, therubyrhino, johnson, mustang, node.js, spidermonkey
+
+# spidermonkey doesn't pass the test suite:
+# https://github.com/sstephenson/execjs/issues/62
+
+RDEPEND="${RDEPEND} || ( net-libs/nodejs )"
diff --git a/dev-ruby/execjs/metadata.xml b/dev-ruby/execjs/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/execjs/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.ebuild
index 2a0874bcb405..aabe98b0bb57 100644
--- a/dev-ruby/fakeweb/fakeweb-1.3.0.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0.ebuild,v 1.3 2011/08/07 18:01:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0.ebuild,v 1.4 2011/12/30 11:03:34 graaff Exp $
EAPI=2
@@ -23,7 +23,6 @@ ruby_add_bdepend "
test? (
>=dev-ruby/mocha-0.9.5
virtual/ruby-test-unit
- !dev-ruby/test-unit:2
dev-ruby/samuel
dev-ruby/right_http_connection
)"
diff --git a/dev-ruby/fssm/fssm-0.2.7-r1.ebuild b/dev-ruby/fssm/fssm-0.2.7-r1.ebuild
index 7b8084bd0836..7ef7ff0827f4 100644
--- a/dev-ruby/fssm/fssm-0.2.7-r1.ebuild
+++ b/dev-ruby/fssm/fssm-0.2.7-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fssm/fssm-0.2.7-r1.ebuild,v 1.3 2011/12/17 18:42:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fssm/fssm-0.2.7-r1.ebuild,v 1.4 2011/12/30 14:35:17 graaff Exp $
EAPI=4
-USE_RUBY="ruby18 ree18 jruby"
+USE_RUBY="ruby18 ruby19 ree18 jruby"
RUBY_FAKEGEM_TASK_TEST="spec"
diff --git a/dev-ruby/fssm/fssm-0.2.7.ebuild b/dev-ruby/fssm/fssm-0.2.7.ebuild
index 98e6d9d42c44..8cd44ca128de 100644
--- a/dev-ruby/fssm/fssm-0.2.7.ebuild
+++ b/dev-ruby/fssm/fssm-0.2.7.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fssm/fssm-0.2.7.ebuild,v 1.3 2011/08/07 14:13:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fssm/fssm-0.2.7.ebuild,v 1.4 2011/12/30 14:35:16 graaff Exp $
EAPI=4
-USE_RUBY="ruby18 ree18 jruby"
+USE_RUBY="ruby18 ruby19 ree18 jruby"
RUBY_FAKEGEM_TASK_TEST="spec"
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 38398a1b969d..47fa288b7d8b 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,4 +1,2 @@
-DIST jquery-rails-1.0.14.gem 255488 RMD160 34009ca170df905eb1961e50e2f7d95c399d1131 SHA1 cd06f6c688e140afea70493fdcc20f9795f6388c SHA256 31db0d30831fa3fc2f295a543bc9ff5fcc5a4c753c26491a8203a5841ce38c6b
-DIST jquery-rails-1.0.16.gem 257536 RMD160 2d893ebe9f35b3d6d42c8f54d2b5621c68c5dc59 SHA1 e696b895611aa13eb7781f721e02ee1661f0c93a SHA256 e1a87dcbeac2f29709b326d8a697c236618cb49d69eed35aeefc1f39f0433d9f
DIST jquery-rails-1.0.18.gem 263168 RMD160 559a424028797dd59cbd0fea6307a82529859542 SHA1 60bf1c6c7ba3cdb7f3327eec22954dd2077ea6b6 SHA256 bada406218857961cc6704c1ab83a49d35ce35ee930afe77b85151f36c841956
DIST jquery-rails-1.0.19.gem 262656 RMD160 af4a96bcffb1400d67631ac967c86abb4d9b6fad SHA1 3e0c638a2029827a0c74bb108cbb2975227465fe SHA256 886da031bb562fdbba88ea40c8630b8bfe995673b6f98720c6cb6d24773f67be
diff --git a/dev-ruby/jquery-rails/jquery-rails-1.0.14.ebuild b/dev-ruby/jquery-rails/jquery-rails-1.0.14.ebuild
deleted file mode 100644
index 224e51fb4ac4..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-1.0.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jquery-rails/jquery-rails-1.0.14.ebuild,v 1.1 2011/09/10 10:10:46 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great."
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/railties-3* >=dev-ruby/thor-0.14"
diff --git a/dev-ruby/jquery-rails/jquery-rails-1.0.16.ebuild b/dev-ruby/jquery-rails/jquery-rails-1.0.16.ebuild
deleted file mode 100644
index 2a8ab585928b..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-1.0.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jquery-rails/jquery-rails-1.0.16.ebuild,v 1.1 2011/10/16 08:01:05 graaff Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great."
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/railties-3* >=dev-ruby/thor-0.14"
diff --git a/dev-ruby/jquery-rails/jquery-rails-1.0.19.ebuild b/dev-ruby/jquery-rails/jquery-rails-1.0.19.ebuild
index 421792a65568..cce7e22d5fe2 100644
--- a/dev-ruby/jquery-rails/jquery-rails-1.0.19.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-1.0.19.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jquery-rails/jquery-rails-1.0.19.ebuild,v 1.1 2011/12/13 03:00:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jquery-rails/jquery-rails-1.0.19.ebuild,v 1.2 2011/12/30 12:05:11 graaff Exp $
EAPI=2
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/rack/rack-1.1.3.ebuild b/dev-ruby/rack/rack-1.1.3.ebuild
index 03cf1048787e..006743477937 100644
--- a/dev-ruby/rack/rack-1.1.3.ebuild
+++ b/dev-ruby/rack/rack-1.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.1.3.ebuild,v 1.1 2011/12/30 08:06:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.1.3.ebuild,v 1.2 2011/12/30 10:08:55 ago Exp $
EAPI="2"
USE_RUBY="ruby18 ree18 jruby"
@@ -15,7 +15,7 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
# The gem has automagic dependencies over mongrel, ruby-openid,
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index b462e67dc90e..d9b3444b3cad 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,3 +1 @@
-DIST rb-inotify-0.8.5.gem 12800 RMD160 55ceff41a5b9e904e7a5885a9e793636204dfe46 SHA1 7714461e87367728827e7857363825b499a28fc3 SHA256 a945717213ed3d977b29426c04722c2401af1ebd0c00cc0f43aa6f8c9f00945d
-DIST rb-inotify-0.8.6.gem 13312 RMD160 7ba5cb20575a6f6dc214e7d814e82989cc660297 SHA1 252751de36f6c07d5090aad2fd5ff799e15cc6e0 SHA256 7b3ddd541e3b7fb2b4cb727af0c7511c4a69bb15613d38d23bbdf4d13345faa7
DIST rb-inotify-0.8.8.gem 13312 RMD160 524a017674fb871e49abcdbf93cada15f1b81061 SHA1 3a23fa0b8c449c8c1765a3d6ac76db8e9c4358ac SHA256 92e0ca792cbf403acb3e51ab15d1f937e9a1adb6e98a05f878ec9387eed423e1
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.8.5.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.8.5.ebuild
deleted file mode 100644
index eecd755430af..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.8.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/rb-inotify-0.8.5.ebuild,v 1.2 2011/06/08 19:28:48 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI."
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.8.6-r1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.8.6-r1.ebuild
deleted file mode 100644
index 99e233e92a06..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/rb-inotify-0.8.6-r1.ebuild,v 1.2 2011/08/14 10:17:17 xarthisius Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-RUBY_FAKEGEM_GEMSPEC="rb-inotify.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI."
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-each_ruby_prepare() {
- case ${RUBY} in
- *jruby)
- # jruby has a native implementation and should not list ffi
- # in the gemspec.
- sed -i -e '/ffi/d' rb-inotify.gemspec || die
- ;;
- *)
- ;;
- esac
-}
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.8.6.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.8.6.ebuild
deleted file mode 100644
index 5d93ff13aafa..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.8.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/rb-inotify-0.8.6.ebuild,v 1.1 2011/08/06 06:18:30 graaff Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI."
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ffi"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.8.8.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.8.8.ebuild
index 41791af3fe54..0d3556b1b599 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.8.8.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.8.8.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/rb-inotify-0.8.8.ebuild,v 1.3 2011/12/17 18:37:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rb-inotify/rb-inotify-0.8.8.ebuild,v 1.4 2011/12/30 14:33:39 graaff Exp $
EAPI=4
-USE_RUBY="ruby18 ree18 jruby"
+USE_RUBY="ruby18 ruby19 ree18 jruby"
RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/sass/sass-3.1.10-r1.ebuild b/dev-ruby/sass/sass-3.1.10-r1.ebuild
new file mode 100644
index 000000000000..5bfada947ee7
--- /dev/null
+++ b/dev-ruby/sass/sass-3.1.10-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sass/sass-3.1.10-r1.ebuild,v 1.1 2011/12/30 14:38:30 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more."
+HOMEPAGE="http://sass-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 >=dev-ruby/maruku-0.5.9 )"
+
+ruby_add_rdepend "dev-ruby/fssm !! ${PN}-git-${PV}.tgz"
-S="${WORKDIR}/wycats-${PN}-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-ruby_add_bdepend "
- test? ( dev-ruby/fakeweb )
- doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
- einfo $(pwd)
- # Having VERSION in the docs makes the rdoc generation fail.
- sed -i -e '/EXTRA_RDOC_FILES/s/"VERSION", //' Thorfile || die
-}
-
-all_ruby_compile() {
- einfo $(pwd)
- if use doc; then
- ruby -Ilib bin/thor rdoc || die "RDoc generation failed"
- fi
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib/ bin/thor spec || die "Tests for ${RUBY} failed"
-}
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
new file mode 100644
index 000000000000..aab11e7af9b8
--- /dev/null
+++ b/dev-ruby/uglifier/Manifest
@@ -0,0 +1 @@
+DIST uglifier-1.2.1.gem 42496 RMD160 93601d1329607fbf6c1b005ad7a51324149be92c SHA1 03df5b77c33b67f593f66b20bf89a136e5c97239 SHA256 e76356d4a85abd2413bbf4bbabc866a3e19db7f016438e9e32801f2ec06cb5d0
diff --git a/dev-ruby/uglifier/metadata.xml b/dev-ruby/uglifier/metadata.xml
new file mode 100644
index 000000000000..852136183369
--- /dev/null
+++ b/dev-ruby/uglifier/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+ruby
+
diff --git a/dev-ruby/uglifier/uglifier-1.2.1.ebuild b/dev-ruby/uglifier/uglifier-1.2.1.ebuild
new file mode 100644
index 000000000000..52bb7d481433
--- /dev/null
+++ b/dev-ruby/uglifier/uglifier-1.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/uglifier/uglifier-1.2.1.ebuild,v 1.1 2011/12/30 12:46:30 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 ree18"
+
+# Avoid building documentation to avoid dependencies on bundler and jeweler
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor."
+HOMEPAGE="https://github.com/lautis/uglifier"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+
+# Tests requires additional uglifyjs test code in a vendored git submodule.
+RESTRICT="test"
+
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+ruby_add_rdepend ">=dev-ruby/execjs-0.3.0 >=dev-ruby/multi_json-1.0.2"
+
+each_ruby_test() {
+ ${RUBY} -S rspec spec || die
+}
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 7db4959475e4..e229def8625d 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.111 2011/12/27 16:04:27 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.112 2011/12/30 14:39:26 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -138,15 +138,18 @@ qt4-build_pkg_setup() {
# Unpacks the sources.
qt4-build_src_unpack() {
setqtenv
- local target targets=
+
+ local tarball="${MY_P}.tar.gz" target= targets=
for target in configure LICENSE.GPL3 LICENSE.LGPL projects.pro \
- src/{qbase,qt_targets,qt_install}.pri bin config.tests mkspecs qmake \
- ${QT4_EXTRACT_DIRECTORIES}; do
- targets+=" ${MY_P}/${target}"
+ src/{qbase,qt_targets,qt_install}.pri bin config.tests \
+ mkspecs qmake ${QT4_EXTRACT_DIRECTORIES}
+ do
+ targets+="${MY_P}/${target} "
done
- echo tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets}
- tar xzf "${DISTDIR}"/${MY_P}.tar.gz ${targets} || die
+ ebegin "Unpacking parts of ${tarball}:" ${targets//${MY_P}\/}
+ tar -xzf "${DISTDIR}/${tarball}" ${targets}
+ eend $? || die "failed to unpack"
}
# @ECLASS-VARIABLE: PATCHES
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index 27442cb32d84..3dd2d289b433 100644
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1 +1,2 @@
+DIST alienarena-7.53-linux20111227.tar.gz 440048351 RMD160 d0435e7b58bee8743264f042b2e42e0b5020ae43 SHA1 aa56d1914df6e462bfef3a55cad9dd730ea8f6f5 SHA256 68bb1539c09cc572345ffc64a470dacbc27eb0074c76946694369fdb009c639f
DIST alienarena-7_51-linux20110311.tar.gz 384712273 RMD160 0ea7c312452230580e8cf3cdb3c0da0fe6f99425 SHA1 a1359d58652206c4ea5d5987eb1d807ebf9903e8 SHA256 9e1a871ef76ca4a1cc3243227de9dd55e50b4c5539c7c5b48d9160fdd465d931
diff --git a/games-fps/alienarena/alienarena-20111227.ebuild b/games-fps/alienarena/alienarena-20111227.ebuild
new file mode 100644
index 000000000000..dcf9a45025e3
--- /dev/null
+++ b/games-fps/alienarena/alienarena-20111227.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20111227.ebuild,v 1.1 2011/12/30 09:50:08 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools eutils games
+
+MY_PN=alienarena-7.53
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode"
+
+UIRDEPEND="virtual/jpeg
+ media-libs/openal
+ media-libs/libvorbis
+ media-libs/freetype:2
+ dev-games/ode[double-precision]
+ virtual/glu
+ virtual/opengl
+ dga? ( x11-libs/libXxf86dga )
+ vidmode? ( x11-libs/libXxf86vm )
+ net-misc/curl"
+UIDEPEND="dga? ( x11-proto/xf86dgaproto )
+ vidmode? ( x11-proto/xf86vidmodeproto )"
+RDEPEND="!dedicated? ( ${UIRDEPEND} )"
+DEPEND="${RDEPEND}
+ !dedicated? ( ${UIDEPEND} )
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_PN/_/.}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-nodocs.patch
+ eautoreconf
+}
+
+src_configure() {
+ egamesconf \
+ --disable-silent-rules \
+ --disable-dependency-tracking \
+ --with-icondir=/usr/share/pixmaps \
+ --with-system-libode \
+ $(use_enable !dedicated client) \
+ $(use_with dga xf86dga) \
+ $(use_with vidmode xf86vm)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ mv "${D}${GAMES_BINDIR}/crx-ded" "${D}${GAMES_BINDIR}/${PN}-ded" || die
+ if ! use dedicated ; then
+ mv "${D}${GAMES_BINDIR}/crx" "${D}${GAMES_BINDIR}/${PN}" || die
+ make_desktop_entry ${PN} "Alien Arena"
+ fi
+
+ dodoc docs/README.txt README
+ prepgamesdirs
+}
diff --git a/games-fps/alienarena/files/alienarena-20111227-nodocs.patch b/games-fps/alienarena/files/alienarena-20111227-nodocs.patch
new file mode 100644
index 000000000000..807e3b2aaa1f
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20111227-nodocs.patch
@@ -0,0 +1,16 @@
+diff -ru alienarena-7.51.orig/Makefile.am alienarena-7.51/Makefile.am
+--- alienarena-7.51.orig/Makefile.am 2011-03-05 19:34:07.000000000 -0500
++++ alienarena-7.51/Makefile.am 2011-03-13 01:39:37.179366503 -0500
+@@ -23,12 +23,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+ # Alien Arena documents to be installed in $docdir
+-if INSTALL_DOCS
+-dist_doc_DATA = \
+- docs/license.txt \
+- docs/README.txt \
+- README
+-endif
+
+ # FUSE game server browser and Server management scripts
+ # COPYING and INSTALL are GNU/FSF-supplied documents.
diff --git a/games-misc/xcowsay/xcowsay-1.3.ebuild b/games-misc/xcowsay/xcowsay-1.3.ebuild
index 042279c9cbc5..cecabcc8595f 100644
--- a/games-misc/xcowsay/xcowsay-1.3.ebuild
+++ b/games-misc/xcowsay/xcowsay-1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/xcowsay-1.3.ebuild,v 1.3 2011/03/27 11:04:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/xcowsay-1.3.ebuild,v 1.4 2011/12/30 10:21:26 hwoarang Exp $
EAPI="2"
@@ -18,7 +18,9 @@ RDEPEND="dbus? ( sys-apps/dbus )
fortune? ( games-misc/fortune-mod )
media-libs/freetype:2
media-libs/libpng
- x11-libs/pango"
+ x11-libs/pango
+ x11-libs/gtk+:2
+ x11-libs/gdk-pixbuf:2"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index c1067bb291bc..134f638448f3 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,4 +1 @@
-DIST v4l-utils-0.8.1.tar.bz2 287114 RMD160 da497fa64f53365112db596c1884eb66be5ad32f SHA1 cef4577d52150c9dd82d163643b86846053a78a1 SHA256 2b03003f1e081c5c98d1fe287c0d88a6c720ca972c4d80a1782146bbde1ac5ea
-DIST v4l-utils-0.8.3.tar.bz2 314347 RMD160 802e71dbac1d3aa8bdb4e804bd1a2d680935abcd SHA1 3038abd92670b66ec89a6deacdd338d1529525b4 SHA256 525ebed7ef6e0f6a4bb68fe10403a3725eb1ec31a4c557c68256079b00e283b5
-DIST v4l-utils-0.8.4.tar.bz2 348601 RMD160 6108b052d7bb9ceeb7b71dee9613ea9b835035fc SHA1 4af47832cbe222b562e476f1fc1aea0d9ad98408 SHA256 20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7
DIST v4l-utils-0.8.5.tar.bz2 373882 RMD160 03d429774d2c8db84e8260826d5e8aaab3eca194 SHA1 0ea4c892c0a098ebf1a7dc92e419a65151e32c07 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c
diff --git a/media-libs/libv4l/libv4l-0.8.1.ebuild b/media-libs/libv4l/libv4l-0.8.1.ebuild
deleted file mode 100644
index 4c438a96a65b..000000000000
--- a/media-libs/libv4l/libv4l-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.1.ebuild,v 1.10 2011/04/02 11:01:14 armin76 Exp $
-
-EAPI=3
-inherit linux-info multilib toolchain-funcs
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-kernel/linux-headers-2.6.30-r1"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~SHMEM"
-
-src_compile() {
- tc-export CC
- pushd lib
- emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- CFLAGS="${CFLAGS}" || die
- popd
-}
-
-src_install() {
- pushd lib
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install || die
- popd
- dodoc ChangeLog README.lib* TODO || die
-}
diff --git a/media-libs/libv4l/libv4l-0.8.3.ebuild b/media-libs/libv4l/libv4l-0.8.3.ebuild
deleted file mode 100644
index 80c2fc4f1a77..000000000000
--- a/media-libs/libv4l/libv4l-0.8.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.3.ebuild,v 1.7 2011/07/13 14:37:16 xarthisius Exp $
-
-EAPI=3
-inherit linux-info multilib toolchain-funcs
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-kernel/linux-headers-2.6.30-r1"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~SHMEM"
-
-src_compile() {
- tc-export CC
- pushd lib
- emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- CFLAGS="${CFLAGS}" || die
- popd
-}
-
-src_install() {
- pushd lib
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install || die
- popd
- dodoc ChangeLog README.lib* TODO || die
-}
diff --git a/media-libs/libv4l/libv4l-0.8.4.ebuild b/media-libs/libv4l/libv4l-0.8.4.ebuild
deleted file mode 100644
index 46a7ccdab10a..000000000000
--- a/media-libs/libv4l/libv4l-0.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.4.ebuild,v 1.2 2011/06/16 15:49:15 ssuominen Exp $
-
-EAPI=4
-inherit linux-info multilib toolchain-funcs
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/jpeg"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.30-r1"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~SHMEM"
-
-src_compile() {
- tc-export CC
- pushd lib
- emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS="${CFLAGS}"
- popd
-}
-
-src_install() {
- pushd lib
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
- popd
- dodoc ChangeLog README.lib* TODO
-}
diff --git a/media-libs/libv4l/libv4l-0.8.5.ebuild b/media-libs/libv4l/libv4l-0.8.5.ebuild
index 1cb338523163..5388dd096f8d 100644
--- a/media-libs/libv4l/libv4l-0.8.5.ebuild
+++ b/media-libs/libv4l/libv4l-0.8.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.5.ebuild,v 1.6 2011/10/23 14:55:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.5.ebuild,v 1.7 2011/12/30 13:14:33 ssuominen Exp $
EAPI=4
inherit linux-info multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="virtual/jpeg"
diff --git a/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch b/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
new file mode 100644
index 000000000000..af9e9c88c8ff
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/4.5.1-fix-searching-for-phonon.patch
@@ -0,0 +1,63 @@
+diff -urN phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake
+--- phonon-backend-gstreamer-4.5.1.old/cmake/FindPhonon.cmake 2011-05-04 06:34:52.000000000 +0200
++++ phonon-backend-gstreamer-4.5.1/cmake/FindPhonon.cmake 2011-12-30 12:22:03.623333200 +0100
+@@ -1,53 +1,16 @@
+ # Find Phonon
+
+ # Copyright (c) 2010, Harald Sitter
++# Copyright (c) 2011, Alexander Neundorf
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+-if (NOT PHONON_BUILDSYSTEM_DIR)
+- find_program(PC_EXECUTABLE NAMES pkg-config
+- PATH_SUFFIXES bin
+- HINTS
+- ${CMAKE_INSTALL_PREFIX}
+- ONLY_CMAKE_FIND_ROOT_PATH
+- )
+-
+- if (NOT PC_EXECUTABLE)
+- if (Phonon_FIND_REQUIRED)
+- message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].")
+- endif (Phonon_FIND_REQUIRED)
+- endif (NOT PC_EXECUTABLE)
+-
+- if (PC_EXECUTABLE)
+- execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon
+- OUTPUT_VARIABLE _data_DIR
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
+- file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
+- find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR})
+- endif (PC_EXECUTABLE)
+-endif (NOT PHONON_BUILDSYSTEM_DIR)
+-
+-if (PHONON_BUILDSYSTEM_DIR)
++find_package(Phonon NO_MODULE)
++if(PHONON_FOUND)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
++endif()
+
+- if (Phonon_FIND_REQUIRED)
+- set(_req REQUIRED)
+- endif (Phonon_FIND_REQUIRED)
+- if (PHONON_FIND_QUIETLY)
+- set(_quiet QUIET)
+- endif (PHONON_FIND_QUIETLY)
++include(FindPackageHandleStandardArgs)
+
+- find_package(PhononInternal ${_req} ${_quiet})
+-else (PHONON_BUILDSYSTEM_DIR)
+- if (_data_DIR)
+- if (Phonon_FIND_REQUIRED)
+- message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}")
+- endif (Phonon_FIND_REQUIRED)
+- else (_data_DIR)
+- if (Phonon_FIND_REQUIRED)
+- message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.")
+- endif (Phonon_FIND_REQUIRED)
+- endif (_data_DIR)
+-endif (PHONON_BUILDSYSTEM_DIR)
++find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR )
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
index a0bbbd288869..c4687a512f52 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild,v 1.3 2011/12/29 20:25:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-gstreamer/phonon-gstreamer-4.5.1.ebuild,v 1.4 2011/12/30 11:25:09 scarabeus Exp $
EAPI=4
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${PV}-fix-searching-for-phonon.patch"
+)
+
S="${WORKDIR}/${MY_P}"
src_configure() {
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 3451de36763e..170d565f4460 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,2 +1,2 @@
DIST tiff-3.9.5.tar.gz 1455502 RMD160 c67742bf6b9b10ca0700e69ce575007d40c4f89c SHA1 f40aab20fb2f609b5cbc1171c40b66a1445e3773 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33
-DIST tiff-4.0.0beta7.tar.gz 2004539 RMD160 2bdac755802112ba93a534baeb50c08c42e5677d SHA1 91686943ebb7a0e1b162ba61f5abf9598109a391 SHA256 7b622db9e62a14464b0ae27e5eed4e2e893d7aab889c778e56ac28df069c3ded
+DIST tiff-4.0.0.tar.gz 2008075 RMD160 82b27f00b48c74970faac6a4bb4a8a49a199e3b1 SHA1 85d85520fea40fc9291995a60e3d40cf980b5522 SHA256 9f4c0b2a8446a259db431c6401342bcb2c1be4a604e77a532d109c8448619288
diff --git a/media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch b/media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch
deleted file mode 100644
index 8d30334da380..000000000000
--- a/media-libs/tiff/files/tiff-3.9.2-CVE-2009-2347.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=307001
-http://bugzilla.maptools.org/show_bug.cgi?id=2079
-
---- tools/tiff2rgba.c
-+++ tools/tiff2rgba.c
-@@ -125,6 +125,17 @@
- return (0);
- }
-
-+static tsize_t
-+multiply(tsize_t m1, tsize_t m2)
-+{
-+ tsize_t prod = m1 * m2;
-+
-+ if (m1 && prod / m1 != m2)
-+ prod = 0; /* overflow */
-+
-+ return prod;
-+}
-+
- static int
- cvt_by_tile( TIFF *in, TIFF *out )
-
-@@ -134,6 +145,7 @@
- uint32 tile_width, tile_height;
- uint32 row, col;
- uint32 *wrk_line;
-+ tsize_t raster_size;
- int ok = 1;
-
- TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
-@@ -151,7 +163,14 @@
- /*
- * Allocate tile buffer
- */
-- raster = (uint32*)_TIFFmalloc(tile_width * tile_height * sizeof (uint32));
-+ raster_size = multiply(multiply(tile_width, tile_height), sizeof (uint32));
-+ if (!raster_size) {
-+ TIFFError(TIFFFileName(in),
-+ "Can't allocate buffer for raster of size %lux%lu",
-+ (unsigned long) tile_width, (unsigned long) tile_height);
-+ return (0);
-+ }
-+ raster = (uint32*)_TIFFmalloc(raster_size);
- if (raster == 0) {
- TIFFError(TIFFFileName(in), "No space for raster buffer");
- return (0);
-@@ -159,7 +178,7 @@
-
- /*
- * Allocate a scanline buffer for swapping during the vertical
-- * mirroring pass.
-+ * mirroring pass. (Request can't overflow given prior checks.)
- */
- wrk_line = (uint32*)_TIFFmalloc(tile_width * sizeof (uint32));
- if (!wrk_line) {
-@@ -236,6 +255,7 @@
- uint32 width, height; /* image width & height */
- uint32 row;
- uint32 *wrk_line;
-+ tsize_t raster_size;
- int ok = 1;
-
- TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &width);
-@@ -251,7 +271,14 @@
- /*
- * Allocate strip buffer
- */
-- raster = (uint32*)_TIFFmalloc(width * rowsperstrip * sizeof (uint32));
-+ raster_size = multiply(multiply(width, rowsperstrip), sizeof (uint32));
-+ if (!raster_size) {
-+ TIFFError(TIFFFileName(in),
-+ "Can't allocate buffer for raster of size %lux%lu",
-+ (unsigned long) width, (unsigned long) rowsperstrip);
-+ return (0);
-+ }
-+ raster = (uint32*)_TIFFmalloc(raster_size);
- if (raster == 0) {
- TIFFError(TIFFFileName(in), "No space for raster buffer");
- return (0);
-@@ -259,7 +286,7 @@
-
- /*
- * Allocate a scanline buffer for swapping during the vertical
-- * mirroring pass.
-+ * mirroring pass. (Request can't overflow given prior checks.)
- */
- wrk_line = (uint32*)_TIFFmalloc(width * sizeof (uint32));
- if (!wrk_line) {
diff --git a/media-libs/tiff/tiff-4.0.0_beta7.ebuild b/media-libs/tiff/tiff-4.0.0.ebuild
similarity index 52%
rename from media-libs/tiff/tiff-4.0.0_beta7.ebuild
rename to media-libs/tiff/tiff-4.0.0.ebuild
index 2e26f6a70054..a6eb12d828df 100644
--- a/media-libs/tiff/tiff-4.0.0_beta7.ebuild
+++ b/media-libs/tiff/tiff-4.0.0.ebuild
@@ -1,60 +1,46 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta7.ebuild,v 1.3 2011/04/27 18:01:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0.ebuild,v 1.1 2011/12/30 12:10:06 ssuominen Exp $
-EAPI=3
-inherit eutils libtool
-
-MY_P=${P/_}
+EAPI=4
+inherit libtool
DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
HOMEPAGE="http://www.remotesensing.org/libtiff/"
-SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
+SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
+ ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg static-libs zlib"
+IUSE="+cxx jbig jpeg lzma static-libs zlib"
RDEPEND="jpeg? ( virtual/jpeg )
jbig? ( media-libs/jbigkit )
+ lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib )"
-
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.9.2-CVE-2009-2347.patch
elibtoolize
}
src_configure() {
econf \
- --disable-dependency-tracking \
$(use_enable static-libs static) \
- $(use_enable cxx) \
$(use_enable zlib) \
$(use_enable jpeg) \
$(use_enable jbig) \
+ $(use_enable lzma) \
+ $(use_enable cxx) \
--without-x \
--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog README TODO
-
- use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
+ default
-pkg_postinst() {
- if use jbig; then
- echo
- elog "JBIG support is intended for Hylafax fax compression, so we"
- elog "really need more feedback in other areas (most testing has"
- elog "been done with fax). Be sure to recompile anything linked"
- elog "against tiff if you rebuild it with jbig support."
- echo
- fi
+ rm -f \
+ "${ED}"/usr/lib*/libtiff*.la \
+ "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
}
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
new file mode 100644
index 000000000000..999cbd4deade
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r2.ebuild,v 1.1 2011/12/30 09:49:31 hwoarang Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs qt4-r2
+
+MY_P="${P/lastfmplayer/lastfm}+dfsg"
+
+DESCRIPTION="A player for last.fm radio streams"
+HOMEPAGE="http://www.last.fm/help/player
+ http://www.mehercule.net/staticpages/index.php/lastfm"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/lastfm-${PV}+dfsg.tar.gz
+ http://dev.gentoo.org/~hwoarang/distfiles/lastfm_${PV}+dfsg-2.debian.tar.gz
+ dbus? ( http://glue.umd.edu/~rossatok/dbusextension-2.0.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="dbus ipod"
+
+RDEPEND="x11-libs/qt-gui:4
+ x11-libs/qt-sql:4
+ media-libs/libsamplerate
+ sci-libs/fftw
+ media-libs/libmad
+ ipod? ( >=media-libs/libgpod-0.5.2 )
+ media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+ app-arch/sharutils"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ qt4-r2_src_prepare
+ # Use a different extensions path
+ epatch "${FILESDIR}"/${PN}-extensions-path.patch
+ einfo "Applying Debian patchset"
+ sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series
+ cd "${S}"
+ for i in $( < "${WORKDIR}"/debian/patches/series); do
+ epatch "${WORKDIR}"/debian/patches/$i
+ done
+ if ! use ipod ; then
+ sed -i '/src\/mediadevices\/ipod/d' LastFM.pro || die "sed failed"
+ fi
+ #fix plugin search path for multilib support
+ sed -i -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
+ "${S}"/src/libMoose/MooseCommon.cpp
+ if use dbus; then
+ mv "${WORKDIR}"/dbus "${S}"/src/dbus
+ sed -i -e "/include/s:../definitions.pro.in:definitions.pro.in:" \
+ -e "/TARGET/s:dbusextension:LastFmDbusExtension:" \
+ "${S}"/src/dbus/dbusextension.pro
+ fi
+}
+
+src_configure() {
+ if use dbus; then
+ pushd "${S}"/src/dbus
+ eqmake4 dbusextension.pro
+ popd >> /dev/null
+ fi
+ qt4-r2_src_configure
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+ if use dbus; then
+ einfo "Building DBUS plugin"
+ emake -C "${S}"/src/dbus || die "failed to build dbus extension"
+ fi
+ cd i18n; lrelease *.ts
+}
+
+src_install() {
+ cd "${WORKDIR}"
+ # Docs
+ dodoc "${S}"/ChangeLog.txt "${S}"/README debian/README.source \
+ || die "dodoc failed"
+ doman debian/lastfm.1 || die "doman failed"
+
+ # Copied from debian/rules
+ insinto /usr/share
+ doins -r debian/package-files/share/icons || die "failed to install icons"
+ insinto /usr/share/lastfm/icons
+ doins "${S}"/bin/data/icons/*.png \
+ || die "failed to install application icons"
+ insinto /usr/share/lastfm
+ doins "${S}"/bin/data/*.png || die "failed to install icons"
+ dodir /usr/$(get_libdir)/lastfm_services/
+ insinto /usr/$(get_libdir)/lastfm_services/
+ insopts -m0755
+ doins -r "${S}"/bin/lastfm_services/*.so || die "failed to install plugins"
+ if use dbus; then
+ insinto /usr/$(get_libdir)/lastfm_services/extensions/
+ insopts -m0755
+ doins "${S}"/bin/lastfm_services/extensions/*.so || die
+ fi
+ insinto /usr/$(get_libdir)
+ insopts -m0755
+ doins "${S}"/bin/libLastFmTools.so.1* || die "failed to install library"
+ doins "${S}"/bin/libMoose.so.1* || die "failed to install library"
+ #fix symlinks
+ cd "${D}"/usr/$(get_libdir)/
+ ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1
+ ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1.0
+ ln -sfn libMoose.so.1.0.0 libMoose.so.1
+ ln -sfn libMoose.so.1.0.0 libMoose.so.1.0
+ cd "${WORKDIR}"
+ newbin "${S}"/bin/last.fm lastfm || die "newbin failed"
+ insinto /usr/share/lastfm/i18n
+ doins "${S}"/i18n/*.qm || die "failed to install translations"
+ fperms 755 /usr/bin/lastfm
+ rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png
+ # create desktop entry
+ doicon "${WORKDIR}"/debian/package-files/share/icons/hicolor/48x48/apps/lastfm.png
+ # Allow arguments when launching application. Bug #395277
+ make_desktop_entry lastfm "Last.fm Player" lastfm
+ sed -i -e "/Exec/s:lastfm:& %U:" \
+ "${D}"/usr/share/applications/lastfm-${PN}.desktop || die
+}
+
+pkg_postinst() {
+ elog "To use the Last.fm player with a mozilla based browser:"
+ elog " 1. Install gnome-base/gconf"
+ elog " 2. gconftool-2 -t string -s \
+/desktop/gnome/url-handlers/lastfm/command \"/usr/bin/lastfm %s\""
+ elog " 3. gconftool-2 -s \
+/desktop/gnome/url-handlers/lastfm/needs_terminal false -t bool"
+ elog " 4. gconftool-2 -t bool -s \
+/desktop/gnome/url-handlers/lastfm/enabled true"
+ elog
+ elog "If you experience awkward fonts or widgets, try running qtconfig."
+}
diff --git a/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild
index 0ded8726c49f..1c5a0553ff4a 100644
--- a/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild,v 1.3 2011/09/18 21:46:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild,v 1.4 2011/12/30 13:16:34 ssuominen Exp $
EAPI=4
inherit toolchain-funcs qt4-r2
@@ -11,7 +11,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="qt4"
RDEPEND=">=media-libs/libv4l-${PV}
diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest
index ea18137ad236..d8fa46eb2da1 100644
--- a/media-video/qx11grab/Manifest
+++ b/media-video/qx11grab/Manifest
@@ -1,2 +1,3 @@
DIST qx11grab-0.2.1_rc4.tar.bz2 147299 RMD160 162dec4ea4a41033a9cc2a0b835202ef24cb8f44 SHA1 b14b6d3329a2578d466dbdb7b9c4e1ec243f4009 SHA256 06a4589fcb2c53496fe7b877cd91ebe70d658ed10e7bdbb1927a95d2f4747dc3
DIST qx11grab-0.2.2.tar.bz2 153759 RMD160 69c295d8a9840f9dc84adf2695aa5b4a6fd9e0ac SHA1 531de1954c10041fa7dfb6011448b487041e65fe SHA256 b58659b8fba740e50a734d1de50bd643c04fa65337e2f14f78478acfea15dca4
+DIST qx11grab-0.3.1.tar.bz2 223825 RMD160 a1307bd88bcc6280659819ac5e4a3ed91c847294 SHA1 74dcd7fcabbdd95e22d197f09635f44c55eb699e SHA256 1160be22860a856b79598df5123708f991c7c2e499193069c1b8d67a28fe8d48
diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml
index 37b9640e6ce9..dc439f7e84f5 100644
--- a/media-video/qx11grab/metadata.xml
+++ b/media-video/qx11grab/metadata.xml
@@ -1,8 +1,5 @@
- qt
-
-
+qt
-
diff --git a/media-video/qx11grab/qx11grab-0.3.1.ebuild b/media-video/qx11grab/qx11grab-0.3.1.ebuild
new file mode 100644
index 000000000000..255d0a0a11e5
--- /dev/null
+++ b/media-video/qx11grab/qx11grab-0.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.3.1.ebuild,v 1.1 2011/12/30 11:18:05 pesa Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="X11 desktop video grabber tray"
+HOMEPAGE="http://qx11grab.hjcms.de/"
+SRC_URI="ftp://ftp.hjcms.de/qx11grab/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=media-libs/alsa-lib-1.0.24
+ >=x11-libs/libX11-1.3.4
+ >=x11-libs/qt-dbus-4.7.2:4
+ >=x11-libs/qt-gui-4.7.2:4[dbus]
+ >=virtual/ffmpeg-0.9[X,encode]
+"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+"
+
+src_prepare() {
+ # install docs into standard Gentoo location
+ sed -i -e "s: share/\${CMAKE_PROJECT_NAME}: share/doc/${PF}:" \
+ CMakeLists.txt || die
+}
diff --git a/metadata/cache/app-editors/bluefish-2.0.3 b/metadata/cache/app-editors/bluefish-2.0.3
deleted file mode 100644
index f8f1feb4afaf..000000000000
--- a/metadata/cache/app-editors/bluefish-2.0.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.12:2 spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 dev-util/pkgconfig x11-libs/pango gucharmap? ( gnome-extra/gucharmap ) nls? ( sys-devel/gettext dev-util/intltool ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
->=x11-libs/gtk+-2.12:2 spell? ( app-text/enchant ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
-0
-http://www.bennewitz.com/bluefish/stable/source/bluefish-2.0.3.tar.bz2
-
-http://bluefish.openoffice.nl/
-GPL-2
-A GTK HTML editor for the experienced web designer or programmer.
-~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-autotools eutils fdo-mime libtool multilib portability python toolchain-funcs user
-gucharmap nls python spell
-
-
-
-3
-
-configure install postinst postrm prepare setup
-
-
-
-
-
diff --git a/metadata/cache/app-editors/bluefish-2.2.1 b/metadata/cache/app-editors/bluefish-2.2.1
new file mode 100644
index 000000000000..1fd550901a45
--- /dev/null
+++ b/metadata/cache/app-editors/bluefish-2.2.1
@@ -0,0 +1,22 @@
+gtk3? ( x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 ) !gtk3? ( >=x11-libs/gtk+-2.12:2 gnome-extra/gucharmap:0 ) spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 dev-util/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+gtk3? ( x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 ) !gtk3? ( >=x11-libs/gtk+-2.12:2 gnome-extra/gucharmap:0 ) spell? ( app-text/enchant ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+0
+http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.1.tar.bz2
+test
+http://bluefish.openoffice.nl/
+GPL-2
+A GTK HTML editor for the experienced web designer or programmer.
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+autotools eutils fdo-mime libtool multilib portability python toolchain-funcs user
+gtk3 nls python spell
+
+
+
+4
+
+configure install postinst postrm setup
+
+
+
+
+
diff --git a/metadata/cache/dev-java/tomcat-servlet-api-7.0.22 b/metadata/cache/dev-java/tomcat-servlet-api-7.0.22
deleted file mode 100644
index 01787bd9d348..000000000000
--- a/metadata/cache/dev-java/tomcat-servlet-api-7.0.22
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/jdk-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
->=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-3.0
-mirror://apache/tomcat/tomcat-7/v7.0.22/src/apache-tomcat-7.0.22-src.tar.gz
-
-http://tomcat.apache.org/
-Apache-2.0
-Tomcat's Servlet API 3.0/JSP API 2.2 implementation
-amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
-elibc_FreeBSD source elibc_FreeBSD
-
-
-
-2
-
-compile configure install preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/libgusb-0.1.3 b/metadata/cache/dev-libs/libgusb-0.1.3
new file mode 100644
index 000000000000..1bc22a57b3e5
--- /dev/null
+++ b/metadata/cache/dev-libs/libgusb-0.1.3
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.28 dev-libs/libusb:1 || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) app-arch/xz-utils dev-libs/libxslt dev-util/pkgconfig
+>=dev-libs/glib-2.28 dev-libs/libusb:1 || ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+0
+http://people.freedesktop.org/~hughsient/releases/libgusb-0.1.3.tar.xz
+test
+https://gitorious.org/gusb/
+LGPL-2.1
+GObject wrapper for libusb
+~amd64 ~hppa ~x86
+
+static-libs
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/dev-libs/libpqxx-4.0 b/metadata/cache/dev-libs/libpqxx-4.0
index 625ede9433cd..073a74a2bb7a 100644
--- a/metadata/cache/dev-libs/libpqxx-4.0
+++ b/metadata/cache/dev-libs/libpqxx-4.0
@@ -6,7 +6,7 @@ http://pqxx.org/download/software/libpqxx/libpqxx-4.0.tar.gz
http://pqxx.org/development/libpqxx/
BSD
C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL.
-~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
eutils multilib portability toolchain-funcs user
doc
diff --git a/metadata/cache/dev-ruby/coffee-rails-3.1.1 b/metadata/cache/dev-ruby/coffee-rails-3.1.1
new file mode 100644
index 000000000000..aa647fcae15a
--- /dev/null
+++ b/metadata/cache/dev-ruby/coffee-rails-3.1.1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby18] dev-ruby/railties:3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby19] dev-ruby/railties:3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ree18] dev-ruby/railties:3.1[ruby_targets_ree18] ) ) 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_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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_ruby18? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby18] dev-ruby/railties:3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby19] dev-ruby/railties:3.1[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ree18] dev-ruby/railties:3.1[ruby_targets_ree18] ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+mirror://rubygems/coffee-rails-3.1.1.gem
+
+https://github.com/rails/coffee-rails
+MIT
+Coffee Script adapter for the Rails asset pipeline.
+~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 test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/coffee-script-2.2.0 b/metadata/cache/dev-ruby/coffee-script-2.2.0
new file mode 100644
index 000000000000..ffb98ec89a8a
--- /dev/null
+++ b/metadata/cache/dev-ruby/coffee-script-2.2.0
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( dev-ruby/coffee-script-source[ruby_targets_ruby18] dev-ruby/execjs[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19] dev-ruby/execjs[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/coffee-script-source[ruby_targets_ree18] dev-ruby/execjs[ruby_targets_ree18] ) ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_ruby18? ( dev-ruby/coffee-script-source[ruby_targets_ruby18] dev-ruby/execjs[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19] dev-ruby/execjs[ruby_targets_ruby19] ) ruby_targets_ree18? ( dev-ruby/coffee-script-source[ruby_targets_ree18] dev-ruby/execjs[ruby_targets_ree18] ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+mirror://rubygems/coffee-script-2.2.0.gem
+
+https://github.com/rails/coffee-rails
+MIT
+Ruby CoffeeScript is a bridge to the official CoffeeScript compiler.
+~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 test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/coffee-script-source-1.2.0 b/metadata/cache/dev-ruby/coffee-script-source-1.2.0
new file mode 100644
index 000000000000..548a0582f4e8
--- /dev/null
+++ b/metadata/cache/dev-ruby/coffee-script-source-1.2.0
@@ -0,0 +1,22 @@
+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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+mirror://rubygems/coffee-script-source-1.2.0.gem
+
+https://github.com/rails/coffee-rails
+MIT
+Ruby CoffeeScript is a bridge to the official CoffeeScript compiler.
+~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 test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/execjs-1.2.13 b/metadata/cache/dev-ruby/execjs-1.2.13
new file mode 100644
index 000000000000..6511137cdc38
--- /dev/null
+++ b/metadata/cache/dev-ruby/execjs-1.2.13
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/multi_json-1.0[ruby_targets_ree18] ) ) 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_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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_ruby18? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/multi_json-1.0[ruby_targets_ree18] ) || ( net-libs/nodejs ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+https://github.com/sstephenson/execjs/tarball/v1.2.13 -> execjs-1.2.13-git.tgz
+
+https://github.com/lautis/uglifier
+MIT
+Ruby wrapper for UglifyJS JavaScript compressor.
+~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 test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/fakeweb-1.3.0 b/metadata/cache/dev-ruby/fakeweb-1.3.0
index 504ef5e882ed..e965053f3c50 100644
--- a/metadata/cache/dev-ruby/fakeweb-1.3.0
+++ b/metadata/cache/dev-ruby/fakeweb-1.3.0
@@ -1,4 +1,4 @@
-ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] !dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/samuel[ruby_targets_ruby18] dev-ruby/right_http_connection[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] !dev-ruby/test-unit:2[ruby_targets_ree18] dev-ruby/samuel[ruby_targets_ree18] dev-ruby/right_http_connection[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] !dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/samuel[ruby_targets_ruby19] dev-ruby/right_http_connection[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_jruby] virtual/ruby-test-unit[ruby_targets_jruby] !dev-ruby/test-unit:2[ruby_targets_jruby] dev-ruby/samuel[ruby_targets_jruby] dev-ruby/right_http_connection[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby18] virtual/ruby-test-unit[ruby_targets_ruby18] dev-ruby/samuel[ruby_targets_ruby18] dev-ruby/right_http_connection[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ree18] virtual/ruby-test-unit[ruby_targets_ree18] dev-ruby/samuel[ruby_targets_ree18] dev-ruby/right_http_connection[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_ruby19] virtual/ruby-test-unit[ruby_targets_ruby19] dev-ruby/samuel[ruby_targets_ruby19] dev-ruby/right_http_connection[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/mocha-0.9.5[ruby_targets_jruby] virtual/ruby-test-unit[ruby_targets_jruby] dev-ruby/samuel[ruby_targets_jruby] dev-ruby/right_http_connection[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
0
mirror://rubygems/fakeweb-1.3.0.gem
diff --git a/metadata/cache/dev-ruby/fssm-0.2.7 b/metadata/cache/dev-ruby/fssm-0.2.7
index 755545c96c07..40143bb09767 100644
--- a/metadata/cache/dev-ruby/fssm-0.2.7
+++ b/metadata/cache/dev-ruby/fssm-0.2.7
@@ -1,5 +1,5 @@
-ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) 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_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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-2.4.0:2[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? ( 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/fssm-0.2.7.gem
@@ -8,8 +8,8 @@ MIT
Monitor API
~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
4
diff --git a/metadata/cache/dev-ruby/fssm-0.2.7-r1 b/metadata/cache/dev-ruby/fssm-0.2.7-r1
index 313dc3a3b6f8..e515b9980aff 100644
--- a/metadata/cache/dev-ruby/fssm-0.2.7-r1
+++ b/metadata/cache/dev-ruby/fssm-0.2.7-r1
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) 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_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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( >=dev-ruby/rspec-2.4.0:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( >=dev-ruby/rspec-2.4.0:2[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? ( 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/rb-inotify-0.8.6-r1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/rb-inotify-0.8.6-r1[ruby_targets_ree18] ) ruby_targets_jruby? ( >=dev-ruby/rb-inotify-0.8.6-r1[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/fssm-0.2.7.gem
@@ -8,8 +8,8 @@ MIT
Monitor API
~amd64 ~ia64 ~sparc ~x86
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby test test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
4
diff --git a/metadata/cache/dev-ruby/jquery-rails-1.0.14 b/metadata/cache/dev-ruby/jquery-rails-1.0.14
deleted file mode 100644
index 72ef4a71b29c..000000000000
--- a/metadata/cache/dev-ruby/jquery-rails-1.0.14
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-0
-mirror://rubygems/jquery-rails-1.0.14.gem
-
-http://www.rubyonrails.org
-MIT
-jQuery! For Rails! So great.
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/jquery-rails-1.0.16 b/metadata/cache/dev-ruby/jquery-rails-1.0.16
deleted file mode 100644
index 116a517b677e..000000000000
--- a/metadata/cache/dev-ruby/jquery-rails-1.0.16
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-0
-mirror://rubygems/jquery-rails-1.0.16.gem
-
-http://www.rubyonrails.org
-MIT
-jQuery! For Rails! So great.
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/jquery-rails-1.0.19 b/metadata/cache/dev-ruby/jquery-rails-1.0.19
index 0837922a33f1..c17210d89468 100644
--- a/metadata/cache/dev-ruby/jquery-rails-1.0.19
+++ b/metadata/cache/dev-ruby/jquery-rails-1.0.19
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+test? ( ruby_targets_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/railties-3*[ruby_targets_ruby19] >=dev-ruby/thor-0.14[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_ruby18? ( =dev-ruby/railties-3*[ruby_targets_ruby18] >=dev-ruby/thor-0.14[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/railties-3*[ruby_targets_ruby19] >=dev-ruby/thor-0.14[ruby_targets_ruby19] ) ruby_targets_ree18? ( =dev-ruby/railties-3*[ruby_targets_ree18] >=dev-ruby/thor-0.14[ruby_targets_ree18] ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
0
mirror://rubygems/jquery-rails-1.0.19.gem
@@ -8,7 +8,7 @@ MIT
jQuery! For Rails! So great.
~amd64
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test
diff --git a/metadata/cache/dev-ruby/rack-1.1.3 b/metadata/cache/dev-ruby/rack-1.1.3
index 3b326d04f7a7..c90633de55d6 100644
--- a/metadata/cache/dev-ruby/rack-1.1.3
+++ b/metadata/cache/dev-ruby/rack-1.1.3
@@ -6,7 +6,7 @@ mirror://rubyforge/rack/rack-1.1.3.tar.gz
http://rubyforge.org/projects/rack
MIT
A modular Ruby webserver interface
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
diff --git a/metadata/cache/dev-ruby/rb-inotify-0.8.5 b/metadata/cache/dev-ruby/rb-inotify-0.8.5
deleted file mode 100644
index 4c2c5888f7d0..000000000000
--- a/metadata/cache/dev-ruby/rb-inotify-0.8.5
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-0
-mirror://rubygems/rb-inotify-0.8.5.gem
-
-https://github.com/nex3/rb-inotify
-MIT
-A thorough inotify wrapper for Ruby using FFI.
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rb-inotify-0.8.6 b/metadata/cache/dev-ruby/rb-inotify-0.8.6
deleted file mode 100644
index bf1fde14aed7..000000000000
--- a/metadata/cache/dev-ruby/rb-inotify-0.8.6
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-0
-mirror://rubygems/rb-inotify-0.8.6.gem
-
-https://github.com/nex3/rb-inotify
-MIT
-A thorough inotify wrapper for Ruby using FFI.
-~amd64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rb-inotify-0.8.6-r1 b/metadata/cache/dev-ruby/rb-inotify-0.8.6-r1
deleted file mode 100644
index 56416d092ec8..000000000000
--- a/metadata/cache/dev-ruby/rb-inotify-0.8.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-0
-mirror://rubygems/rb-inotify-0.8.6.gem
-
-https://github.com/nex3/rb-inotify
-MIT
-A thorough inotify wrapper for Ruby using FFI.
-~amd64 ~ppc ~ppc64
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/rb-inotify-0.8.8 b/metadata/cache/dev-ruby/rb-inotify-0.8.8
index a6fc7c322d2b..f9f975a84c89 100644
--- a/metadata/cache/dev-ruby/rb-inotify-0.8.8
+++ b/metadata/cache/dev-ruby/rb-inotify-0.8.8
@@ -1,5 +1,5 @@
-test? ( ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+test? ( ruby_targets_ruby18? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[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? ( 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? ( virtual/ruby-ffi[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/ruby-ffi[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/ruby-ffi[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/rb-inotify-0.8.8.gem
@@ -8,8 +8,8 @@ MIT
A thorough inotify wrapper for Ruby using FFI.
~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test
-|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby )
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
4
diff --git a/metadata/cache/dev-ruby/sass-3.1.10-r1 b/metadata/cache/dev-ruby/sass-3.1.10-r1
new file mode 100644
index 000000000000..cce987ef1450
--- /dev/null
+++ b/metadata/cache/dev-ruby/sass-3.1.10-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby18] >=dev-ruby/maruku-0.5.9[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby19] >=dev-ruby/maruku-0.5.9[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ree18] >=dev-ruby/maruku-0.5.9[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_jruby] >=dev-ruby/maruku-0.5.9[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( dev-ruby/fssm[ruby_targets_ruby18] !! thor-git-0.14.3.tgz
-
-http://github.com/wycats/thor
-MIT
-A scripting framework that replaces rake and sake
-~amd64 ~x86
-eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
-doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 doc test
-
-
-
-2
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-ruby/uglifier-1.2.1 b/metadata/cache/dev-ruby/uglifier-1.2.1
new file mode 100644
index 000000000000..d32cc56310ef
--- /dev/null
+++ b/metadata/cache/dev-ruby/uglifier-1.2.1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.2[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ree18] >=dev-ruby/multi_json-1.0.2[ruby_targets_ree18] ) ) 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_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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) 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_ruby18? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0.2[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.2[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ree18] >=dev-ruby/multi_json-1.0.2[ruby_targets_ree18] ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+mirror://rubygems/uglifier-1.2.1.gem
+test
+https://github.com/lautis/uglifier
+MIT
+Ruby wrapper for UglifyJS JavaScript compressor.
+~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 test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/games-fps/alienarena-20111227 b/metadata/cache/games-fps/alienarena-20111227
new file mode 100644
index 000000000000..5078c695d56f
--- /dev/null
+++ b/metadata/cache/games-fps/alienarena-20111227
@@ -0,0 +1,22 @@
+!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl )
+0
+http://icculus.org/alienarena/Files/alienarena-7.53-linux20111227.tar.gz
+
+http://red.planetarena.org/
+GPL-2 free-noncomm
+Fast-paced multiplayer deathmatch game
+~amd64 ~x86
+autotools base eutils games libtool multilib portability toolchain-funcs user
+dedicated +dga +vidmode
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-misc/xcowsay-1.3 b/metadata/cache/games-misc/xcowsay-1.3
index ef148652f56c..836ae53b8d6f 100644
--- a/metadata/cache/games-misc/xcowsay-1.3
+++ b/metadata/cache/games-misc/xcowsay-1.3
@@ -1,5 +1,5 @@
-dbus? ( sys-apps/dbus ) dev-libs/dbus-glib fortune? ( games-misc/fortune-mod ) media-libs/freetype:2 media-libs/libpng x11-libs/pango dev-util/pkgconfig
-dbus? ( sys-apps/dbus ) dev-libs/dbus-glib fortune? ( games-misc/fortune-mod ) media-libs/freetype:2 media-libs/libpng x11-libs/pango
+dbus? ( sys-apps/dbus ) dev-libs/dbus-glib fortune? ( games-misc/fortune-mod ) media-libs/freetype:2 media-libs/libpng x11-libs/pango x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-util/pkgconfig
+dbus? ( sys-apps/dbus ) dev-libs/dbus-glib fortune? ( games-misc/fortune-mod ) media-libs/freetype:2 media-libs/libpng x11-libs/pango x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2
0
http://www.nickg.me.uk/files/xcowsay-1.3.tar.gz
diff --git a/metadata/cache/media-libs/libv4l-0.8.1 b/metadata/cache/media-libs/libv4l-0.8.1
deleted file mode 100644
index 13daba69e85d..000000000000
--- a/metadata/cache/media-libs/libv4l-0.8.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-kernel/linux-headers-2.6.30-r1
-
-0
-http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.8.1.tar.bz2
-
-http://git.linuxtv.org/v4l-utils.git
-LGPL-2.1
-Separate libraries ebuild from upstream v4l-utils package
-alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
-eutils linux-info multilib portability toolchain-funcs user versionator
-
-
-
-
-3
-
-compile install setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libv4l-0.8.3 b/metadata/cache/media-libs/libv4l-0.8.3
deleted file mode 100644
index 3c56fee2a957..000000000000
--- a/metadata/cache/media-libs/libv4l-0.8.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-kernel/linux-headers-2.6.30-r1
-
-0
-http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.8.3.tar.bz2
-
-http://git.linuxtv.org/v4l-utils.git
-LGPL-2.1
-Separate libraries ebuild from upstream v4l-utils package
-~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-eutils linux-info multilib portability toolchain-funcs user versionator
-
-
-
-
-3
-
-compile install setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libv4l-0.8.4 b/metadata/cache/media-libs/libv4l-0.8.4
deleted file mode 100644
index 07acabeea0f1..000000000000
--- a/metadata/cache/media-libs/libv4l-0.8.4
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/jpeg >=sys-kernel/linux-headers-2.6.30-r1
-virtual/jpeg
-0
-http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.8.4.tar.bz2
-
-http://git.linuxtv.org/v4l-utils.git
-LGPL-2.1
-Separate libraries ebuild from upstream v4l-utils package
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-eutils linux-info multilib portability toolchain-funcs user versionator
-
-
-
-
-4
-
-compile install setup
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libv4l-0.8.5 b/metadata/cache/media-libs/libv4l-0.8.5
index ddf40a8aab26..90c03c0b7509 100644
--- a/metadata/cache/media-libs/libv4l-0.8.5
+++ b/metadata/cache/media-libs/libv4l-0.8.5
@@ -6,7 +6,7 @@ http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.8.5.tar.bz2
http://git.linuxtv.org/v4l-utils.git
LGPL-2.1
Separate libraries ebuild from upstream v4l-utils package
-alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
eutils linux-info multilib portability toolchain-funcs user versionator
diff --git a/metadata/cache/media-libs/tiff-4.0.0 b/metadata/cache/media-libs/tiff-4.0.0
new file mode 100644
index 000000000000..cfbc6d57b6dc
--- /dev/null
+++ b/metadata/cache/media-libs/tiff-4.0.0
@@ -0,0 +1,22 @@
+jpeg? ( virtual/jpeg ) jbig? ( media-libs/jbigkit ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+jpeg? ( virtual/jpeg ) jbig? ( media-libs/jbigkit ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
+0
+http://download.osgeo.org/libtiff/tiff-4.0.0.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0.tar.gz
+
+http://www.remotesensing.org/libtiff/
+as-is
+Library for manipulation of TIFF (Tag Image File Format) images
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+libtool multilib toolchain-funcs
++cxx jbig jpeg lzma static-libs zlib
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/media-libs/tiff-4.0.0_beta7 b/metadata/cache/media-libs/tiff-4.0.0_beta7
deleted file mode 100644
index 207a178fa7bc..000000000000
--- a/metadata/cache/media-libs/tiff-4.0.0_beta7
+++ /dev/null
@@ -1,22 +0,0 @@
-jpeg? ( virtual/jpeg ) jbig? ( media-libs/jbigkit ) zlib? ( sys-libs/zlib )
-jpeg? ( virtual/jpeg ) jbig? ( media-libs/jbigkit ) zlib? ( sys-libs/zlib )
-0
-ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta7.tar.gz
-
-http://www.remotesensing.org/libtiff/
-as-is
-Library for manipulation of TIFF (Tag Image File Format) images
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-eutils libtool multilib portability toolchain-funcs user
-+cxx jbig jpeg static-libs zlib
-
-
-
-3
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/lastfmplayer-1.5.4.27091-r2 b/metadata/cache/media-sound/lastfmplayer-1.5.4.27091-r2
new file mode 100644
index 000000000000..ca1f34c08f97
--- /dev/null
+++ b/metadata/cache/media-sound/lastfmplayer-1.5.4.27091-r2
@@ -0,0 +1,22 @@
+x11-libs/qt-gui:4 x11-libs/qt-sql:4 media-libs/libsamplerate sci-libs/fftw media-libs/libmad ipod? ( >=media-libs/libgpod-0.5.2 ) media-libs/alsa-lib app-arch/sharutils
+x11-libs/qt-gui:4 x11-libs/qt-sql:4 media-libs/libsamplerate sci-libs/fftw media-libs/libmad ipod? ( >=media-libs/libgpod-0.5.2 ) media-libs/alsa-lib
+0
+http://dev.gentoo.org/~hwoarang/distfiles/lastfm-1.5.4.27091+dfsg.tar.gz http://dev.gentoo.org/~hwoarang/distfiles/lastfm_1.5.4.27091+dfsg-2.debian.tar.gz dbus? ( http://glue.umd.edu/~rossatok/dbusextension-2.0.tar.bz2 )
+
+http://www.last.fm/help/player http://www.mehercule.net/staticpages/index.php/lastfm
+GPL-2
+A player for last.fm radio streams
+~amd64 ~arm ~ppc ~x86
+base eutils multilib portability qt4-r2 toolchain-funcs user
+dbus ipod
+
+
+
+2
+
+compile configure install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/media-tv/v4l-utils-0.8.5 b/metadata/cache/media-tv/v4l-utils-0.8.5
index 024da66a058a..9ec22c03386c 100644
--- a/metadata/cache/media-tv/v4l-utils-0.8.5
+++ b/metadata/cache/media-tv/v4l-utils-0.8.5
@@ -6,7 +6,7 @@ http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.8.5.tar.bz2
http://git.linuxtv.org/v4l-utils.git
GPL-2 LGPL-2.1
Separate utilities ebuild from upstream v4l-utils package
-amd64 ~ppc x86
+amd64 ppc x86
base eutils multilib portability qt4-r2 toolchain-funcs user
qt4
diff --git a/metadata/cache/media-video/qx11grab-0.3.1 b/metadata/cache/media-video/qx11grab-0.3.1
new file mode 100644
index 000000000000..f46c76c03d7d
--- /dev/null
+++ b/metadata/cache/media-video/qx11grab-0.3.1
@@ -0,0 +1,22 @@
+>=media-libs/alsa-lib-1.0.24 >=x11-libs/libX11-1.3.4 >=x11-libs/qt-dbus-4.7.2:4 >=x11-libs/qt-gui-4.7.2:4[dbus] >=virtual/ffmpeg-0.9[X,encode] dev-util/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=media-libs/alsa-lib-1.0.24 >=x11-libs/libX11-1.3.4 >=x11-libs/qt-dbus-4.7.2:4 >=x11-libs/qt-gui-4.7.2:4[dbus] >=virtual/ffmpeg-0.9[X,encode]
+0
+ftp://ftp.hjcms.de/qx11grab/0.3.1/qx11grab-0.3.1.tar.bz2
+
+http://qx11grab.hjcms.de/
+GPL-2
+X11 desktop video grabber tray
+~amd64
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/fail2ban-0.8.6 b/metadata/cache/net-analyzer/fail2ban-0.8.6
new file mode 100644
index 000000000000..56453aa43079
--- /dev/null
+++ b/metadata/cache/net-analyzer/fail2ban-0.8.6
@@ -0,0 +1,22 @@
+selinux? ( sec-policy/selinux-fail2ban ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+net-misc/whois virtual/mta net-firewall/iptables selinux? ( sec-policy/selinux-fail2ban ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+https://github.com/fail2ban/fail2ban/tarball/0.8.6 -> fail2ban-0.8.6.tar.gz
+
+http://fail2ban.sourceforge.net/
+GPL-2
+Bans IP that make too many password failures
+~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+distutils eutils multilib portability python toolchain-funcs user
+selinux
+
+
+
+3
+
+compile install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-firewall/iptables-1.4.12.1-r1 b/metadata/cache/net-firewall/iptables-1.4.12.1-r1
index af32917da00a..3bd4bfec0b46 100644
--- a/metadata/cache/net-firewall/iptables-1.4.12.1-r1
+++ b/metadata/cache/net-firewall/iptables-1.4.12.1-r1
@@ -8,7 +8,7 @@ GPL-2
Linux kernel (2.4+) firewall, NAT and packet mangling tools
~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
autotools eutils libtool multilib portability toolchain-funcs user
-ipv6 netlink
+ipv6 netlink static-libs
diff --git a/metadata/cache/net-libs/telepathy-glib-0.16.2 b/metadata/cache/net-libs/telepathy-glib-0.16.2
deleted file mode 100644
index 9ada7f34cd10..000000000000
--- a/metadata/cache/net-libs/telepathy-glib-0.16.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) vala? ( dev-lang/vala:0.14[vapigen] >=dev-libs/gobject-introspection-0.9.6 ) dev-libs/libxslt >=dev-util/pkgconfig-0.21 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
->=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) vala? ( dev-lang/vala:0.14[vapigen] >=dev-libs/gobject-introspection-0.9.6 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.16.2.tar.gz
-
-http://telepathy.freedesktop.org
-LGPL-2.1
-GLib bindings for the Telepathy D-Bus protocol.
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-linux
-multilib python toolchain-funcs virtualx
-debug +introspection +vala test
-
-
-
-4
-
-configure install prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/net-libs/telepathy-glib-0.16.4 b/metadata/cache/net-libs/telepathy-glib-0.16.4
new file mode 100644
index 000000000000..50966b7effb5
--- /dev/null
+++ b/metadata/cache/net-libs/telepathy-glib-0.16.4
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-1.30 ) vala? ( >=dev-lang/vala-0.14.0:0.14[vapigen] >=dev-libs/gobject-introspection-1.30 ) dev-libs/libxslt >=dev-util/pkgconfig-0.21 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.28.0:2 >=dev-libs/dbus-glib-0.82 introspection? ( >=dev-libs/gobject-introspection-1.30 ) vala? ( >=dev-lang/vala-0.14.0:0.14[vapigen] >=dev-libs/gobject-introspection-1.30 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.16.4.tar.gz
+
+http://telepathy.freedesktop.org
+LGPL-2.1
+GLib bindings for the Telepathy D-Bus protocol.
+~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-linux
+multilib python toolchain-funcs virtualx
+debug +introspection +vala test
+
+
+
+4
+
+configure install prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/net-misc/wicd-1.7.1_pre20111210-r1 b/metadata/cache/net-misc/wicd-1.7.1_pre20111210-r1
new file mode 100644
index 000000000000..91e2da2a9f8a
--- /dev/null
+++ b/metadata/cache/net-misc/wicd-1.7.1_pre20111210-r1
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml]
+dev-python/dbus-python X? ( gtk? ( dev-python/pygtk || ( x11-libs/gksu kde-base/kdesu ) ) ) || ( net-misc/dhcpcd net-misc/dhcp net-misc/pump ) net-wireless/wireless-tools net-wireless/wpa_supplicant || ( sys-apps/net-tools sys-apps/ethtool ) !gtk? ( dev-python/pygobject:2 ) ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl ) libnotify? ( dev-python/notify-python ) ncurses? ( dev-python/urwid dev-python/pygobject:2 ) pm-utils? ( >=sys-power/pm-utils-1.1.1 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[ncurses?,xml]
+0
+http://dev.gentoo.org/~tomka/files/wicd-1.7.1_pre20111210.tar.gz
+
+http://wicd.sourceforge.net/
+GPL-2
+A lightweight wired and wireless network manager for Linux
+~amd64 ~ppc ~ppc64 ~x86
+distutils eutils multilib portability python systemd toolchain-funcs user
+X +gtk ioctl libnotify ncurses nls +pm-utils
+
+
+
+3
+
+compile configure install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-p2p/qbittorrent-2.9.3 b/metadata/cache/net-p2p/qbittorrent-2.9.3
new file mode 100644
index 000000000000..d77b659aa5ab
--- /dev/null
+++ b/metadata/cache/net-p2p/qbittorrent-2.9.3
@@ -0,0 +1,22 @@
+net-libs/rb_libtorrent >=x11-libs/qt-core-4.6.1:4 X? ( >=x11-libs/qt-gui-4.6.1:4 ) dbus? ( >=x11-libs/qt-dbus-4.6.1:4 ) dev-libs/boost dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+net-libs/rb_libtorrent >=x11-libs/qt-core-4.6.1:4 X? ( >=x11-libs/qt-gui-4.6.1:4 ) dbus? ( >=x11-libs/qt-dbus-4.6.1:4 ) dev-libs/boost geoip? ( dev-libs/geoip ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+mirror://sourceforge/qbittorrent/qbittorrent-2.9.3.tar.gz
+
+http://www.qbittorrent.org/
+GPL-2
+BitTorrent client in C++ and Qt
+~amd64 ~x86
+base eutils multilib portability python qt4-r2 toolchain-funcs user versionator
+dbus +X geoip
+
+
+
+2
+
+compile configure install prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/ext4magic-0.2.4 b/metadata/cache/sys-fs/ext4magic-0.2.4
new file mode 100644
index 000000000000..b23262ea0802
--- /dev/null
+++ b/metadata/cache/sys-fs/ext4magic-0.2.4
@@ -0,0 +1,22 @@
+>=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9
+>=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9
+0
+mirror://berlios/ext4magic/ext4magic-0.2.4.tar.gz
+
+http://developer.berlios.de/projects/ext4magic/
+GPL-2
+Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems
+~amd64 ~x86
+
+
+
+
+
+4
+
+-
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/gentoo-sources-3.1.6 b/metadata/cache/sys-kernel/gentoo-sources-3.1.6
index 26b86d7739be..5df4437ef648 100644
--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.6
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.1.6
@@ -6,7 +6,7 @@ binchecks strip
http://dev.gentoo.org/~mpagano/genpatches
GPL-2 !deblob? ( freedist )
Full sources including the Gentoo patchset for the 3.1 kernel tree
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
eutils kernel-2 multilib portability toolchain-funcs user versionator
deblob symlink build deblob
diff --git a/metadata/cache/sys-kernel/vanilla-sources-3.1.6 b/metadata/cache/sys-kernel/vanilla-sources-3.1.6
index 158fa9f58214..ae98005bf6e7 100644
--- a/metadata/cache/sys-kernel/vanilla-sources-3.1.6
+++ b/metadata/cache/sys-kernel/vanilla-sources-3.1.6
@@ -6,7 +6,7 @@ binchecks strip
http://www.kernel.org
GPL-2 !deblob? ( freedist )
Full sources for the Linux kernel
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
eutils kernel-2 multilib portability toolchain-funcs user versionator
deblob symlink build deblob
diff --git a/metadata/cache/www-servers/tomcat-7.0.22-r1 b/metadata/cache/www-servers/tomcat-7.0.22-r1
deleted file mode 100644
index 62bc658f827e..000000000000
--- a/metadata/cache/www-servers/tomcat-7.0.22-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=virtual/jdk-1.6 dev-java/eclipse-ecj:3.7 dev-java/ant-eclipse-ecj:3.7 >=dev-java/commons-dbcp-1.4 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.5.5 ~dev-java/tomcat-servlet-api-7.0.22 examples? ( dev-java/jakarta-jstl ) test? ( =dev-java/junit-3.8* ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
-!=virtual/jre-1.6 >=dev-java/commons-daemon-1.0.3 dev-java/ant-core dev-java/eclipse-ecj:3.7 dev-java/ant-eclipse-ecj:3.7 >=dev-java/commons-dbcp-1.4 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.5.5 ~dev-java/tomcat-servlet-api-7.0.22 examples? ( dev-java/jakarta-jstl ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
-7
-mirror://apache/tomcat/tomcat-7/v7.0.22/src/apache-tomcat-7.0.22-src.tar.gz
-
-http://tomcat.apache.org/
-Apache-2.0
-Tomcat Servlet-3.0/JSP-2.2 Container
-amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
-elibc_FreeBSD doc examples source test elibc_FreeBSD
-
-
-
-2
-
-compile configure install postinst preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/x11-terms/roxterm-2.3.4 b/metadata/cache/x11-terms/roxterm-2.3.4
new file mode 100644
index 000000000000..1465dc795820
--- /dev/null
+++ b/metadata/cache/x11-terms/roxterm-2.3.4
@@ -0,0 +1,22 @@
+dev-libs/dbus-glib >=dev-libs/glib-2.16 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.90 dev-libs/libxslt dev-util/pkgconfig dev-python/lockfile || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) nls? ( app-text/po4a sys-devel/gettext ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+dev-libs/dbus-glib >=dev-libs/glib-2.16 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.90 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+mirror://sourceforge/roxterm/roxterm-2.3.4.tar.bz2
+
+http://roxterm.sourceforge.net/
+GPL-3
+A terminal emulator designed to integrate with the ROX environment
+~amd64 ~ppc ~x86
+gnome2-utils multilib python toolchain-funcs
+nls
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e72996d8a302..6d5f19fdd6bd 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2011 09:36:44 +0000
+Fri, 30 Dec 2011 15:36:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e72996d8a302..6d5f19fdd6bd 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2011 09:36:44 +0000
+Fri, 30 Dec 2011 15:36:44 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a0e162b755da..e1d210e1a3d0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2011 09:36:46 +0000
+Fri, 30 Dec 2011 15:36:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ceab08e66c62..a6b7556c2648 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec 30 09:36:44 UTC 2011
+Fri Dec 30 15:06:51 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b22d44b2f38c..dfdcce1363b9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 30 Dec 2011 10:00:01 +0000
+Fri, 30 Dec 2011 15:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2fb740619194..c6db226a6142 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1325237701 Fri Dec 30 09:35:01 2011 UTC
+1325257501 Fri Dec 30 15:05:01 2011 UTC
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 422965146352..3f8993520b20 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1 +1,2 @@
DIST fail2ban-0.8.4.tar.bz2 71818 RMD160 05a9dfd206f734bea9d063a2527695c1b033ea43 SHA1 0816a9f8d54013dc9b395284caff3c54f44377d8 SHA256 7a4fc0ea6dffde1db1d096757878e1b2c5f0b087a05ed7e7ca0202fb0b127982
+DIST fail2ban-0.8.6.tar.gz 107029 RMD160 70678ca46849a462367603fb3d0e2c6c2f3b75cf SHA1 f05df2ac989aec47cc40830aafcd6c945ec575ea SHA256 24d02422c55f1b7d92bea30a7dde6f72f280eadf09d478fcca8b1dd40fb4e914
diff --git a/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild b/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild
new file mode 100644
index 000000000000..d46de6b1033c
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.8.6.ebuild,v 1.1 2011/12/30 10:18:51 hwoarang Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+DESCRIPTION="Bans IP that make too many password failures"
+HOMEPAGE="http://fail2ban.sourceforge.net/"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="selinux"
+
+DEPEND="selinux? ( sec-policy/selinux-fail2ban )"
+RDEPEND="net-misc/whois
+ virtual/mta
+ net-firewall/iptables
+ selinux? ( sec-policy/selinux-fail2ban )"
+
+S="${WORKDIR}"/${PN}-${PN}-a20d1f8
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sshd-breakin.patch
+ distutils_src_prepare
+}
+
+src_install() {
+ distutils_src_install
+
+ newconfd files/gentoo-confd fail2ban || die
+ newinitd files/gentoo-initd fail2ban || die
+ dodoc ChangeLog README TODO || die "dodoc failed"
+ doman man/*.1 || die "doman failed"
+
+ # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+ # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}-logrotate ${PN} || die
+}
+
+pkg_preinst() {
+ has_version "<${CATEGORY}/${PN}-0.7"
+ previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ if [[ $previous_less_than_0_7 = 0 ]] ; then
+ elog
+ elog "Configuration files are now in /etc/fail2ban/"
+ elog "You probably have to manually update your configuration"
+ elog "files before restarting Fail2ban!"
+ elog
+ elog "Fail2ban is not installed under /usr/lib anymore. The"
+ elog "new location is under /usr/share."
+ elog
+ elog "You are upgrading from version 0.6.x, please see:"
+ elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+ fi
+}
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch b/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch
new file mode 100644
index 000000000000..508b2d41d33f
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-0.8.6-sshd-breakin.patch
@@ -0,0 +1,15 @@
+Index: fail2ban-fail2ban-a20d1f8/config/filter.d/sshd.conf
+===================================================================
+--- fail2ban-fail2ban-a20d1f8.orig/config/filter.d/sshd.conf
++++ fail2ban-fail2ban-a20d1f8/config/filter.d/sshd.conf
+@@ -31,8 +31,8 @@ failregex = ^%(__prefix_line)s(?:error:
+ ^%(__prefix_line)sUser .+ from not allowed because not listed in AllowUsers$
+ ^%(__prefix_line)sauthentication failure; logname=\S* uid=\S* euid=\S* tty=\S* ruser=\S* rhost=(?:\s+user=.*)?\s*$
+ ^%(__prefix_line)srefused connect from \S+ \(\)\s*$
+- ^%(__prefix_line)sAddress .* POSSIBLE BREAK-IN ATTEMPT!*\s*$
+- ^%(__prefix_line)sUser .+ from not allowed because none of user's groups are listed in AllowGroups\s*$
++ ^%(__prefix_line)sreverse mapping checking getaddrinfo for .* \[\] .* POSSIBLE BREAK-IN ATTEMPT!*\s*$
++ ^%(__prefix_line)sUser \S+ from not allowed because none of user's groups are listed in AllowGroups\s*$
+
+ # Option: ignoreregex
+ # Notes.: regex to ignore. If this regex matches, the line is ignored.
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
index b14b5fe74b31..b77e792bbd30 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.1 2009/10/05 15:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
depend() {
need net
@@ -11,7 +11,7 @@ depend() {
start() {
ebegin "Starting Zabbix agent"
- start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+ start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_agentd
eend $?
}
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
index 8ac246eccdb1..912a013baf79 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.1 2009/10/06 16:24:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
depend() {
need net
@@ -10,7 +10,7 @@ depend() {
start() {
ebegin "Starting Zabbix proxy"
- start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
+ start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_proxy
eend $?
}
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
index a661cd233d25..fccab4a1ecd3 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.1 2009/10/05 15:55:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $
depend() {
need net
@@ -10,7 +10,7 @@ depend() {
start() {
ebegin "Starting Zabbix server"
- start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+ start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_server
eend $?
}
diff --git a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
index 3dca4d624dd9..47ee0204c523 100644
--- a/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.1 2011/09/19 07:45:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.2 2011/12/30 12:01:22 scarabeus Exp $
EAPI="4"
@@ -16,23 +16,20 @@ SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink"
+IUSE="ipv6 netlink static-libs"
-COMMON_DEPEND="
+RDEPEND="
netlink? ( net-libs/libnfnetlink )
"
-DEPEND="
- ${COMMON_DEPEND}
+DEPEND="${RDEPEND}
virtual/os-headers
sys-devel/automake
"
-RDEPEND="
- ${COMMON_DEPEND}
-"
src_prepare() {
- epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch"
- epatch "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
+ epatch \
+ "${FILESDIR}/iptables-1.4.12.1-lm.patch" \
+ "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
eautomake
# Only run autotools if user patched something
@@ -49,7 +46,7 @@ src_configure() {
--enable-devel \
--enable-libipq \
--enable-shared \
- --enable-static \
+ $(use-enable static-libs static) \
$(use_enable ipv6)
}
@@ -58,7 +55,7 @@ src_compile() {
}
src_install() {
- emake install DESTDIR="${D}"
+ default
dodoc INCOMPATIBILITIES iptables/iptables.xslt
# all the iptables binaries are in /sbin, so might as well
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 396d1ac060e9..080da37e96f8 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,3 +1,3 @@
DIST telepathy-glib-0.14.10.tar.gz 2957204 RMD160 a765561504b65209a7d423aedf106f3052609696 SHA1 9cf971bbae947807472c02e09c3b2cfde033cc2b SHA256 ff9e733f7465d3e311ec7066e06f028905aa2fe653db1737739a07b14b95b20b
-DIST telepathy-glib-0.16.2.tar.gz 3073210 RMD160 b62da8a74637b33eb90d051e39e9d947e3f3926c SHA1 72302310dcd5e544d3bbe8dcf51f149db16431d4 SHA256 1bd788850a0b0a5af204e97196750057a445ecd13818d33c5e804dc600c848ea
DIST telepathy-glib-0.16.3.tar.gz 3111322 RMD160 fcf02a3edcd39eb8285a35344836efece00d5923 SHA1 931682b71380f029f2e60e496490e814a815fda5 SHA256 302297a7ccfb0b604ff56680cff1c13f667b092b5241c47062289a10dee708aa
+DIST telepathy-glib-0.16.4.tar.gz 3111557 RMD160 d19d6127bb70f4883500c3e27b136e9473802b62 SHA1 c91c0c7c27bb505b0f8b0e63f2ed57579e8d7c9b SHA256 a857425147a03eb27db31941dd4b9a04205fc3ef285fcbc6d138934c1aba3c05
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.16.2.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.16.4.ebuild
similarity index 83%
rename from net-libs/telepathy-glib/telepathy-glib-0.16.2.ebuild
rename to net-libs/telepathy-glib/telepathy-glib-0.16.4.ebuild
index f61c4e2320c5..5215e299ead4 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.16.2.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.16.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.16.2.ebuild,v 1.1 2011/11/20 13:15:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.16.4.ebuild,v 1.1 2011/12/30 11:27:17 pacho Exp $
EAPI="4"
PYTHON_DEPEND="2:2.5"
@@ -18,10 +18,10 @@ IUSE="debug +introspection +vala"
RDEPEND=">=dev-libs/glib-2.28.0:2
>=dev-libs/dbus-glib-0.82
- introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )
vala? (
- dev-lang/vala:0.14[vapigen]
- >=dev-libs/gobject-introspection-0.9.6 )"
+ >=dev-lang/vala-0.14.0:0.14[vapigen]
+ >=dev-libs/gobject-introspection-1.30 )"
DEPEND="${RDEPEND}
dev-libs/libxslt
>=dev-util/pkgconfig-0.21"
@@ -53,12 +53,12 @@ src_configure() {
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
# Needs dbus for tests (auto-launched)
- Xemake -j1 check || die
+ Xemake -j1 check
}
src_install() {
emake install DESTDIR="${D}"
dodoc AUTHORS ChangeLog NEWS README
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
+ find "${D}" -name '*.la' -exec rm -f '{}' +
}
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 4a6e8f8de012..ebe064bd7412 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1 +1 @@
-DIST ICAClient-12.0.0-0.i386.rpm 3638518 RMD160 d5c28b0239ebbd4f64e326d016a93f13d4a7bd0c SHA1 2e6204f3624144b9e90dc93423ba80aa9bf3338d SHA256 b574190d06d488d9278d53a8e9dc5b3d1e4d9a4a8909d019bd3763dc215f1702
+DIST ICAClient-12.0.0-0.i386.rpm 3665324 RMD160 d251ee3def5a92730bebb23f07d40bf84cf04ae2 SHA1 d7a10f3266207ced9e2f9cddb9faec2ed13558c4 SHA256 9fa303995fb7ef57cc2954cba226b83504199e5610b65ef6a29edecd2f229e3c
diff --git a/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild b/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild
new file mode 100644
index 000000000000..1291dc4e0296
--- /dev/null
+++ b/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.10_alpha-r1.ebuild,v 1.1 2011/12/30 15:29:06 blueness Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic versionator
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/"
+SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
+
+DEPEND="dev-libs/openssl
+ >=dev-libs/libevent-2.0.14
+ nat-pmp? ( net-libs/libnatpmp )
+ upnp? ( net-libs/miniupnpc )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewgroup tor
+ enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/torrc.sample.patch
+}
+
+src_configure() {
+ # Upstream isn't sure of all the user provided CFLAGS that
+ # will break tor, but does recommend against -fstrict-aliasing.
+ # We'll filter-flags them here as we encounter them.
+ filter-flags -fstrict-aliasing
+ econf --docdir=/usr/share/doc/${PF} \
+ $(use_enable bufferevents) \
+ $(use_enable doc asciidoc) \
+ $(use_enable nat-pmp) \
+ $(use_enable tor-hardening gcc-hardening) \
+ $(use_enable tor-hardening linker-hardening) \
+ $(use_enable transparent-proxy transparent) \
+ $(use_enable threads) \
+ $(use_enable upnp)
+}
+
+src_install() {
+ newconfd "${FILESDIR}"/tor.confd tor
+ newinitd "${FILESDIR}"/tor.initd-r6 tor
+ emake DESTDIR="${D}" install
+ keepdir /var/lib/tor
+
+ dodoc README ChangeLog ReleaseNotes \
+ doc/{HACKING,TODO} \
+ doc/spec/README
+
+ fperms 750 /var/lib/tor
+ fowners tor:tor /var/lib/tor
+
+ insinto /etc/tor/
+ newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+ elog
+ elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
+ elog "change it according to your needs. Use the torrc.sample that is in"
+ elog "that directory as a guide. Also, to have privoxy work with tor"
+ elog "just add the following line"
+ elog
+ elog "forward-socks4a / localhost:9050 ."
+ elog
+ elog "to /etc/privoxy/config. Notice the . at the end!"
+ elog
+}
diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch
new file mode 100644
index 000000000000..987113b8645b
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch
@@ -0,0 +1,13 @@
+=== modified file 'wicd/configmanager.py'
+--- wicd/configmanager.py 2011-12-08 17:56:03 +0000
++++ wicd/configmanager.py 2011-12-11 19:41:57 +0000
+@@ -37,7 +37,7 @@
+ conf = open(path)
+ newconf = ''
+ for line in conf:
+- if '[' not in line or '=' not in line:
++ if '[' in line or '=' in line:
+ newconf += line
+ conf.close()
+ conf = open(path, 'w')
+
diff --git a/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild b/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild
new file mode 100644
index 000000000000..53e8f5143dec
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_pre20111210-r1.ebuild,v 1.2 2011/12/30 09:43:31 tomka Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils systemd
+
+MY_PV="${PN}-1.7.1"
+S="${WORKDIR}/${MY_PV}"
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
+
+DEPEND=""
+# Maybe virtual/dhcp would work, but there are enough problems with
+# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
+# first if none are installed.
+RDEPEND="
+ dev-python/dbus-python
+ X? ( gtk? ( dev-python/pygtk
+ || (
+ x11-libs/gksu
+ kde-base/kdesu
+ )
+ )
+ )
+ || (
+ net-misc/dhcpcd
+ net-misc/dhcp
+ net-misc/pump
+ )
+ net-wireless/wireless-tools
+ net-wireless/wpa_supplicant
+ || (
+ sys-apps/net-tools
+ sys-apps/ethtool
+ )
+ !gtk? ( dev-python/pygobject:2 )
+ ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+ libnotify? ( dev-python/notify-python )
+ ncurses? (
+ dev-python/urwid
+ dev-python/pygobject:2
+ )
+ pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+ "
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+ epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+ # Fix bug 394309
+ epatch "${FILESDIR}"/${P}-fix-config-reading.patch
+ # Add a template for hex psk's and wpa (Bug 306423)
+ epatch "${FILESDIR}"/${P}-wpa-psk-hex-template.patch
+ # get rid of opts variable to fix bug 381885
+ sed -i "/opts/d" "in/init=gentoo=wicd.in"
+ # Need to ensure that generated scripts use Python 2 at run time.
+ sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+ -i setup.py || die "sed failed"
+ python_copy_sources
+}
+
+src_configure() {
+ local myconf
+ use gtk || myconf="${myconf} --no-install-gtk"
+ use libnotify || myconf="${myconf} --no-use-notifications"
+ use ncurses || myconf="${myconf} --no-install-ncurses"
+ use pm-utils || myconf="${myconf} --no-install-pmutils"
+ configuration() {
+ $(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+ }
+ python_execute_function -s configuration
+}
+
+src_install() {
+ distutils_src_install
+ keepdir /var/lib/wicd/configurations \
+ || die "keepdir failed, critical for this app"
+ keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+ || die "keepdir failed, critical for this app"
+ keepdir /var/log/wicd \
+ || die "keepdir failed, critical for this app"
+ use nls || rm -rf "${D}"/usr/share/locale
+ systemd_dounit "${S}/other/wicd.service"
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ elog "You may need to restart the dbus service after upgrading wicd."
+ echo
+ elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:"
+ elog "- Remove all net.* initscripts (except for net.lo) from all runlevels"
+ elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
+ elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+ # Maintainer's note: the consolekit use flag short circuits a dbus rule and
+ # allows the connection. Else, you need to be in the group.
+ if ! has_version sys-auth/pambase[consolekit]; then
+ ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
+ ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+ fi
+}
diff --git a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
index 6f6e1d1a6fc0..71504de86da9 100644
--- a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild,v 1.3 2011/12/11 10:21:18 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild,v 1.4 2011/12/30 09:42:08 tomka Exp $
EAPI=3
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PV}"
DESCRIPTION="A lightweight wired and wireless network manager for Linux"
HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~tomka/files/${PF}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 35ea90f991e9..854922372d38 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -3,3 +3,4 @@ DIST qbittorrent-2.8.3.tar.gz 3314700 RMD160 2b3dca3bb00beef1380356b1108acb28226
DIST qbittorrent-2.8.4.tar.gz 3315634 RMD160 ee417af443047031dd977568bdbe95db4535aff3 SHA1 ffcbd90c7ca3f8611f698c0bb30af1a43eba9c87 SHA256 5b76ed8cea6a78a9c940f3a0d0f21a1bbfa1cef3a4f30c9ea8489f4a7d57d154
DIST qbittorrent-2.8.5.tar.gz 3341573 RMD160 edd35ff256f318ab25e73b3fed4674edd6b9eb0e SHA1 e3dea6fc3a12ffcac575d5b02d10cf209a34c6f8 SHA256 9b09ddafff7a372fd4aacf7f323f4892d16db23ef51867660e7a2a2dfcc6028c
DIST qbittorrent-2.9.2.tar.gz 3395977 RMD160 033bde8152d9b0750952acfa0beace9be30751d7 SHA1 51a37f3fa17f6f9d2434de43efaa9e87a23d0fc0 SHA256 06197c502c60cfc62ab9bf9d443fe771d74e21ccbab5576ab4629fc0c2d70984
+DIST qbittorrent-2.9.3.tar.gz 3468464 RMD160 424599ff261c5dc2304461c2e10d313aff8c91ea SHA1 b17d06a4e6a5b733f6fdd9658c78199bc6eab77b SHA256 5d82acaae622f1376a563e94afa31e1a475b64d5f1828e5b11b18b0bd4f4e0b3
diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild
new file mode 100644
index 000000000000..36329a03288d
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild,v 1.1 2011/12/30 10:53:31 hwoarang Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python qt4-r2 versionator
+
+MY_P="${P/_/}"
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="http://www.qbittorrent.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus +X geoip"
+
+QT_MIN="4.6.1"
+# boost version so that we always have thread support
+CDEPEND="net-libs/rb_libtorrent
+ >=x11-libs/qt-core-${QT_MIN}:4
+ X? ( >=x11-libs/qt-gui-${QT_MIN}:4 )
+ dbus? ( >=x11-libs/qt-dbus-${QT_MIN}:4 )
+ dev-libs/boost"
+DEPEND="${CDEPEND}
+ dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+ geoip? ( dev-libs/geoip )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # Respect LDFLAGS
+ sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
+ qt4-r2_src_prepare
+}
+
+src_configure() {
+ local myconf
+ use X || myconf+=" --disable-gui"
+ use geoip || myconf+=" --disable-geoip-database"
+ use dbus || myconf+=" --disable-qt-dbus"
+
+ # slotted boost detection, bug #309415
+ BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
+ BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+ BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+ myconf+=" --with-libboost-inc=/usr/include/boost-${BOOST_VER}"
+
+ # econf fails, since this uses qconf
+ ./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
+ eqmake4
+}
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 854cb3f81a24..2c9aef27e6d5 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -4,6 +4,10 @@
# Unmask arm arch specific flags
-iwmmxt
+# Hans de Graaff (30 Dec 2010)
+# Mask ruby19 until bug 332593 is fully fixed.
+ruby_targets_ruby19
+
# Markus Meier (22 Aug 2010)
# net-wireless/wimax not tested
wimax
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index 6bc629e0ba89..4e4ac40364bb 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,8 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.28 2011/12/01 22:50:18 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.29 2011/12/30 14:52:19 grobian Exp $
+# Fabian Groffen (30 Dec 2011)
+# Does not support Darwin, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
+
# Fabian Groffen (11 May 2011)
# Uses the horribly broken build-system waf. When hacked far enough,
# produces a MH_OBJ with invalid install_name called _cairo.bundle.
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
index e42a9df58aba..13bdb6e6ee44 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
@@ -1,4 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc/package.mask,v 1.4 2011/08/11 06:41:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc/package.mask,v 1.5 2011/12/30 14:52:19 grobian Exp $
+
+# Fabian Groffen (30 Dec 2011)
+# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
index 21670f21f888..3e3fc3e89e03 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
@@ -1,4 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask,v 1.4 2011/08/11 06:41:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask,v 1.5 2011/12/30 14:52:19 grobian Exp $
+
+# Fabian Groffen (30 Dec 2011)
+# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/package.mask b/profiles/prefix/sunos/solaris/5.11/sparc/package.mask
new file mode 100644
index 000000000000..3bd2067ebd1e
--- /dev/null
+++ b/profiles/prefix/sunos/solaris/5.11/sparc/package.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc/package.mask,v 1.1 2011/12/30 14:52:19 grobian Exp $
+
+
+# Fabian Groffen (30 Dec 2011)
+# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
index 846bcb79eed1..f23253cb1d7d 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
@@ -1,3 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask,v 1.2 2010/04/18 15:48:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask,v 1.3 2011/12/30 14:52:19 grobian Exp $
+
+
+# Fabian Groffen (30 Dec 2011)
+# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
index 7501594825fe..dd9e2907e734 100644
--- a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
+++ b/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc/package.mask,v 1.1 2009/06/06 03:55:05 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc/package.mask,v 1.2 2011/12/30 14:52:19 grobian Exp $
+
+
+# Fabian Groffen (30 Dec 2011)
+# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
# Jeremy Olexa (26 Aug 2008)
# Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask
index 6246813319b4..9d51c54e1395 100644
--- a/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask,v 1.3 2010/04/18 15:48:56 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask,v 1.4 2011/12/30 14:52:19 grobian Exp $
+
+
+# Fabian Groffen (30 Dec 2011)
+# Does not support Solaris/SPARC, http://mj.ucw.cz/pciutils.html
+sys-apps/pciutils
# Jeremy Olexa (26 Aug 2008)
# Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e5a1408adeb6..5d1106677dfe 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -275,7 +275,7 @@ app-doc/tldp-howto:html - Install the docs in multipage HTML format (default)
app-doc/tldp-howto:htmlsingle - Install the docs in single page HTML format
app-doc/tldp-howto:pdf - Install the docs in pdf format
app-doc/tldp-howto:text - Install the docs in plain text format
-app-editors/bluefish:gucharmap - Enable gucharmap dictionary plugin
+app-editors/bluefish:gtk3 - Enable gtk3 frontend instead of gtk2 one
app-editors/cssed:plugins - Install plugin development files
app-editors/emacs:athena - Enable the MIT Athena widget set (x11-libs/libXaw)
app-editors/emacs:gconf - Use gnome-base/gconf to read the system font name
diff --git a/sys-fs/ext4magic/Manifest b/sys-fs/ext4magic/Manifest
new file mode 100644
index 000000000000..dd986e88dc39
--- /dev/null
+++ b/sys-fs/ext4magic/Manifest
@@ -0,0 +1 @@
+DIST ext4magic-0.2.4.tar.gz 370823 RMD160 d435d219680b40366e62b84b1dc60146c754ec2b SHA1 11028b42e5145ffbd17e4ee8a853321d3975b943 SHA256 95769de907ecdb8aa674363e8ddb8500161c8d6eaa522740a376f61bb252bdda
diff --git a/sys-fs/ext4magic/ext4magic-0.2.4.ebuild b/sys-fs/ext4magic/ext4magic-0.2.4.ebuild
new file mode 100644
index 000000000000..361f62df639e
--- /dev/null
+++ b/sys-fs/ext4magic/ext4magic-0.2.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext4magic/ext4magic-0.2.4.ebuild,v 1.1 2011/12/30 12:40:33 ssuominen Exp $
+
+EAPI=4
+
+DESCRIPTION="Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems"
+HOMEPAGE="http://developer.berlios.de/projects/ext4magic/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/file-5.04
+ sys-apps/util-linux
+ >=sys-fs/e2fsprogs-1.41.9"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
new file mode 100644
index 000000000000..c2d865517c00
--- /dev/null
+++ b/sys-fs/ext4magic/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ ssuominen@gentoo.org
+ Samuli Suominen
+
+
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild
index c7d85265d8b3..df71f7776645 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild,v 1.1 2011/12/28 16:00:55 psomas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.6.ebuild,v 1.2 2011/12/30 09:51:27 hwoarang Exp $
EAPI="2"
ETYPE="sources"
@@ -11,7 +11,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
IUSE="deblob"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.1.6.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.1.6.ebuild
index e51c5b16f38b..6f86fc16e380 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.1.6.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.1.6.ebuild,v 1.1 2011/12/22 10:02:28 psomas Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.1.6.ebuild,v 1.2 2011/12/30 09:53:18 hwoarang Exp $
EAPI="2"
K_NOUSENAME="yes"
@@ -15,5 +15,5 @@ DESCRIPTION="Full sources for the Linux kernel"
HOMEPAGE="http://www.kernel.org"
SRC_URI="${KERNEL_URI}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="deblob"
diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild
index efc4015ca101..bf755b682882 100644
--- a/sys-libs/glibc/glibc-2.13-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.8 2011/12/11 17:27:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.9 2011/12/30 15:06:47 halcy0n Exp $
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
RESTRICT="strip" # strip ourself #46186
EMULTILIB_PKG="true"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 2cee6d894644..a0a7551b0dac 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,4 @@
DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
DIST apache-tomcat-6.0.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
-DIST apache-tomcat-7.0.22-src.tar.gz 4044650 RMD160 e49636d4555f92a4f56a46aee7fcdec3ede5b1f1 SHA1 588512b2149850b3e6de1ac20c79b54aea074eff SHA256 e907cc65ec38cf9e01995432cc7925c18d03cdbc0dd6baa8f82df2bae83c8486
DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
diff --git a/www-servers/tomcat/files/7/7.0.22-build-xml.patch b/www-servers/tomcat/files/7/7.0.22-build-xml.patch
deleted file mode 100644
index 9a7825c502f7..000000000000
--- a/www-servers/tomcat/files/7/7.0.22-build-xml.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- build.xml.orig 2011-03-05 14:11:01.000000000 +0100
-+++ build.xml 2011-03-08 17:39:53.752257789 +0100
-@@ -147,6 +147,7 @@
-
-
-
-+
-
-
-
-@@ -291,6 +292,7 @@
-
-
-
-+
-
-
-
-@@ -420,7 +422,7 @@
-
-
-
--
-+
-
-
-
-@@ -464,7 +466,7 @@
-
-
-
--
-+
-
-
-
-
--
-+
-+ JSP 2.2 Implementation JAR File
-
-
--
-+ JSP 2.2 EL Implementation JAR File
-
--
-+-->
-
-
-
--
-+
-
-
-
-@@ -745,14 +747,14 @@
-
-
--
-+
-
-
-
-@@ -809,7 +811,7 @@
- source="${compile.source}"
- target="${compile.target}"
- optimize="${compile.optimize}"
-- classpath="${tomcat.classes}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1"
- includeantruntime="false">
-@@ -821,7 +823,7 @@
- source="${compile.source}"
- target="${compile.target}"
- optimize="${compile.optimize}"
-- classpath="$tomcat.lcasses}"
-+ classpath="${tomcat.classes}:${jsp-api.jar}"
- excludes="**/CVS/**,**/.svn/**"
- encoding="ISO-8859-1"
- includeantruntime="false">
-@@ -829,11 +831,11 @@
-
-
-
--
-+
-
-
-
-@@ -1008,7 +1010,7 @@
-
-
-
--
-+
-
-
- =dev-java/commons-dbcp-1.4
- >=dev-java/commons-logging-1.1
- >=dev-java/commons-pool-1.5.5
- ~dev-java/tomcat-servlet-api-${PV}
- examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
- !=virtual/jre-1.6
- >=dev-java/commons-daemon-1.0.3
- dev-java/ant-core
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEPEND}
- test? ( =dev-java/junit-3.8* )"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
-# Find out why so
-JAVA_ANT_CELEMENT_REWRITER="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_NEEDS_TOOLS="true"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
--Dant.jar=ant.jar"
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
- rm -v webapps/examples/WEB-INF/lib/*.jar \
- test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
- # bug # 178980 and #312293
- use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
- if ! use doc; then
- EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
- fi
-
- EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)"
- java-pkg_jarfrom --build-only ant-core ant.jar
-}
-
-src_install() {
- cd "${S}/bin"
- rm -f *.bat
- chmod 755 *.sh
-
- # register jars per bug #171496
- cd "${S}/output/build/lib/"
- for jar in *.jar; do
- java-pkg_dojar ${jar}
- done
-
- local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
- # init.d, conf.d
- newinitd "${FILESDIR}"/${SLOT}/tomcat.init ${TOMCAT_NAME}
- newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
- # create dir structure
- dodir /usr/share/${TOMCAT_NAME}
-
- diropts -m750 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}
- keepdir ${WEBAPPS_DIR}
-
- diropts -m755 -o tomcat -g tomcat
- dodir ${CATALINA_BASE}
-
- diropts -m775 -o tomcat -g tomcat
- dodir /etc/${TOMCAT_NAME}/Catalina/localhost
- keepdir /var/log/${TOMCAT_NAME}/
- keepdir /var/run/${TOMCAT_NAME}/
- keepdir /var/tmp/${TOMCAT_NAME}/
-
- cd "${S}"
- # fix context's so webapps will be deployed
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager" a:' "${S}"/webapps/host-manager/META-INF/context.xml
- sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager" a:' "${S}"/webapps/manager/META-INF/context.xml
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
- # copy over the directories
- chown -R tomcat:tomcat webapps/* conf/*
- cp -pR conf/* "${D}"/etc/${TOMCAT_NAME} || die "failed to copy conf"
- cp -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
- || die "failed to copy"
- # webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
- cd "${S}"/webapps || die
- ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
-
- dodir /usr/share/${TOMCAT_NAME}/webapps
- cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- if use doc; then
- cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
- if use examples; then
- cd "${S}"/webapps/examples/WEB-INF/lib
- java-pkg_jar-from jakarta-jstl jstl.jar
- java-pkg_jar-from jakarta-jstl standard.jar
- cd "${S}"/webapps
- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
- fi
-
- # replace catalina.policy with gentoo specific one bug #176701
-# cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
-# || die "failed to replace catalina.policy"
-
- cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
- java-pkg_jar-from eclipse-ecj-${ECJV}
- java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
- # symlink the directories to make CATALINA_BASE possible
- dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
- dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
- dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
- dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
- dodoc "${S}"/{RELEASE-NOTES,RUNNING.txt}
- fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-
- #install *.sh scripts bug #278059
- exeinto /usr/share/${TOMCAT_NAME}/bin
- doexe "${S}"/bin/*.sh
-}
-
-pkg_postinst() {
- ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
- # temp fix for bug #176097
- chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
- ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
-
- # bug #180519
- if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
- elog "The latest webapp has NOT been installed into"
- elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
- elog "and we do not want to overwrite any files you have put there."
- elog
- elog "Installing latest webapp into"
- elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
- elog
- elog "Manager Symbolic Links NOT created."
-
- else
- einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
- cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
- "${ROOT}""${WEBAPPS_DIR}"
- # link the manager's context to the right position
- dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
- dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
- fi
-
- elog
- elog " This ebuild implements a FHS compliant layout for tomcat"
- elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
- elog " for more information."
- elog
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
- elog
-
- ewarn "The manager webapps have known exploits, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
-
- if use examples ; then
- ewarn
- ewarn "The examples webapp has a known exploit, please refer to"
- ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
- ewarn
- fi
-
- elog
- elog " Please report any bugs to http://bugs.gentoo.org/"
- elog
-}
diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index 313e5ea3e17f..ce9214d06a77 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,2 +1,3 @@
DIST roxterm-2.2.2.tar.gz 931976 RMD160 32ac587952bb111db2524e1c5dc5849c54c0af22 SHA1 e51f24e045fb7ecc38ea0f17b06ed2de3aec92cf SHA256 3c01daa2ee3c0e652653804ca6466a9d18cabe481660b759148e7d7ffadb4a94
DIST roxterm-2.3.1.tar.bz2 782113 RMD160 167ca134f3413a235f57b0e16ed71b7a0c7a7618 SHA1 bde6b15b8dd322c41dc0370d55e2a9c67d991742 SHA256 6b8b76d6b9bb3beb2364157376e6145efd8892cd81df6a12b727e189e94ce12b
+DIST roxterm-2.3.4.tar.bz2 770810 RMD160 92026e380a9100c73c920673e31b5411efb995f2 SHA1 0a1df0d6a9ef85622bf550cfeccfdb72af4feaad SHA256 3b062021705badf7efd584a6ad13d88bf6cf19e4f41ae98f63422cb35f6d4bc3
diff --git a/x11-terms/roxterm/roxterm-2.3.4.ebuild b/x11-terms/roxterm/roxterm-2.3.4.ebuild
new file mode 100644
index 000000000000..3e2064dac118
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-2.3.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-2.3.4.ebuild,v 1.1 2011/12/30 13:57:20 ssuominen Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+inherit gnome2-utils python
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="http://roxterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="dev-libs/dbus-glib
+ >=dev-libs/glib-2.16
+ x11-libs/gtk+:3
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ dev-util/pkgconfig
+ dev-python/lockfile
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ nls? ( app-text/po4a sys-devel/gettext )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_convert_shebangs 2 mscript.py
+
+ # build system is crap
+ sed -i -e 's:TerminalEmulator:System;&:' roxterm.desktop || die
+ sed -i -e '/ctx.install_doc/s:COPYING ::' mscript.py || die
+ sed -i -e "/CFLAGS/s:-O2 -g:${CFLAGS}:" {maitch,mscript}.py || die
+ sed -i \
+ -e "/LDFLAGS/s:'':'${LDFLAGS}':" \
+ -e 's:--mode=link:--mode=link --tag=CC:' \
+ maitch.py || die
+}
+
+src_configure() {
+ local myconf=( --prefix=/usr --docdir=/usr/share/doc/${PF} --destdir="${D}" )
+ use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
+ ./mscript.py configure "${myconf[@]}"
+}
+
+src_compile() { ./mscript.py build; }
+src_install() { ./mscript.py install; }
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }