diff --git a/app-misc/pfm/Manifest b/app-misc/pfm/Manifest
new file mode 100644
index 000000000000..975e62ee3a5a
--- /dev/null
+++ b/app-misc/pfm/Manifest
@@ -0,0 +1 @@
+DIST pfm-2.12.0.tar.gz 873382 RMD160 7be1f7e046aaaaa23655403aa6c13b544472192b SHA1 6b7192f821a1157516b9049611cf677b866e0c57 SHA256 a7e912dea813d5f8b42aef49f483e4c8a2f4f86e87d1035bb46bcfe789ccfab4
diff --git a/app-misc/pfm/metadata.xml b/app-misc/pfm/metadata.xml
new file mode 100644
index 000000000000..efa5eb0078f3
--- /dev/null
+++ b/app-misc/pfm/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ radhermit@gentoo.org
+ Tim Harder
+
+
diff --git a/app-misc/pfm/pfm-2.12.0.ebuild b/app-misc/pfm/pfm-2.12.0.ebuild
new file mode 100644
index 000000000000..f8ae1ddf9ff7
--- /dev/null
+++ b/app-misc/pfm/pfm-2.12.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pfm/pfm-2.12.0.ebuild,v 1.1 2011/11/18 09:28:25 radhermit Exp $
+
+EAPI="4"
+
+inherit perl-app
+
+DESCRIPTION="A terminal-based file manager written in Perl"
+HOMEPAGE="http://p-f-m.sourceforge.net/"
+SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8
+ >=dev-perl/File-Stat-Bits-1.10.0
+ >=dev-perl/HTML-Parser-3.59
+ >=dev-perl/libwww-perl-5.827
+ >=dev-perl/Term-ReadLine-Gnu-1.09
+ >=dev-perl/Term-Screen-1.30.0
+ >=dev-perl/Term-ScreenColor-1.130.0
+ sys-libs/ncurses
+ sys-libs/readline
+ >=virtual/perl-File-Temp-0.22
+ >=virtual/perl-Module-Load-0.16"
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 7ed6c0822291..cd90e6605595 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,3 +1 @@
-DIST llpp-0_p20110504.tar.bz2 25459 RMD160 579dbf029088e70bd8040c1266c87e9b8b8ec316 SHA1 82567ad727ac84f5c3a3b383e210cd0488ea8b2f SHA256 6ce2c2f2a70143fbfb8434e9ca48288a87e6cc32f445c35af78b193106e7fa70
-DIST llpp-5.tar.gz 28895 RMD160 9db80e88755879ab8a962e3fd74ca34418aeed69 SHA1 710f5f4972f4e36e31512ea024ae2df3b082199d SHA256 05997619d219b62ecdf7941fd3f2ad609c2603b19c56170e2d932e0031926b6b
DIST llpp-7.tar.gz 46931 RMD160 8887de279c19f33c6e4390a1a793f0c3f00f993b SHA1 512675c5865667cbf7430f050e7e62dd11dc74f7 SHA256 b359380afda9deaec85353e3ca0b603f2c512956b9f7f70970847aec2dfd5a5a
diff --git a/app-text/llpp/llpp-0_p20110504.ebuild b/app-text/llpp/llpp-0_p20110504.ebuild
deleted file mode 100644
index 13d096fc0375..000000000000
--- a/app-text/llpp/llpp-0_p20110504.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-0_p20110504.ebuild,v 1.3 2011/08/24 19:08:01 maekke Exp $
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-text/mupdf-0.8.165
- dev-ml/lablgl[glut]
- media-libs/jbig2dec
- media-libs/openjpeg
- x11-misc/xsel"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- ocamlopt -c -o link.o -ccopt -O link.c || die
- ocamlopt -c -o main.cmo -I +lablGL main.ml || die
-
- ocamlopt -o llpp \
- -I +lablGL str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
- -cclib "-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lpthread" \
- main.cmx || die
-}
-
-src_install() {
- dobin ${PN} || die
- dodoc KEYS Thanks fixme || die
-}
diff --git a/app-text/llpp/llpp-5.ebuild b/app-text/llpp/llpp-5.ebuild
deleted file mode 100644
index 6db59d07db23..000000000000
--- a/app-text/llpp/llpp-5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-5.ebuild,v 1.1 2011/08/09 03:25:08 xmw Exp $
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-# http://repo.or.cz/w/llpp.git/snapshot/1ef3f3e5b9c45ce9e4a7bb5859e448e1b44e0639.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-text/mupdf-0.8.165
- dev-ml/lablgl[glut]
- media-libs/jbig2dec
- media-libs/openjpeg
- x11-misc/xsel"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
- ocamlopt -c -o link.o -ccopt -O link.c || die
- ocamlopt -c -o main.cmo -I +lablGL main.ml || die
-
- ocamlopt -o llpp \
- -I +lablGL str.cmxa unix.cmxa lablgl.cmxa lablglut.cmxa link.o \
- -cclib "-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lpthread" \
- main.cmx || die
-}
-
-src_install() {
- dobin ${PN} || die
- dodoc KEYS Thanks fixme || die
-}
diff --git a/app-text/llpp/llpp-7.ebuild b/app-text/llpp/llpp-7.ebuild
index bbcda571ddac..eb839ab75eac 100644
--- a/app-text/llpp/llpp-7.ebuild
+++ b/app-text/llpp/llpp-7.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/app-text/llpp/llpp-7.ebuild,v 1.3 2011/11/17 18:47:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-7.ebuild,v 1.4 2011/11/18 03:32:28 xmw Exp $
EAPI=3
@@ -35,7 +35,7 @@ src_compile() {
printf 'let version ="%s";;\n' ${PV} >> help.ml || die
local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
- local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype"
+ local mycclib="-lmupdf -lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lpthread"
#if use ocamlopt ; then
myccopt="${myccopt} -lpthread"
ocamlopt -c -o link.o -ccopt "${myccopt}" link.c || die
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b7e86444bbea..899c3612de95 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,4 @@
DIST 20111027-10gen-mms-agent.zip 25241 RMD160 418b238a317583bace686f1386b2a4d0c7c78a92 SHA1 37349cfa1453eaecf7354f3d4a2595efdea02a95 SHA256 e5625ce9029a376674d24b242527459403ac782d18c78d91beab93fa8f6783f1
-DIST mongodb-src-r1.8.2.tar.gz 1722704 RMD160 3c1e33ed9ff3dd3c653112a46cf178d07b93e32c SHA1 d2145e5b4a6df2e94aec76bef3a9399c11e8571a SHA256 1dd376b15e2b7288a77da2e1b0c6ffa5d2c62cdaf4bccfd9aa51c075a1f1bfb8
DIST mongodb-src-r1.8.3.tar.gz 1726144 RMD160 9662b6963e7e6a4b5adcbea3faa36dd50a794457 SHA1 3c5c9819ef20c759aec1dc6800a3c4d4f6841299 SHA256 ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
DIST mongodb-src-r1.8.4.tar.gz 1727826 RMD160 6b561592b4f58f08ca2789e5ab92a3d31597912e SHA1 d296a6e04057e17989de5c7ded3a8c4d28285156 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae
-DIST mongodb-src-r2.0.2_pre20111116.tar.gz 2822830 RMD160 a5e7a564a074bd800eb5423ba0a15f9f8179434c SHA1 febe43c9fe84bfc58f9498b85cb0b34a8627d067 SHA256 a77a67e698714d121caa5ba4c398ac1bf82f37040ba06df84d52587682ceff29
+DIST mongodb-src-r2.0.2-rc0.tar.gz 2954080 RMD160 749d127b32911ad95eb935a419910b85117855bd SHA1 164c1144c1d59905b654a0dfd80f1f72588c5240 SHA256 3dd9079f4e7acf44aa4faf857c29b48ab470b85257ec9962daea2caaa2075b38
diff --git a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
index adadde14ef75..a52e3a30a77d 100644
--- a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
@@ -1,6 +1,6 @@
---- a/SConstruct 2011-11-14 15:05:46.000000000 +0100
-+++ b/SConstruct 2011-11-15 21:12:23.707935731 +0100
-@@ -689,15 +689,16 @@
+--- a/SConstruct 2011-11-16 22:11:39.000000000 +0100
++++ b/SConstruct 2011-11-17 16:30:16.144117550 +0100
+@@ -688,7 +688,7 @@
env["CXX"] = "distcc " + env["CXX"]
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
@@ -8,8 +8,8 @@
+ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
if linux:
-- env.Append( CPPFLAGS=" -Werror -pipe " )
- if not has_option('clang'):
+ env.Append( CPPFLAGS=" -Werror " )
+@@ -696,7 +696,9 @@
env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
@@ -19,7 +19,7 @@
env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
env.Append( LIBS=[] )
-@@ -707,12 +708,13 @@
+@@ -706,12 +708,13 @@
if linux and has_option( "sharedclient" ):
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
diff --git a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
deleted file mode 100644
index b29948cf1938..000000000000
--- a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2-r1.ebuild,v 1.3 2011/10/19 15:54:07 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils multilib scons-utils versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs v8"
-
-RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
- v8? ( dev-lang/v8 )
- dev-libs/boost
- dev-libs/libpcre[cxx]
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- sys-libs/readline
- sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
- if use v8; then
- scons_opts+=" --usev8"
- else
- scons_opts+=" --usesm"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
- epatch "${FILESDIR}/${PN}-linux3.patch"
-}
-
-src_compile() {
- escons ${scons_opts} all
-}
-
-src_install() {
- escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
-
- use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
-
- for x in /var/{lib,log,run}/${PN}; do
- keepdir "${x}"
- fowners mongodb:mongodb "${x}"
- done
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
- newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-}
-
-src_test() {
- escons ${scons_opts} test
- "${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
- ewarn "You just upgraded from a previous version of mongodb !"
- ewarn "Make sure you run 'mongod --upgrade' before using this version."
- fi
- elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
diff --git a/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild b/dev-db/mongodb/mongodb-2.0.2_rc0.ebuild
similarity index 92%
rename from dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild
rename to dev-db/mongodb/mongodb-2.0.2_rc0.ebuild
index b4dc77fceaae..0d557f870d09 100644
--- a/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.2_rc0.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-db/mongodb/mongodb-2.0.2_pre20111116.ebuild,v 1.1 2011/11/16 09:44:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.2_rc0.ebuild,v 1.1 2011/11/18 08:32:46 ultrabug Exp $
EAPI=4
SCONS_MIN_VERSION="1.2.0"
@@ -11,7 +11,7 @@ MY_P=${PN}-src-r${PV/_rc/-rc}
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="http://www.mongodb.org"
-SRC_URI="https://github.com/mongodb/mongo/tarball/0655ba4ec87e4dd91c5639707d6f6f208d719d61 -> ${MY_P}.tar.gz
+SRC_URI="https://github.com/mongodb/mongo/tarball/ada33ce4be46e634e8ac9b727167b2173f90f5c8 -> ${MY_P}.tar.gz
mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )"
LICENSE="AGPL-3 Apache-2.0"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
sys-libs/readline
sys-libs/ncurses"
-S="${WORKDIR}/mongodb-mongo-0655ba4"
+S="${WORKDIR}/mongodb-mongo-ada33ce"
pkg_setup() {
enewgroup mongodb
diff --git a/dev-embedded/msp430mcu/Manifest b/dev-embedded/msp430mcu/Manifest
index 8686baaa0843..f6f4c8b32c5e 100644
--- a/dev-embedded/msp430mcu/Manifest
+++ b/dev-embedded/msp430mcu/Manifest
@@ -1 +1,2 @@
DIST msp430mcu-20110613.tar.bz2 3014406 RMD160 234c5bea0a345c78daba9b60445ff3393b7f572d SHA1 79904ac0c1852c6846cadbb21a0cb77a47adcdcd SHA256 954abc20d3997c8b6f63abcd7c683034b26435c537c0aa086c94e13d95e1b004
+DIST msp430mcu-20111107.tar.bz2 4104438 RMD160 d06aec5c85e46c3a408ba735e2cafef28a5abfbc SHA1 3decd1753b772f9304c3db5adcfb75bea48f9a05 SHA256 9e722690abb59692911b092d79c8001b26bab1115b646349d9e4c4765b892deb
diff --git a/dev-embedded/msp430mcu/msp430mcu-20111107.ebuild b/dev-embedded/msp430mcu/msp430mcu-20111107.ebuild
new file mode 100644
index 000000000000..159e785dafff
--- /dev/null
+++ b/dev-embedded/msp430mcu/msp430mcu-20111107.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430mcu/msp430mcu-20111107.ebuild,v 1.1 2011/11/18 06:59:55 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="MCU-specific data for MSP430 microcontrollers"
+HOMEPAGE="http://mspgcc.sourceforge.net"
+SRC_URI="mirror://sourceforge/mspgcc/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+ MSP430MCU_ROOT="${S}" ./scripts/install.sh "${D}/usr"
+}
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
index 1bed8fb474dc..57d65afb6ab9 100644
--- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.4-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/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.4 2011/11/10 21:42:13 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.5 2011/11/18 11:01:47 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -177,10 +177,10 @@ src_configure() {
local vmhome="/usr/lib/jvm/${vm}"
# IcedTea6 can't be built using IcedTea7; its class files are too new
- if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]]; then
+ if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
# If we are upgrading icedtea, then we don't need to bootstrap.
config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
- elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
+ elif has "${vm}" gcj-jdk cacao; then
# For other 1.5 JDKs e.g. GCJ, CACAO.
config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
config="${config} --with-jdk-home=${vmhome}"
diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index c5a46d693ce9..79a44cb2afd0 100644
--- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0-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/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.11 2011/11/13 22:39:22 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.12 2011/11/18 11:01:45 sera Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -170,9 +170,9 @@ src_unpack() {
}
java_prepare() {
- # Fix building with PaX enabled kernels. Bug #389751
+ # Fix non bootstrap builds with PaX enabled kernels. Bug #389751
# Move applying test_gamma.patch to before creating boot copy.
- if grep '^PaX:' /proc/self/status > /dev/null; then
+ if host-is-pax; then
sed -i -e 's|patches/boot/test_gamma.patch||' Makefile.in || die
sed -i -e 's|openjdk-boot|openjdk|g' patches/boot/test_gamma.patch || die
export DISTRIBUTION_PATCHES=patches/boot/test_gamma.patch
@@ -187,10 +187,19 @@ src_configure() {
local config procs rhino_jar
local vm=$(java-pkg_get-current-vm)
- if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]] ; then
+ if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
# We can't currently bootstrap with a IcedTea6 JVM :(
config="${config} --disable-bootstrap"
- elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" && "${vm}" != "icedtea-bin-7" ]] ; then
+ elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
+ # We can't currently bootstrap with a PaX enabled kernel :(
+ host-is-pax && config="${config} --disable-bootstrap"
+ elif has "${vm}" gcj-jdk cacao; then
+ if host-is-pax; then
+ eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
+ eerror "Sorry for the inconvenience"
+ die "Use an existing IcedTea build instead or disable PaX on the host"
+ fi
+ else
eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
fi
diff --git a/dev-lang/php/files/php-fpm.init b/dev-lang/php/files/php-fpm.init
index adcfd3275bbb..a186d83478c5 100755
--- a/dev-lang/php/files/php-fpm.init
+++ b/dev-lang/php/files/php-fpm.init
@@ -1,8 +1,15 @@
#!/sbin/runscript
-PHP_FPM_CONF="/etc/php/fpm-php5/php-fpm.conf"
+set_phpvars() {
+ PHPSLOT=${SVCNAME#php-fpm-}
+ [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
-opts="depend start stop reload"
+ PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+ PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+}
+
+extra_commands="depend"
+extra_started_commands="reload"
depend() {
need net
@@ -10,13 +17,31 @@ depend() {
}
start() {
- ebegin "Starting PHP FastCGI server"
- start-stop-daemon --start --exec /usr/bin/php-fpm -- -y "${PHP_FPM_CONF}"
- eend $?
+ ebegin "Starting PHP FastCGI Process Manager"
+ set_phpvars
+ start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
+ /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+ local i=0
+ local timeout=5
+ while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
+ sleep 1
+ i=$(($i + 1))
+ done
+
+ [ $timeout -gt $i ]
+ eend $?
}
stop() {
- ebegin "Stopping PHP FastCGI server"
- start-stop-daemon --stop --name php-fpm
- eend $?
+ ebegin "Stopping PHP FastCGI Process Manager"
+ set_phpvars
+ start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading PHP FastCGI Process Manager"
+ set_phpvars
+ [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
+ eend $?
}
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index 47d10174f2f9..340bbe5b686e 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -1,4 +1,3 @@
-DIST v8-3.5.10.23.tar.bz2 9380464 RMD160 9e0429b6ef0fcdb5f66b996b75cf061ece88dbd4 SHA1 c955a60bdd846bde923561e8710ddf283b4e4e5a SHA256 6ec529415fd38534d24083728eaf80eda4b51845812d2f9303738e8019d1e3c9
DIST v8-3.5.10.24.tar.bz2 9378560 RMD160 5d6be86af37aed9e7a227fec817e76980f9802d7 SHA1 a20b0ff0baff46b75289c30016e1744457399208 SHA256 4fa2c6cc996463db122fc73267a64d0c00b17e0cddf11aa02bfab6b126b797ee
DIST v8-3.6.6.5.tar.bz2 9621910 RMD160 b704bdfc7ea535210a2c8881becff6f81e0c6da3 SHA1 91b12e58dc2480eec132e12039748cebff4d2510 SHA256 d4a689038c0991f7bfaf367f5ec986110e35387259598183143f9c7f04343ca8
DIST v8-3.6.6.6.tar.bz2 9619754 RMD160 8d8af502c4b90a534e302850349cc62c64e330b1 SHA1 25b65a7246731b5f91db3a0a8a0c6bd377b1fff5 SHA256 f51de4710c547373df546810e8d51c60cc90dd07881bf575191ade065964d6d6
diff --git a/dev-lang/v8/v8-3.5.10.23.ebuild b/dev-lang/v8/v8-3.5.10.23.ebuild
deleted file mode 100644
index 40e8168266da..000000000000
--- a/dev-lang/v8/v8-3.5.10.23.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.5.10.23.ebuild,v 1.3 2011/11/11 11:56:16 phajdan.jr Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils toolchain-funcs
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos ~x86-macos"
-IUSE="readline"
-
-RDEPEND="readline? ( >=sys-libs/readline-6.1 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- tc-export AR CC CXX RANLIB
-
- # Make the build respect LDFLAGS.
- export LINKFLAGS="${LDFLAGS}"
-}
-
-src_prepare() {
- # Stop -Werror from breaking the build.
- epatch "${FILESDIR}"/${PN}-no-werror-r0.patch
-
- # Respect the user's CFLAGS, including the optimization level.
- epatch "${FILESDIR}"/${PN}-no-O3-r0.patch
-}
-
-src_configure() {
- # GCC issues multiple warnings about strict-aliasing issues in v8 code.
- append-flags -fno-strict-aliasing
-}
-
-src_compile() {
- local myconf="library=shared soname=on importenv=LINKFLAGS,PATH"
-
- # Use target arch detection logic from bug #354601.
- case ${CHOST} in
- i?86-*) myarch=x86 ;;
- x86_64-*)
- if [[ $ABI = "" ]] ; then
- myarch=amd64
- else
- myarch="$ABI"
- fi ;;
- arm*-*) myarch=arm ;;
- *) die "Unrecognized CHOST: ${CHOST}"
- esac
-
- if [[ $myarch = amd64 ]] ; then
- myconf+=" arch=x64"
- elif [[ $myarch = x86 ]] ; then
- myconf+=" arch=ia32"
- elif [[ $myarch = arm ]] ; then
- myconf+=" arch=arm"
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- escons $(use_scons readline console readline dumb) ${myconf} || die
-}
-
-src_install() {
- insinto /usr
- doins -r include || die
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libv8-${PV}$(get_libname) \
- libv8-${PV}$(get_libname) || die
- fi
-
- dolib libv8-${PV}$(get_libname) || die
- dosym libv8-${PV}$(get_libname) /usr/$(get_libdir)/libv8$(get_libname) || die
-
- dodoc AUTHORS ChangeLog || die
-}
diff --git a/dev-lang/v8/v8-3.5.10.24.ebuild b/dev-lang/v8/v8-3.5.10.24.ebuild
index 832a02b9e7eb..d440cb94e595 100644
--- a/dev-lang/v8/v8-3.5.10.24.ebuild
+++ b/dev-lang/v8/v8-3.5.10.24.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/v8/v8-3.5.10.24.ebuild,v 1.2 2011/11/17 11:37:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.5.10.24.ebuild,v 1.3 2011/11/18 10:29:44 phajdan.jr Exp $
EAPI="3"
@@ -12,7 +12,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos ~x86-macos"
IUSE="readline"
RDEPEND="readline? ( >=sys-libs/readline-6.1 )"
diff --git a/dev-lang/vala/vala-0.14.0.ebuild b/dev-lang/vala/vala-0.14.0.ebuild
index 02b2cdcf8c69..90f0f788f29f 100644
--- a/dev-lang/vala/vala-0.14.0.ebuild
+++ b/dev-lang/vala/vala-0.14.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-lang/vala/vala-0.14.0.ebuild,v 1.7 2011/10/30 14:58:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.14.0.ebuild,v 1.8 2011/11/18 09:51:27 naota Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala"
LICENSE="LGPL-2.1"
SLOT="0.14"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux"
IUSE="test +vapigen"
RDEPEND=">=dev-libs/glib-2.16:2"
diff --git a/dev-libs/libyaml/libyaml-0.1.3.ebuild b/dev-libs/libyaml/libyaml-0.1.3.ebuild
index 4484a608dcc4..7d71ce8b1d00 100644
--- a/dev-libs/libyaml/libyaml-0.1.3.ebuild
+++ b/dev-libs/libyaml/libyaml-0.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-libs/libyaml/libyaml-0.1.3.ebuild,v 1.6 2011/07/15 17:37:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.3.ebuild,v 1.7 2011/11/18 03:07:01 naota Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="doc examples test"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0.ebuild b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0.ebuild
new file mode 100644
index 000000000000..7a4f4df5025c
--- /dev/null
+++ b/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Stat-Bits/File-Stat-Bits-1.10.0.ebuild,v 1.1 2011/11/18 08:51:13 radhermit Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=FEDOROV
+MODULE_VERSION=1.01
+inherit perl-module
+
+DESCRIPTION="File stat bit mask constants"
+
+LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SRC_TEST="do"
diff --git a/dev-perl/File-Stat-Bits/Manifest b/dev-perl/File-Stat-Bits/Manifest
new file mode 100644
index 000000000000..59de8066af9b
--- /dev/null
+++ b/dev-perl/File-Stat-Bits/Manifest
@@ -0,0 +1 @@
+DIST File-Stat-Bits-1.01.tar.gz 9348 RMD160 b1733926235bf30a397cb9bb2d3c36daa216ac61 SHA1 3d2b328af41241d9ca657cc5404f31c7a7674715 SHA256 bd2442b0407a580b8bc094fe8e02c26bd2cb56936d1bf22f62da2fcbdbf692fb
diff --git a/dev-perl/File-Stat-Bits/metadata.xml b/dev-perl/File-Stat-Bits/metadata.xml
new file mode 100644
index 000000000000..7207efaa6a38
--- /dev/null
+++ b/dev-perl/File-Stat-Bits/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+ perl
+
+ File-Stat-Bits
+
+
diff --git a/dev-perl/Term-Screen/Manifest b/dev-perl/Term-Screen/Manifest
new file mode 100644
index 000000000000..8085f199a0b3
--- /dev/null
+++ b/dev-perl/Term-Screen/Manifest
@@ -0,0 +1 @@
+DIST Term-Screen-1.03.tar.gz 7778 RMD160 3691b58840e741f74aa28b7058e80098963116e3 SHA1 aa558bdc077f4b0356a369b42e9bc613d9d8c87b SHA256 3d28fd5b167c136c6a473110d2a1829b8d356808aeb697faaca47ad114d536d9
diff --git a/dev-perl/Term-Screen/Term-Screen-1.30.0.ebuild b/dev-perl/Term-Screen/Term-Screen-1.30.0.ebuild
new file mode 100644
index 000000000000..b4b4679199e6
--- /dev/null
+++ b/dev-perl/Term-Screen/Term-Screen-1.30.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-Screen/Term-Screen-1.30.0.ebuild,v 1.1 2011/11/18 09:01:31 radhermit Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=JSTOWE
+MODULE_VERSION=1.03
+inherit perl-module
+
+DESCRIPTION="A simple Term::Cap based screen positioning module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Tests are interactive
+#SRC_TEST="do"
diff --git a/dev-perl/Term-Screen/metadata.xml b/dev-perl/Term-Screen/metadata.xml
new file mode 100644
index 000000000000..2c499449f69f
--- /dev/null
+++ b/dev-perl/Term-Screen/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+ perl
+
+ Term-Screen
+
+
diff --git a/dev-perl/Term-ScreenColor/Manifest b/dev-perl/Term-ScreenColor/Manifest
new file mode 100644
index 000000000000..82c15c483dd2
--- /dev/null
+++ b/dev-perl/Term-ScreenColor/Manifest
@@ -0,0 +1 @@
+DIST Term-ScreenColor-1.20.tar.gz 21325 RMD160 1825eb6951862249c4d0ebd886e4850b40f40e51 SHA1 216f1df4951dd60130c6b0f2b263df36d2b812b1 SHA256 be5e80b2dd0f2552f026f062d1429e9212bf975fad82ff704533f8fe9b28bfb0
diff --git a/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0.ebuild b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0.ebuild
new file mode 100644
index 000000000000..e6743d2fc585
--- /dev/null
+++ b/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Term-ScreenColor/Term-ScreenColor-1.200.0.ebuild,v 1.1 2011/11/18 09:10:48 radhermit Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=RUITTENB
+MODULE_VERSION=1.20
+inherit perl-module
+
+DESCRIPTION="A Term::Screen based screen positioning and coloring module"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-perl/Term-Screen-1.30.0"
+DEPEND="${RDEPEND}"
+
+# Tests require a real tty device attached to stdin
+#SRC_TEST="do"
diff --git a/dev-perl/Term-ScreenColor/metadata.xml b/dev-perl/Term-ScreenColor/metadata.xml
new file mode 100644
index 000000000000..9efaa3ed7260
--- /dev/null
+++ b/dev-perl/Term-ScreenColor/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+ perl
+
+ Term-ScreenColor
+
+
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index bf56be807ef0..45c1642d7407 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,4 +1,2 @@
-DIST spyder-2.0.10.zip 2486312 RMD160 33f7ba06ef4ee94026ce90d76afe10fcae0172ac SHA1 6b23bc83c2608b777711583edcea1b107ab618ae SHA256 0f1e9d0aadfc63b2ab7c71ae140740bd4da9c5957b1a632f4036bf9e2977e813
-DIST spyder-2.0.11.zip 1794767 RMD160 949d0d9255cb4a144d95de3104d5f67cdf1242bf SHA1 88f106cea4bca9dd12b33f547189cadac98e255c SHA256 94bcc7e4d147bf9cc6ebbc66179db2e121ac05c17bedab8c13d9d070d6a5b6e1
DIST spyder-2.0.12.zip 1794855 RMD160 571565d243af70c9ba8c89d62481c2cb3b1bceff SHA1 a592caf81f4c1f72d637a5269f5c60f8f43e57ee SHA256 07d68efb162f06a98ea31469624d7932ed2fce884efd1870e1bc641e76ecc2d9
-DIST spyder-2.0.8.zip 2487356 RMD160 d0beedf80209a0b50932618fca2fbf4ef5e3da0e SHA1 8ecc937575620d1559c3f4f90ca01340a8ef69f5 SHA256 cb9e73c266e7dac6c9c492fd1262732d3a61bc4e0fc4be7be360372b14898e81
+DIST spyder-2.1.2.zip 1921837 RMD160 d04ff71bb5fc8c80cc71c89c2cdc56646e00ed25 SHA1 0d675de517af704e5c94cbe839d4694a37811d95 SHA256 437dff12976ecbb69520d227a1fe718b058e40075b57fa85debd1bb90bee93dd
diff --git a/dev-python/spyder/files/spyder-2.0.4-disable_sphinx_dependency.patch b/dev-python/spyder/files/spyder-2.0.4-disable_sphinx_dependency.patch
deleted file mode 100644
index f87b405faa37..000000000000
--- a/dev-python/spyder/files/spyder-2.0.4-disable_sphinx_dependency.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -13,7 +13,6 @@
-
- from distutils.core import setup
- from distutils.command.build import build
--from sphinx import setup_command
- import os, os.path as osp, sys
-
-
-@@ -36,27 +35,6 @@
- splist.append(".".join(dirpath.split(os.sep)))
- return splist
-
--# Sphinx build (documentation)
--class MyBuild(build):
-- def has_doc(self):
-- setup_dir = os.path.dirname(os.path.abspath(__file__))
-- return os.path.isdir(os.path.join(setup_dir, 'doc'))
-- sub_commands = build.sub_commands + [('build_doc', has_doc)]
--
--class MyBuildDoc(setup_command.BuildDoc):
-- def run(self):
-- build = self.get_finalized_command('build')
-- sys.path.insert(0, os.path.abspath(build.build_lib))
-- dirname = self.distribution.get_command_obj('build').build_purelib
-- self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
-- try:
-- setup_command.BuildDoc.run(self)
-- except UnicodeDecodeError:
-- print >>sys.stderr, "ERROR: unable to build documentation because Sphinx do not handle source path with non-ASCII characters. Please try to move the source package to another location (path with *only* ASCII characters)."
-- sys.path.pop(0)
--
--cmdclass = {'build': MyBuild, 'build_doc': MyBuildDoc}
--
-
- NAME = 'spyder'
- LIBNAME = 'spyderlib'
-@@ -83,7 +61,7 @@
- get_package_data(LIBNAME, ('.qm', '.svg', '.png', '.css')),
- 'spyderplugins':
- get_package_data('spyderplugins', ('.qm', '.svg', '.png'))},
-- requires=["pyflakes (>0.3.0)", "rope (>0.9.0)", "sphinx (>0.6.0)",
-+ requires=["pyflakes (>0.3.0)", "rope (>0.9.0)",
- "PyQt4 (>4.3)"],
- scripts=['spyder', 'spyder.bat'] if os.name == 'nt' else ['spyder'],
- classifiers=['License :: OSI Approved :: MIT License',
-@@ -97,5 +75,4 @@
- 'Programming Language :: Python :: 2.7',
- 'Development Status :: 5 - Production/Stable',
- 'Topic :: Scientific/Engineering',
-- 'Topic :: Software Development :: Widget Sets'],
-- cmdclass=cmdclass)
-+ 'Topic :: Software Development :: Widget Sets'])
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index f3e00bf96c12..334179b7f7b1 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -16,6 +16,7 @@
Add support for dev-python/ipython
Add support for dev-python/matplotlib
Add support for dev-python/numpy
+ Add support for dev-python/pep8
Add support for dev-python/pyflakes
Add support for dev-python/pylint
Add support for sci-libs/rope
diff --git a/dev-python/spyder/spyder-2.0.10.ebuild b/dev-python/spyder/spyder-2.0.10.ebuild
deleted file mode 100644
index 8ae3653304ff..000000000000
--- a/dev-python/spyder/spyder-2.0.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.0.10.ebuild,v 1.1 2011/04/06 14:26:36 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder"
-SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipython matplotlib numpy +pyflakes pylint +rope scipy"
-
-RDEPEND=">=dev-python/PyQt4-4.4[webkit]
- ipython? ( dev-python/ipython )
- matplotlib? ( dev-python/matplotlib )
- numpy? ( dev-python/numpy )
- pyflakes? ( >=dev-python/pyflakes-0.3 )
- pylint? ( dev-python/pylint )
- rope? ( >=dev-python/rope-0.9.0 )
- scipy? ( sci-libs/scipy )"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )"
-
-PYTHON_MODNAME="spyderlib spyderplugins"
-
-src_prepare() {
- distutils_src_prepare
- epatch "${FILESDIR}/${P}-disable_sphinx_dependency.patch"
-}
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- einfo "Generation of documentation"
- PYTHONPATH="build-$(PYTHON -f --ABI)" sphinx-build doc doc_output || die "Generation of documentation failed"
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- pushd doc_output > /dev/null
- insinto /usr/share/doc/${PF}/html
- doins -r [a-z]* _images _static || die "Installation of documentation failed"
- popd > /dev/null
- fi
-}
diff --git a/dev-python/spyder/spyder-2.0.8.ebuild b/dev-python/spyder/spyder-2.0.8.ebuild
deleted file mode 100644
index 76f6e005e6b7..000000000000
--- a/dev-python/spyder/spyder-2.0.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.0.8.ebuild,v 1.1 2011/03/01 16:43:20 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder"
-SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipython matplotlib numpy +pyflakes pylint +rope scipy"
-
-RDEPEND=">=dev-python/PyQt4-4.4[webkit]
- ipython? ( dev-python/ipython )
- matplotlib? ( dev-python/matplotlib )
- numpy? ( dev-python/numpy )
- pyflakes? ( >=dev-python/pyflakes-0.3 )
- pylint? ( dev-python/pylint )
- rope? ( >=dev-python/rope-0.9.0 )
- scipy? ( sci-libs/scipy )"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )"
-
-PYTHON_MODNAME="spyderlib spyderplugins"
-
-src_prepare() {
- distutils_src_prepare
- epatch "${FILESDIR}/${PN}-2.0.4-disable_sphinx_dependency.patch"
-}
-
-src_compile() {
- distutils_src_compile
-
- if use doc; then
- einfo "Generation of documentation"
- PYTHONPATH="build-$(PYTHON -f --ABI)" sphinx-build doc doc_output || die "Generation of documentation failed"
- fi
-}
-
-src_install() {
- distutils_src_install
-
- if use doc; then
- pushd doc_output > /dev/null
- insinto /usr/share/doc/${PF}/html
- doins -r [a-z]* _images _static || die "Installation of documentation failed"
- popd > /dev/null
- fi
-}
diff --git a/dev-python/spyder/spyder-2.0.11.ebuild b/dev-python/spyder/spyder-2.1.2.ebuild
similarity index 69%
rename from dev-python/spyder/spyder-2.0.11.ebuild
rename to dev-python/spyder/spyder-2.1.2.ebuild
index 313baefb170e..96dd7a3f601b 100644
--- a/dev-python/spyder/spyder-2.0.11.ebuild
+++ b/dev-python/spyder/spyder-2.1.2.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-python/spyder/spyder-2.0.11.ebuild,v 1.1 2011/04/29 21:24:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.1.2.ebuild,v 1.1 2011/11/18 10:02:59 grozin Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@@ -16,7 +16,7 @@ SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc ipython matplotlib numpy +pyflakes pylint +rope scipy"
+IUSE="doc ipython matplotlib numpy +pyflakes pylint +rope scipy pep8"
RDEPEND=">=dev-python/PyQt4-4.4[webkit]
ipython? ( dev-python/ipython )
@@ -24,30 +24,28 @@ RDEPEND=">=dev-python/PyQt4-4.4[webkit]
numpy? ( dev-python/numpy )
pyflakes? ( >=dev-python/pyflakes-0.3 )
pylint? ( dev-python/pylint )
- rope? ( >=dev-python/rope-0.9.0 )
- scipy? ( sci-libs/scipy )"
+ rope? ( >=dev-python/rope-0.9.3 )
+ scipy? ( sci-libs/scipy )
+ pep8? ( dev-python/pep8 )"
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )"
PYTHON_MODNAME="spyderlib spyderplugins"
-src_prepare() {
- distutils_src_prepare
- epatch "${FILESDIR}/${PN}-2.0.10-disable_sphinx_dependency.patch"
-}
-
src_compile() {
distutils_src_compile
if use doc; then
einfo "Generation of documentation"
- PYTHONPATH="build-$(PYTHON -f --ABI)" sphinx-build doc doc_output || die "Generation of documentation failed"
+ PYTHONPATH="build-$(PYTHON -f --ABI)" \
+ sphinx-build doc doc_output || die "Generation of documentation failed"
fi
}
src_install() {
distutils_src_install
-
+ doicon spyderlib/images/spyder.svg || die
+ make_desktop_entry spyder Spyder spyder "Development;IDE"
if use doc; then
pushd doc_output > /dev/null
insinto /usr/share/doc/${PF}/html
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
index 49e3c820fb5d..ddb068dd87d3 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.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/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.1 2011/10/30 07:21:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 multilib pam virtualx
+inherit gnome2 multilib pam versionator virtualx
DESCRIPTION="Password and keyring managing daemon"
HOMEPAGE="http://www.gnome.org/"
@@ -81,6 +81,7 @@ pkg_postinst() {
# @DESCRIPTION:
# fcaps sets the specified capabilities in the effective and permitted set of
# the given file. In case of failure fcaps sets the given file-mode.
+# Requires versionator.eclass
fcaps() {
local uid_gid=$1
local perms=$2
@@ -101,10 +102,13 @@ fcaps() {
res=$?
if [ $res -ne 0 ]; then
- ewarn "Failed to set capabilities. Probable reason is missed kernel support."
- ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and _FS_SECURITY"
- ewarn "enabled (e.g. EXT3_FS_SECURITY) where is the filesystem to store"
- ewarn "${path}"
+ ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+ ewarn "Your kernel must have _FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+ ewarn "where is the filesystem to store ${path}"
+ if ! version_is_at_least 2.6.33 "$(uname -r)"; then
+ ewarn "For kernel 2.6.32 or older, you will also need to enable"
+ ewarn "SECURITY_FILE_CAPABILITIES."
+ fi
ewarn
ewarn "Falling back to suid now..."
chmod u+s ${path}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
index 70d49ea4de08..2e4696f6cee7 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.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/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.1 2011/11/17 06:09:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 multilib pam virtualx
+inherit gnome2 multilib pam versionator virtualx
DESCRIPTION="Password and keyring managing daemon"
HOMEPAGE="http://www.gnome.org/"
@@ -83,6 +83,7 @@ pkg_postinst() {
# @DESCRIPTION:
# fcaps sets the specified capabilities in the effective and permitted set of
# the given file. In case of failure fcaps sets the given file-mode.
+# Requires versionator.eclass
fcaps() {
local uid_gid=$1
local perms=$2
@@ -103,10 +104,13 @@ fcaps() {
res=$?
if [ $res -ne 0 ]; then
- ewarn "Failed to set capabilities. Probable reason is missed kernel support."
- ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and _FS_SECURITY"
- ewarn "enabled (e.g. EXT3_FS_SECURITY) where is the filesystem to store"
- ewarn "${path}"
+ ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+ ewarn "Your kernel must have _FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+ ewarn "where is the filesystem to store ${path}"
+ if ! version_is_at_least 2.6.33 "$(uname -r)"; then
+ ewarn "For kernel 2.6.32 or older, you will also need to enable"
+ ewarn "SECURITY_FILE_CAPABILITIES."
+ fi
ewarn
ewarn "Falling back to suid now..."
chmod u+s ${path}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 77136bba4864..7f2185312ea1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -7,7 +7,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9-20111113.tar.gz 3685450 RMD160 c7712338d7693a1ab51b4f72e48a646e9149095b SHA1 902f65f93e89ab5c471aaf5557db13083d8f1a43 SHA256 c8f493b9206b4ac52fdfdae72fee214d22d29206d353a6110188305019d906e3
+DIST postfix-2.9-20111117.tar.gz 3684552 RMD160 dca9e7cb2f064160bad3d5af47241a39c44cd7fb SHA1 1739001e5efeb40d5d33a779c213eac6c91a5d2f SHA256 68507280aeef07ac023f5854b67310e40f256be102d3e1948e9d6cbe1881ea46
DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
diff --git a/mail-mta/postfix/postfix-2.9_pre20111113.ebuild b/mail-mta/postfix/postfix-2.9_pre20111117.ebuild
similarity index 99%
rename from mail-mta/postfix/postfix-2.9_pre20111113.ebuild
rename to mail-mta/postfix/postfix-2.9_pre20111117.ebuild
index 2aecebb0289e..834a241785d5 100644
--- a/mail-mta/postfix/postfix-2.9_pre20111113.ebuild
+++ b/mail-mta/postfix/postfix-2.9_pre20111117.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/mail-mta/postfix/postfix-2.9_pre20111113.ebuild,v 1.1 2011/11/14 12:14:53 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9_pre20111117.ebuild,v 1.1 2011/11/18 07:16:31 eras Exp $
EAPI=4
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 6aec34ef3271..d492df952756 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
DIST ristretto-0.0.93.tar.bz2 267332 RMD160 4d0feac9745d8b054a8213eccfa6287b4f7a57df SHA1 c71acaad169633faffe26609f9cc671b04ff52d3 SHA256 104cbf282ad8067d2f2bee2c37bc779db9cd1079383c0631fddba6600c262cff
DIST ristretto-0.1.0.tar.bz2 269347 RMD160 33967a70000b1adcf417575f7081294b7fbdc2ed SHA1 44c550270500f877d876e803b666c443f8d9674b SHA256 47c480f78de1100b704a46948438575acc1025d1a9fef3ef63fba139943739cb
-DIST ristretto-0.2.1.tar.bz2 360363 RMD160 0736994262273012b6974a3996a851c91b61d62e SHA1 442a55a1389f41c7a800e890b1dfe9720782c922 SHA256 ffe0ce560cd9b9677537ab0759e8521a779edc697068e88afad98366fab8a561
-DIST ristretto-0.2.2.tar.bz2 359958 RMD160 9f0a00e1a9f9642d184424cfc5a594731ad69a66 SHA1 b0e311a2b8e59c1b20eb24cfdf6303d6e06c2898 SHA256 c43832d7e6e37b670c3dd04dcf406266ff5980dc80abed7b8a82aa7c7defaa69
DIST ristretto-0.3.0.tar.bz2 688885 RMD160 5d1432119c204b8d2ecb378dd8bcce3632b8b4fc SHA1 c7034ad543bea3c1b99a2336dcee9d5ba480b2bb SHA256 a8bf0aa8a18af4ad8d53cbfc918bc92db51b5446cf7ff09e7b988fe5c7b986e4
diff --git a/media-gfx/ristretto/ristretto-0.2.1.ebuild b/media-gfx/ristretto/ristretto-0.2.1.ebuild
deleted file mode 100644
index 3bd3311083b0..000000000000
--- a/media-gfx/ristretto/ristretto-0.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ristretto-0.2.1.ebuild,v 1.1 2011/10/23 18:42:04 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="Image viewer and browser for Xfce4"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/ristretto"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/libexif
- >=x11-libs/gtk+-2.20:2
- >=dev-libs/glib-2.24:2
- >=dev-libs/dbus-glib-0.90
- >=xfce-base/libxfce4util-4.8
- >=xfce-base/libxfce4ui-4.8
- >=xfce-base/xfconf-4.8
- >=x11-libs/cairo-1.8"
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/pkgconfig
- sys-devel/gettext"
-
-pkg_setup() {
- XFCONF=(
- --docdir=/usr/share/doc/${PF}
- $(xfconf_use_debug)
- )
-
- DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/media-gfx/ristretto/ristretto-0.2.2.ebuild b/media-gfx/ristretto/ristretto-0.2.2.ebuild
deleted file mode 100644
index fd48527f5b68..000000000000
--- a/media-gfx/ristretto/ristretto-0.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ristretto/ristretto-0.2.2.ebuild,v 1.1 2011/10/28 20:22:22 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="Image viewer and browser for Xfce4"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/ristretto"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/libexif
- >=x11-libs/gtk+-2.20:2
- >=dev-libs/glib-2.24:2
- >=dev-libs/dbus-glib-0.90
- >=xfce-base/libxfce4util-4.8
- >=xfce-base/libxfce4ui-4.8
- >=xfce-base/xfconf-4.8
- >=x11-libs/cairo-1.8"
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/pkgconfig
- sys-devel/gettext"
-
-pkg_setup() {
- XFCONF=(
- --docdir=/usr/share/doc/${PF}
- $(xfconf_use_debug)
- )
-
- DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/media-gfx/shared-color-profiles/shared-color-profiles-0.1.4.ebuild b/media-gfx/shared-color-profiles/shared-color-profiles-0.1.4.ebuild
index cc45107379b0..fb89c10e9408 100644
--- a/media-gfx/shared-color-profiles/shared-color-profiles-0.1.4.ebuild
+++ b/media-gfx/shared-color-profiles/shared-color-profiles-0.1.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/media-gfx/shared-color-profiles/shared-color-profiles-0.1.4.ebuild,v 1.3 2011/11/06 17:08:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shared-color-profiles/shared-color-profiles-0.1.4.ebuild,v 1.4 2011/11/18 09:35:10 naota Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.gz"
LICENSE="GPL-2 MIT ZLIB public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=""
diff --git a/media-libs/freetype/freetype-2.4.8.ebuild b/media-libs/freetype/freetype-2.4.8.ebuild
index d51a24f92c7b..88a021c99e58 100644
--- a/media-libs/freetype/freetype-2.4.8.ebuild
+++ b/media-libs/freetype/freetype-2.4.8.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/freetype/freetype-2.4.8.ebuild,v 1.1 2011/11/17 01:28:20 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.8.ebuild,v 1.2 2011/11/18 05:22:17 jer Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
LICENSE="FTL GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X auto-hinter bindist bzip2 debug doc fontforge static-libs utils"
DEPEND="sys-libs/zlib
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 9bdde4db14a3..69d19bd140bd 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -2,5 +2,5 @@ DIST abcm2ps-5.9.15.tar.gz 253032 RMD160 d5a6b2639c34d6c70f5412ffeb82db8369da312
DIST abcm2ps-5.9.23.tar.gz 254174 RMD160 17d119ea7a196c5491459723261a7e7a4f4037f1 SHA1 e0377efd6de29f8047629f40069a2dd68b36780f SHA256 de0c319b80ef7beaefa9ed1b80b688a2a2a39fa50be4492061cc8f4db53d3a72
DIST abcm2ps-5.9.24.tar.gz 254329 RMD160 26695fabb540b17bd2dee86ba18c7fa3baa11e8b SHA1 7261ea8d2442a63897f97882e788c2d2404cd8c9 SHA256 008f8cde72c09ddd1c6a61d0b1f86d0733f35b76c94b7ceaeff97d02e8bcc53f
DIST abcm2ps-6.5.10.tar.gz 291234 RMD160 2d704096f9342d18d612ff117af526d04b140532 SHA1 f9f66400b095dbb9a0d36a06cb921efb40c30d8f SHA256 eed2fed0305d80eb41ae8e21796e4d75f51a274c9379e04d5facfb11bf9b54df
-DIST abcm2ps-6.5.7.tar.gz 290472 RMD160 d4329a6f8ef40e05ee0b55348052e6d48385bb73 SHA1 10b4430ff79dc005d05bdc67f4c5670156e55e7f SHA256 37cd265498238adc6468f23cea04a00895362eb466b0d478e0efad59438ba0f0
+DIST abcm2ps-6.5.12.tar.gz 291983 RMD160 73f11f3b8311707c1ee974f67cc08ff6282ecf14 SHA1 a78b39ef37392dc0ebeaddb8a4811994fac19b56 SHA256 e2473c594e6dd9e730815fce3310c6ebcfb5d1b2201561c717cb7c8f3e5a4fcb
DIST transpose_abc.pl 21045 RMD160 3ea7c36f80249a2c6e6c03eca0d9d58c054e2cfc SHA1 82a852ae790d6f379d48e4f3acc5aeba0236e575 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848
diff --git a/media-sound/abcm2ps/abcm2ps-6.5.7.ebuild b/media-sound/abcm2ps/abcm2ps-6.5.12.ebuild
similarity index 94%
rename from media-sound/abcm2ps/abcm2ps-6.5.7.ebuild
rename to media-sound/abcm2ps/abcm2ps-6.5.12.ebuild
index b4356d271a72..604d1499d569 100644
--- a/media-sound/abcm2ps/abcm2ps-6.5.7.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-6.5.12.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-sound/abcm2ps/abcm2ps-6.5.7.ebuild,v 1.1 2011/11/03 19:14:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-6.5.12.ebuild,v 1.1 2011/11/18 10:25:53 radhermit Exp $
EAPI=4
diff --git a/media-video/guvcview/files/guvcview-1.5.1-loops.patch b/media-video/guvcview/files/guvcview-1.5.1-loops.patch
new file mode 100644
index 000000000000..7c32f761a1ae
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-1.5.1-loops.patch
@@ -0,0 +1,61 @@
+--- guvcview-src-1.5.1.orig/src/v4l2_controls.c 2011-11-18 12:12:53.049556430 +0100
++++ guvcview-src-1.5.1/src/v4l2_controls.c 2011-11-18 12:13:00.095556136 +0100
+@@ -993,10 +993,10 @@
+ int i = 0;
+ int done = 0;
+
+- while(!done)
++ for(; next != NULL; current = next, next = current->next)
+ {
+ if(current->control.flags & V4L2_CTRL_FLAG_WRITE_ONLY)
+- goto next_control;
++ continue;
+
+ clist[count].id = current->control.id;
+ #ifndef DISABLE_STRING_CONTROLS
+@@ -1081,15 +1081,6 @@
+
+ count = 0;
+
+- if(next == NULL)
+- done = 1;
+- }
+-
+-next_control:
+- if(!done)
+- {
+- current = next;
+- next = current->next;
+ }
+ }
+
+@@ -1188,10 +1179,10 @@
+ int i = 0;
+ int done = 0;
+
+- while(!done)
++ for(; next != NULL; current = next, next = current->next)
+ {
+ if(current->control.flags & V4L2_CTRL_FLAG_READ_ONLY)
+- goto next_control;
++ continue;
+
+ clist[count].id = current->control.id;
+ switch (current->control.type)
+@@ -1269,16 +1260,6 @@
+
+
+ count = 0;
+-
+- if(next == NULL)
+- done = 1;
+- }
+-
+-next_control:
+- if(!done)
+- {
+- current = next;
+- next = current->next;
+ }
+ }
+
diff --git a/media-video/guvcview/guvcview-1.5.1.ebuild b/media-video/guvcview/guvcview-1.5.1.ebuild
index f68c3ba9625f..004daec3b620 100644
--- a/media-video/guvcview/guvcview-1.5.1.ebuild
+++ b/media-video/guvcview/guvcview-1.5.1.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/media-video/guvcview/guvcview-1.5.1.ebuild,v 1.1 2011/11/12 08:02:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.5.1.ebuild,v 1.2 2011/11/18 11:02:35 lu_zero Exp $
EAPI=4
-inherit autotools
+inherit autotools eutils
MY_P=${PN}-src-${PV}
DESCRIPTION="GTK+ UVC Viewer"
@@ -33,6 +33,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
sed -i -e '/^guvcviewdocdir/,/^$/d' Makefile.am || die
+ epatch "${FILESDIR}/${P}-loops.patch"
eautoreconf
}
diff --git a/media-video/h264enc/Manifest b/media-video/h264enc/Manifest
index 343760fde734..2e2700c48ef8 100644
--- a/media-video/h264enc/Manifest
+++ b/media-video/h264enc/Manifest
@@ -1,2 +1,2 @@
-DIST h264enc-9.3.7.tar.gz 119856 RMD160 5b00cf70b9078a6b82b9730a4f7af221cde50f6b SHA1 daca6ab15a1f1a1f391809399d56f4979fdb0f73 SHA256 b672ae10b208cc7b7138e1b1b6c4c8f700ca7a430381d3e710d3d23df46689ce
DIST h264enc-9.4.0.tar.gz 120198 RMD160 a189b3658095f264275aeb6db2d276b3d8354389 SHA1 307c8584a4d81943dee2c6054d6d7f46c75f8b4a SHA256 f87b36cec4d6ef90a21e518773be0a075ad13bf55456c0d6c06fedb9e2990ec0
+DIST h264enc-9.4.1.tar.gz 120268 RMD160 05eaeca54aa0b77c66460058642039502a8c3086 SHA1 01288a975b7a3e4a979484da15699a4d74c981f4 SHA256 a7f53c278b0a3b62c84f1d9a16612bdcd3f63062cb1bf46d6983ba36c81b57bb
diff --git a/media-video/h264enc/h264enc-9.3.7.ebuild b/media-video/h264enc/h264enc-9.4.1.ebuild
similarity index 94%
rename from media-video/h264enc/h264enc-9.3.7.ebuild
rename to media-video/h264enc/h264enc-9.4.1.ebuild
index 32f0fcbe3d77..5321fa739921 100644
--- a/media-video/h264enc/h264enc-9.3.7.ebuild
+++ b/media-video/h264enc/h264enc-9.4.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-video/h264enc/h264enc-9.3.7.ebuild,v 1.1 2011/06/19 09:11:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/h264enc/h264enc-9.4.1.ebuild,v 1.1 2011/11/18 10:38:41 radhermit Exp $
EAPI=4
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 1b8aa6649176..78cb9e521f09 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1 +1,2 @@
DIST ogmrip-0.13.6.tar.gz 3242380 RMD160 6116e7c22e747bd8ecd6444575537f2ebc16d062 SHA1 41917a11a44fb73c73daaa8ac29ae3dddb478b67 SHA256 f1b70fc68951401dbd43c9b1016fd2c37b1fda004d76cf6bb82c8a44742a5d24
+DIST ogmrip-0.13.7.tar.gz 3246395 RMD160 d7822afd1d300ebc9786ea2d3cc6420668ce19b8 SHA1 a0097636b2e24b5b40107cad04b10c207c45437b SHA256 362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a
diff --git a/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch b/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch
new file mode 100644
index 000000000000..6c7ad57e5b3f
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.7-deprecated.patch
@@ -0,0 +1,148 @@
+--- configure.in
++++ configure.in
+@@ -38,7 +38,6 @@
+ AM_MAINTAINER_MODE
+
+ CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
+-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+ CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
+--- ChangeLog
++++ ChangeLog
+@@ -1,5 +1,15 @@
+-19 Aug 2011 Olivier Rolland
++9 Oct 2011 Olivier Rolland
+
++ * configure.in
++ * src/ogmrip-profile-editor.c
++ * src/ogmrip-crop-dialog.c
++ * libogmrip-gtk/ogmrip-source-chooser-widget.c
++ * libogmrip-gtk/ogmrip-x264-options.c
++
++ Removed deprecated GTK+ functions
++
++19 Sep 2011 Olivier Rolland
++
+ Released OGMRip-0.13.7
+
+ 19 Sep 2011 Olivier Rolland
+--- src/ogmrip-profile-editor.c
++++ src/ogmrip-profile-editor.c
+@@ -631,6 +631,7 @@
+ {
+ GType codec;
+ GtkTreeModel *model;
++ GtkTreeIter iter;
+ gboolean exists;
+ gint active;
+ gchar *name;
+@@ -641,11 +642,15 @@
+ codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name);
+ g_free (name);
+
+- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER);
++ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER))
++ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+
+ exists = ogmrip_options_plugin_exists (codec);
+ if (exists)
+- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User"));
++ {
++ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
++ gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1);
++ }
+
+ active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo));
+
+--- src/ogmrip-crop-dialog.c
++++ src/ogmrip-crop-dialog.c
+@@ -218,17 +218,20 @@
+ }
+
+ static void
+-ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog *dialog, GtkWidget *scale)
++ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale)
+ {
+- gulong frame;
+- gchar *text;
++ if (event->button == 1)
++ {
++ gulong frame;
++ gchar *text;
+
+- frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
+- text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
+- gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
+- g_free (text);
++ frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
++ text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
++ gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
++ g_free (text);
+
+- ogmrip_crop_dialog_grab_frame (dialog, frame);
++ ogmrip_crop_dialog_grab_frame (dialog, frame);
++ }
+ }
+
+ G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)
+@@ -291,9 +294,8 @@
+ dialog->priv->label = glade_xml_get_widget (xml, "frame-label");
+
+ dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");
+- gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED);
+- g_signal_connect_swapped (dialog->priv->scale, "value-changed",
+- G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog);
++ g_signal_connect_swapped (dialog->priv->scale, "button-release-event",
++ G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog);
+
+ g_object_unref (xml);
+ }
+--- libogmrip-gtk/ogmrip-source-chooser-widget.c
++++ libogmrip-gtk/ogmrip-source-chooser-widget.c
+@@ -207,7 +207,12 @@
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_widget_show (label);
+
++#if GTK_CHECK_VERSION(2,24,0)
++ combo = gtk_combo_box_text_new ();
++#else
+ combo = gtk_combo_box_new_text ();
++#endif
++
+ gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+ gtk_widget_show (combo);
+
+@@ -231,7 +236,11 @@
+ {
+ str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME],
+ ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]);
++#if GTK_CHECK_VERSION(2,24,0)
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str);
++#else
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str);
++#endif
+ g_free (str);
+
+ if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0)
+--- libogmrip-gtk/ogmrip-x264-options.c
++++ libogmrip-gtk/ogmrip-x264-options.c
+@@ -299,9 +299,16 @@
+ gtk_widget_set_sensitive (dialog->me_combo, x264_have_me);
+
+ if (x264_have_me_tesa)
+- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo),
+- _("Transformed Exhaustive search (tesa - even slower)"));
++ {
++ GtkTreeModel *model;
++ GtkTreeIter iter;
+
++ model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo));
++ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
++ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
++ 0, _("Transformed Exhaustive search (tesa - even slower)"), -1);
++ }
++
+ dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin");
+ gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me);
+
diff --git a/media-video/ogmrip/ogmrip-0.13.7.ebuild b/media-video/ogmrip/ogmrip-0.13.7.ebuild
new file mode 100644
index 000000000000..14da1d5e9033
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.13.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.7.ebuild,v 1.1 2011/11/18 11:07:12 radhermit Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+inherit autotools-utils eutils gnome2
+
+DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16:2
+ >=app-i18n/enca-1.9
+ dev-libs/libxml2
+ media-libs/libdvdread
+ >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
+ aac? ( >=media-libs/faac-1.24 )
+ gtk? (
+ >=x11-libs/gtk+-2.12:2
+ gnome-base/libglade
+ gnome-base/gconf
+ dbus? ( dev-libs/dbus-glib )
+ libnotify? ( >=x11-libs/libnotify-0.4.3 )
+ media-video/mplayer[jpeg]
+ )
+ matroska? ( media-video/mkvtoolnix )
+ mp3? ( media-sound/lame )
+ mp4? ( >=media-video/gpac-0.4.2 )
+ ogm? ( media-sound/ogmtools )
+ spell? ( >=app-text/enchant-1.1.0 )
+ srt? ( ||
+ (
+ ( >=app-text/tesseract-2 media-libs/tiff )
+ >=app-text/gocr-0.39
+ >=app-text/ocrad-0.15
+ )
+ media-libs/libpng )
+ theora? ( media-libs/libtheora )
+ vorbis? ( media-sound/vorbis-tools )"
+RDEPEND="${COMMON_DEPEND}
+ gnome-base/gvfs"
+DEPEND="${COMMON_DEPEND}
+ nls? ( sys-devel/gettext
+ dev-util/intltool )
+ dev-util/pkgconfig"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog README TODO"
+
+ G2CONF="
+ $(use_enable gtk gtk-support)
+ $(use_enable dbus dbus-support)
+ $(use_enable spell enchant-support)
+ $(use_enable ogm ogm-support)
+ $(use_enable matroska mkv-support)
+ $(use_enable mp4 mp4-support)
+ $(use_enable xvid xvid-support)
+ $(use_enable x264 x264-support)
+ $(use_enable theora theora-support)
+ $(use_enable vorbis vorbis-support)
+ $(use_enable mp3 mp3-support)
+ $(use_enable aac aac-support)
+ $(use_enable srt srt-support)
+ $(use_enable static-libs static)
+ $(use_enable libnotify libnotify-support)
+ $(use_enable nls)
+ --with-html-dir=/usr/share/doc/${PF}/html"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-deprecated.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_install() {
+ # bug #317607
+ MAKEOPTS="${MAKEOPTS} -j1" \
+ gnome2_src_install
+ remove_libtool_files all
+}
diff --git a/metadata/cache/app-misc/pfm-2.12.0 b/metadata/cache/app-misc/pfm-2.12.0
new file mode 100644
index 000000000000..702944dd6e5d
--- /dev/null
+++ b/metadata/cache/app-misc/pfm-2.12.0
@@ -0,0 +1,22 @@
+dev-lang/perl[-build]
+>=dev-lang/perl-5.8 >=dev-perl/File-Stat-Bits-1.10.0 >=dev-perl/HTML-Parser-3.59 >=dev-perl/libwww-perl-5.827 >=dev-perl/Term-ReadLine-Gnu-1.09 >=dev-perl/Term-Screen-1.30.0 >=dev-perl/Term-ScreenColor-1.130.0 sys-libs/ncurses sys-libs/readline >=virtual/perl-File-Temp-0.22 >=virtual/perl-Module-Load-0.16 dev-lang/perl[-build]
+0
+mirror://sourceforge/p-f-m/pfm-2.12.0.tar.gz
+
+http://p-f-m.sourceforge.net/
+GPL-2
+A terminal-based file manager written in Perl
+~amd64 ~x86
+base eutils multilib perl-app perl-module portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-text/llpp-0_p20110504 b/metadata/cache/app-text/llpp-0_p20110504
deleted file mode 100644
index 54afb6484fac..000000000000
--- a/metadata/cache/app-text/llpp-0_p20110504
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-text/mupdf-0.8.165 dev-ml/lablgl[glut] media-libs/jbig2dec media-libs/openjpeg x11-misc/xsel
->=app-text/mupdf-0.8.165 dev-ml/lablgl[glut] media-libs/jbig2dec media-libs/openjpeg x11-misc/xsel
-0
-mirror://gentoo/llpp-0_p20110504.tar.bz2
-
-http://repo.or.cz/w/llpp.git
-GPL-3
-a graphical PDF viewer which aims to superficially resemble less(1)
-amd64 x86
-multilib toolchain-funcs
-
-
-
-
-3
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/app-text/llpp-5 b/metadata/cache/app-text/llpp-5
deleted file mode 100644
index f5ca70e275bc..000000000000
--- a/metadata/cache/app-text/llpp-5
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-text/mupdf-0.8.165 dev-ml/lablgl[glut] media-libs/jbig2dec media-libs/openjpeg x11-misc/xsel
->=app-text/mupdf-0.8.165 dev-ml/lablgl[glut] media-libs/jbig2dec media-libs/openjpeg x11-misc/xsel
-0
-mirror://gentoo/llpp-5.tar.gz
-
-http://repo.or.cz/w/llpp.git
-GPL-3
-a graphical PDF viewer which aims to superficially resemble less(1)
-~amd64 ~x86
-multilib toolchain-funcs
-
-
-
-
-3
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/dev-db/mongodb-1.8.2-r1 b/metadata/cache/dev-db/mongodb-1.8.2-r1
deleted file mode 100644
index f8929376a392..000000000000
--- a/metadata/cache/dev-db/mongodb-1.8.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!v8? ( =dev-lang/spidermonkey-1.8.2* ) v8? ( dev-lang/v8 ) dev-libs/boost dev-libs/libpcre[cxx] net-libs/libpcap sys-libs/readline sys-libs/ncurses >=dev-util/scons-1.2.0
-!v8? ( =dev-lang/spidermonkey-1.8.2* ) v8? ( dev-lang/v8 ) dev-libs/boost dev-libs/libpcre[cxx] net-libs/libpcap
-0
-http://downloads.mongodb.org/src/mongodb-src-r1.8.2.tar.gz
-
-http://www.mongodb.org
-AGPL-3 Apache-2.0
-A high-performance, open source, schema-free document-oriented database
-~amd64 ~x86
-eutils multilib portability scons-utils toolchain-funcs user versionator
-static-libs v8
-
-
-
-4
-
-compile install postinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/dev-db/mongodb-2.0.2_pre20111116 b/metadata/cache/dev-db/mongodb-2.0.2_rc0
similarity index 75%
rename from metadata/cache/dev-db/mongodb-2.0.2_pre20111116
rename to metadata/cache/dev-db/mongodb-2.0.2_rc0
index ef108fe86aac..8507a49915e2 100644
--- a/metadata/cache/dev-db/mongodb-2.0.2_pre20111116
+++ b/metadata/cache/dev-db/mongodb-2.0.2_rc0
@@ -1,7 +1,7 @@
!v8? ( =dev-util/scons-1.2.0
!v8? ( mongodb-src-r2.0.2_pre20111116.tar.gz mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )
+https://github.com/mongodb/mongo/tarball/ada33ce4be46e634e8ac9b727167b2173f90f5c8 -> mongodb-src-r2.0.2-rc0.tar.gz mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )
http://www.mongodb.org
AGPL-3 Apache-2.0
diff --git a/metadata/cache/dev-embedded/msp430mcu-20111107 b/metadata/cache/dev-embedded/msp430mcu-20111107
new file mode 100644
index 000000000000..3c2d03354f84
--- /dev/null
+++ b/metadata/cache/dev-embedded/msp430mcu-20111107
@@ -0,0 +1,22 @@
+
+
+0
+mirror://sourceforge/mspgcc/msp430mcu-20111107.tar.bz2
+
+http://mspgcc.sourceforge.net
+BSD
+MCU-specific data for MSP430 microcontrollers
+~amd64 ~x86
+
+
+
+
+
+4
+
+install
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/v8-3.5.10.23 b/metadata/cache/dev-lang/v8-3.5.10.23
deleted file mode 100644
index ddb61b66adc9..000000000000
--- a/metadata/cache/dev-lang/v8-3.5.10.23
+++ /dev/null
@@ -1,22 +0,0 @@
-readline? ( >=sys-libs/readline-6.1 ) dev-util/scons
-readline? ( >=sys-libs/readline-6.1 )
-0
-http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.5.10.23.tar.bz2
-
-http://code.google.com/p/v8
-BSD
-Google's open source JavaScript engine
-amd64 ~arm x86 ~x64-macos ~x86-macos
-eutils flag-o-matic multilib pax-utils portability scons-utils toolchain-funcs user
-readline
-
-
-
-3
-
-compile configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/dev-lang/v8-3.5.10.24 b/metadata/cache/dev-lang/v8-3.5.10.24
index 8e8fc6c3187b..5a7cd9c6c855 100644
--- a/metadata/cache/dev-lang/v8-3.5.10.24
+++ b/metadata/cache/dev-lang/v8-3.5.10.24
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.5.10.24.t
http://code.google.com/p/v8
BSD
Google's open source JavaScript engine
-amd64 ~arm ~x86 ~x64-macos ~x86-macos
+amd64 ~arm x86 ~x64-macos ~x86-macos
eutils flag-o-matic multilib pax-utils portability scons-utils toolchain-funcs user
readline
diff --git a/metadata/cache/dev-lang/vala-0.14.0 b/metadata/cache/dev-lang/vala-0.14.0
index 0dfadeed2968..9a5cb20bca43 100644
--- a/metadata/cache/dev-lang/vala-0.14.0
+++ b/metadata/cache/dev-lang/vala-0.14.0
@@ -6,7 +6,7 @@ mirror://gnome/sources/vala/0.14/vala-0.14.0.tar.xz
http://live.gnome.org/Vala
LGPL-2.1
Vala - Compiler for the GObject type system
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-linux
+alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-linux
alternatives eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
test +vapigen
diff --git a/metadata/cache/dev-libs/libyaml-0.1.3 b/metadata/cache/dev-libs/libyaml-0.1.3
index 1e3ba81353c3..5654f92f3f70 100644
--- a/metadata/cache/dev-libs/libyaml-0.1.3
+++ b/metadata/cache/dev-libs/libyaml-0.1.3
@@ -6,7 +6,7 @@ http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz
http://pyyaml.org/wiki/LibYAML
MIT
YAML 1.1 parser and emitter written in C
-~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
eutils multilib portability toolchain-funcs user
doc examples test
diff --git a/metadata/cache/dev-perl/File-Stat-Bits-1.10.0 b/metadata/cache/dev-perl/File-Stat-Bits-1.10.0
new file mode 100644
index 000000000000..d7840c1abdee
--- /dev/null
+++ b/metadata/cache/dev-perl/File-Stat-Bits-1.10.0
@@ -0,0 +1,22 @@
+dev-lang/perl[-build]
+dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/F/FE/FEDOROV/File-Stat-Bits-1.01.tar.gz
+
+http://search.cpan.org/dist/File-Stat-Bits/
+|| ( GPL-2 GPL-3 )
+File stat bit mask constants
+~amd64 ~x86
+base eutils multilib perl-module portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Term-Screen-1.30.0 b/metadata/cache/dev-perl/Term-Screen-1.30.0
new file mode 100644
index 000000000000..47f0236bd0b8
--- /dev/null
+++ b/metadata/cache/dev-perl/Term-Screen-1.30.0
@@ -0,0 +1,22 @@
+dev-lang/perl[-build]
+dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/J/JS/JSTOWE/Term-Screen-1.03.tar.gz
+
+http://search.cpan.org/dist/Term-Screen/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+A simple Term::Cap based screen positioning module
+~amd64 ~x86
+base eutils multilib perl-module portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Term-ScreenColor-1.200.0 b/metadata/cache/dev-perl/Term-ScreenColor-1.200.0
new file mode 100644
index 000000000000..08a51f23f443
--- /dev/null
+++ b/metadata/cache/dev-perl/Term-ScreenColor-1.200.0
@@ -0,0 +1,22 @@
+>=dev-perl/Term-Screen-1.30.0 dev-lang/perl[-build]
+>=dev-perl/Term-Screen-1.30.0 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/R/RU/RUITTENB/Term-ScreenColor-1.20.tar.gz
+
+http://search.cpan.org/dist/Term-ScreenColor/
+|| ( Artistic GPL-2 )
+A Term::Screen based screen positioning and coloring module
+~amd64 ~x86
+base eutils multilib perl-module portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-python/spyder-2.0.10 b/metadata/cache/dev-python/spyder-2.0.10
deleted file mode 100644
index 57fda162bf11..000000000000
--- a/metadata/cache/dev-python/spyder-2.0.10
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.0 ) scipy? ( sci-libs/scipy ) doc? ( dev-python/sphinx ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.0 ) scipy? ( sci-libs/scipy ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://spyderlib.googlecode.com/files/spyder-2.0.10.zip
-
-http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder
-MIT
-Python IDE with matlab-like features
-~amd64 ~x86
-distutils eutils multilib portability python toolchain-funcs user
-doc ipython matplotlib numpy +pyflakes pylint +rope scipy
-
-
-
-3
-
-compile install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-python/spyder-2.0.11 b/metadata/cache/dev-python/spyder-2.0.11
deleted file mode 100644
index 3ced63d4d833..000000000000
--- a/metadata/cache/dev-python/spyder-2.0.11
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.0 ) scipy? ( sci-libs/scipy ) doc? ( dev-python/sphinx ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.0 ) scipy? ( sci-libs/scipy ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://spyderlib.googlecode.com/files/spyder-2.0.11.zip
-
-http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder
-MIT
-Python IDE with matlab-like features
-~amd64 ~x86
-distutils eutils multilib portability python toolchain-funcs user
-doc ipython matplotlib numpy +pyflakes pylint +rope scipy
-
-
-
-3
-
-compile install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-python/spyder-2.0.8 b/metadata/cache/dev-python/spyder-2.1.2
similarity index 53%
rename from metadata/cache/dev-python/spyder-2.0.8
rename to metadata/cache/dev-python/spyder-2.1.2
index 0524db5e9f87..0eb57cf747e4 100644
--- a/metadata/cache/dev-python/spyder-2.0.8
+++ b/metadata/cache/dev-python/spyder-2.1.2
@@ -1,14 +1,14 @@
->=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.0 ) scipy? ( sci-libs/scipy ) doc? ( dev-python/sphinx ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.0 ) scipy? ( sci-libs/scipy ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.3 ) scipy? ( sci-libs/scipy ) pep8? ( dev-python/pep8 ) doc? ( dev-python/sphinx ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.3 ) scipy? ( sci-libs/scipy ) pep8? ( dev-python/pep8 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
0
-http://spyderlib.googlecode.com/files/spyder-2.0.8.zip
+http://spyderlib.googlecode.com/files/spyder-2.1.2.zip
http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder
MIT
Python IDE with matlab-like features
~amd64 ~x86
distutils eutils multilib portability python toolchain-funcs user
-doc ipython matplotlib numpy +pyflakes pylint +rope scipy
+doc ipython matplotlib numpy +pyflakes pylint +rope scipy pep8
diff --git a/metadata/cache/mail-mta/postfix-2.9_pre20111113 b/metadata/cache/mail-mta/postfix-2.9_pre20111117
similarity index 96%
rename from metadata/cache/mail-mta/postfix-2.9_pre20111113
rename to metadata/cache/mail-mta/postfix-2.9_pre20111117
index c58636e25153..d00725d6a5a1 100644
--- a/metadata/cache/mail-mta/postfix-2.9_pre20111113
+++ b/metadata/cache/mail-mta/postfix-2.9_pre20111117
@@ -1,7 +1,7 @@
>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
0
-ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.9-20111113.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.9-20111117.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
http://www.postfix.org/
IBM
diff --git a/metadata/cache/media-gfx/ristretto-0.2.1 b/metadata/cache/media-gfx/ristretto-0.2.1
deleted file mode 100644
index 50b2b763d509..000000000000
--- a/metadata/cache/media-gfx/ristretto-0.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libexif >=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=dev-libs/dbus-glib-0.90 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=x11-libs/cairo-1.8 dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
-media-libs/libexif >=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=dev-libs/dbus-glib-0.90 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=x11-libs/cairo-1.8
-0
-mirror://xfce/src/apps/ristretto/0.2/ristretto-0.2.1.tar.bz2
-
-http://goodies.xfce.org/projects/applications/ristretto
-GPL-2
-Image viewer and browser for Xfce4
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-autotools base eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user xfconf
-debug
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/ristretto-0.2.2 b/metadata/cache/media-gfx/ristretto-0.2.2
deleted file mode 100644
index 204316cc71fe..000000000000
--- a/metadata/cache/media-gfx/ristretto-0.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libexif >=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=dev-libs/dbus-glib-0.90 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=x11-libs/cairo-1.8 dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
-media-libs/libexif >=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.24:2 >=dev-libs/dbus-glib-0.90 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=x11-libs/cairo-1.8
-0
-mirror://xfce/src/apps/ristretto/0.2/ristretto-0.2.2.tar.bz2
-
-http://goodies.xfce.org/projects/applications/ristretto
-GPL-2
-Image viewer and browser for Xfce4
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-autotools base eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user xfconf
-debug
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/shared-color-profiles-0.1.4 b/metadata/cache/media-gfx/shared-color-profiles-0.1.4
index 88dd5ad800b5..0b8155ee2a82 100644
--- a/metadata/cache/media-gfx/shared-color-profiles-0.1.4
+++ b/metadata/cache/media-gfx/shared-color-profiles-0.1.4
@@ -6,7 +6,7 @@ http://people.freedesktop.org/~hughsient/releases/shared-color-profiles-0.1.4.ta
https://github.com/hughsie/shared-color-profiles
GPL-2 MIT ZLIB public-domain
Color profiles from contributors for color calibration
-~amd64 ~arm ~hppa ~x86
+~amd64 ~arm ~hppa ~x86 ~x86-fbsd
diff --git a/metadata/cache/media-libs/freetype-2.4.8 b/metadata/cache/media-libs/freetype-2.4.8
index 579827eb4aef..d3eff5767838 100644
--- a/metadata/cache/media-libs/freetype-2.4.8
+++ b/metadata/cache/media-libs/freetype-2.4.8
@@ -6,7 +6,7 @@ mirror://sourceforge/freetype/freetype-2.4.8.tar.bz2 utils? ( mirror://sourcefor
http://www.freetype.org/
FTL GPL-2
A high-quality and portable font engine
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
autotools autotools-utils base eutils flag-o-matic libtool multilib portability toolchain-funcs user
X auto-hinter bindist bzip2 debug doc fontforge static-libs utils
diff --git a/metadata/cache/media-sound/abcm2ps-6.5.7 b/metadata/cache/media-sound/abcm2ps-6.5.12
similarity index 64%
rename from metadata/cache/media-sound/abcm2ps-6.5.7
rename to metadata/cache/media-sound/abcm2ps-6.5.12
index 7e1e3543b831..cdbb912091c1 100644
--- a/metadata/cache/media-sound/abcm2ps-6.5.7
+++ b/metadata/cache/media-sound/abcm2ps-6.5.12
@@ -1,7 +1,7 @@
0
-http://moinejf.free.fr/abcm2ps-6.5.7.tar.gz http://moinejf.free.fr/transpose_abc.pl
+http://moinejf.free.fr/abcm2ps-6.5.12.tar.gz http://moinejf.free.fr/transpose_abc.pl
http://moinejf.free.fr/
GPL-2
diff --git a/metadata/cache/media-video/h264enc-9.3.7 b/metadata/cache/media-video/h264enc-9.4.1
similarity index 91%
rename from metadata/cache/media-video/h264enc-9.3.7
rename to metadata/cache/media-video/h264enc-9.4.1
index 94016c85aa07..626914cabc63 100644
--- a/metadata/cache/media-video/h264enc-9.3.7
+++ b/metadata/cache/media-video/h264enc-9.4.1
@@ -1,7 +1,7 @@
media-video/mplayer[encode,x264] sys-apps/coreutils sys-apps/pv sys-devel/bc sys-process/time aac? ( media-libs/faac media-sound/aacplusenc ) dvd? ( media-video/lsdvd ) flac? ( media-libs/flac ) lame? ( media-sound/lame ) matroska? ( media-video/mkvtoolnix ) mp4? ( >=media-video/gpac-0.4.5[a52] ) ogm? ( media-sound/ogmtools ) vorbis? ( media-sound/vorbis-tools )
0
-mirror://sourceforge/h264enc/h264enc-9.3.7.tar.gz
+mirror://sourceforge/h264enc/h264enc-9.4.1.tar.gz
http://h264enc.sourceforge.net/
GPL-2
diff --git a/metadata/cache/media-video/ogmrip-0.13.7 b/metadata/cache/media-video/ogmrip-0.13.7
new file mode 100644
index 000000000000..c9c33a6ba2d4
--- /dev/null
+++ b/metadata/cache/media-video/ogmrip-0.13.7
@@ -0,0 +1,22 @@
+>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) gnome-base/gvfs
+0
+mirror://sourceforge/ogmrip/ogmrip-0.13.7.tar.gz
+
+http://ogmrip.sourceforge.net/
+LGPL-2.1
+Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4
+~amd64 ~ppc ~ppc64 ~x86
+autotools autotools-utils base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt static-libs theora vorbis x264 xvid
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/nb-0.8.3 b/metadata/cache/net-analyzer/nb-0.8.3
index f45c928d86cd..c38fd97839bc 100644
--- a/metadata/cache/net-analyzer/nb-0.8.3
+++ b/metadata/cache/net-analyzer/nb-0.8.3
@@ -1,4 +1,4 @@
-dev-lang/perl || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+dev-lang/perl sys-apps/texinfo || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
!sys-boot/netboot !www-apps/nanoblogger
0
mirror://sourceforge/nodebrain/nodebrain-0.8.3.tar.gz
diff --git a/metadata/cache/net-mail/dovecot-2.0.16 b/metadata/cache/net-mail/dovecot-2.0.16
index fdb1d47b1fc0..bab81b296c20 100644
--- a/metadata/cache/net-mail/dovecot-2.0.16
+++ b/metadata/cache/net-mail/dovecot-2.0.16
@@ -6,7 +6,7 @@ http://dovecot.org/releases/2.0/dovecot-2.0.16.tar.gz sieve? ( http://www.rename
http://www.dovecot.org/
LGPL-2.1 MIT
An IMAP and POP3 server written with security primarily in mind
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
autotools autotools-utils base eutils libtool multilib portability ssl-cert toolchain-funcs user versionator
bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib ssl
diff --git a/metadata/cache/sys-apps/pkgcore-0.7.5-r2 b/metadata/cache/sys-apps/pkgcore-0.7.5-r2
new file mode 100644
index 000000000000..58d5b46f8827
--- /dev/null
+++ b/metadata/cache/sys-apps/pkgcore-0.7.5-r2
@@ -0,0 +1,22 @@
+>=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.4 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) doc? ( dev-python/sphinx dev-python/pyparsing ) >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-lang/python-2.4 >=dev-python/snakeoil-0.4.4 || ( >=dev-lang/python-2.5 dev-python/pycrypto ) >=app-admin/eselect-python-20091230 dev-lang/python
+0
+http://pkgcore.googlecode.com/files/pkgcore-0.7.5.tar.bz2
+
+http://pkgcore.googlecode.com/
+GPL-2
+pkgcore package manager
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+distutils eutils multilib portability python toolchain-funcs user
+-doc build
+
+
+
+3
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/ncdu-1.3 b/metadata/cache/sys-fs/ncdu-1.3
deleted file mode 100644
index ed075a090a62..000000000000
--- a/metadata/cache/sys-fs/ncdu-1.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses
-sys-libs/ncurses
-0
-http://dev.yorhel.nl/download/ncdu-1.3.tar.gz
-
-http://dev.yorhel.nl/ncdu/
-MIT
-NCurses Disk Usage
-amd64 ~ppc sparc x86
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/ncdu-1.6 b/metadata/cache/sys-fs/ncdu-1.6
deleted file mode 100644
index f30edb9502a4..000000000000
--- a/metadata/cache/sys-fs/ncdu-1.6
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses
-sys-libs/ncurses
-0
-http://dev.yorhel.nl/download/ncdu-1.6.tar.gz
-
-http://dev.yorhel.nl/ncdu/
-MIT
-NCurses Disk Usage
-amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/ncdu-1.5 b/metadata/cache/sys-fs/ncdu-1.8
similarity index 50%
rename from metadata/cache/sys-fs/ncdu-1.5
rename to metadata/cache/sys-fs/ncdu-1.8
index 2eedc9f32568..8ae5e52e86ae 100644
--- a/metadata/cache/sys-fs/ncdu-1.5
+++ b/metadata/cache/sys-fs/ncdu-1.8
@@ -1,18 +1,18 @@
sys-libs/ncurses
sys-libs/ncurses
0
-http://dev.yorhel.nl/download/ncdu-1.5.tar.gz
+http://dev.yorhel.nl/download/ncdu-1.8.tar.gz
http://dev.yorhel.nl/ncdu/
MIT
NCurses Disk Usage
-~amd64 ~ppc ~sparc ~x86
-
+~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+4
install
diff --git a/metadata/cache/sys-power/phc-k8-0.4.3 b/metadata/cache/sys-power/phc-k8-0.4.3
index a28e86ed23d2..2fb32bec0f8d 100644
--- a/metadata/cache/sys-power/phc-k8-0.4.3
+++ b/metadata/cache/sys-power/phc-k8-0.4.3
@@ -12,9 +12,9 @@ kernel_linux
-2
+4
-compile install postinst postrm preinst setup
+compile install postinst postrm preinst pretend setup
diff --git a/metadata/cache/sys-power/phc-k8-0.4.4 b/metadata/cache/sys-power/phc-k8-0.4.4
new file mode 100644
index 000000000000..d556a00ea615
--- /dev/null
+++ b/metadata/cache/sys-power/phc-k8-0.4.4
@@ -0,0 +1,22 @@
+kernel_linux? ( sys-apps/module-init-tools ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+kernel_linux? ( sys-apps/module-init-tools )
+0
+http://www.linux-phc.org/forum/download/file.php?id=124 -> phc-k8-0.4.4.tar.gz
+
+http://www.linux-phc.org/
+GPL-2
+Processor Hardware Control for AMD K8 CPUs
+~amd64 ~x86
+eutils linux-info linux-mod multilib portability toolchain-funcs user versionator
+kernel_linux
+
+
+
+4
+
+compile install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/www-client/chromium-15.0.874.120 b/metadata/cache/www-client/chromium-15.0.874.120
deleted file mode 100644
index 832ad7aff34f..000000000000
--- a/metadata/cache/www-client/chromium-15.0.874.120
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/bzip2 dev-libs/dbus-glib >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib dev-python/simplejson ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 dev-libs/dbus-glib >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-15.0.874.120.tar.bz2
-
-http://chromium.org/
-BSD
-Open-source version of Google Chrome web browser
-amd64 x86
-eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
-bindist cups gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/www-client/chromium-15.0.874.121 b/metadata/cache/www-client/chromium-15.0.874.121
index 4e3bdcaa9f2c..6b7ec2e062e6 100644
--- a/metadata/cache/www-client/chromium-15.0.874.121
+++ b/metadata/cache/www-client/chromium-15.0.874.121
@@ -6,7 +6,7 @@ http://commondatastorage.googleapis.com/chromium-browser-official/chromium-15.0.
http://chromium.org/
BSD
Open-source version of Google Chrome web browser
-amd64 ~x86
+amd64 x86
eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
bindist cups gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
diff --git a/metadata/cache/www-client/google-chrome-17.0.938.0_alpha109848 b/metadata/cache/www-client/google-chrome-17.0.942.0_alpha110446
similarity index 91%
rename from metadata/cache/www-client/google-chrome-17.0.938.0_alpha109848
rename to metadata/cache/www-client/google-chrome-17.0.942.0_alpha110446
index 3c5606c44e1e..924a2805d8d6 100644
--- a/metadata/cache/www-client/google-chrome-17.0.938.0_alpha109848
+++ b/metadata/cache/www-client/google-chrome-17.0.942.0_alpha110446
@@ -1,7 +1,7 @@
>=sys-apps/sed-4
app-arch/bzip2 app-misc/ca-certificates media-libs/alsa-lib dev-libs/atk dev-libs/dbus-glib dev-libs/expat dev-libs/glib:2 dev-libs/libxslt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype net-print/cups media-libs/libpng:1.2 sys-apps/dbus || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXrender x11-libs/libXext x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:stable
unstable
-amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_17.0.938.0-r109848_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_17.0.938.0-r109848_i386.deb )
+amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_17.0.942.0-r110446_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_17.0.942.0-r110446_i386.deb )
mirror strip
http://www.google.com/chrome
google-chrome
diff --git a/metadata/cache/x11-libs/vte-0.28.2-r201 b/metadata/cache/x11-libs/vte-0.28.2-r202
similarity index 100%
rename from metadata/cache/x11-libs/vte-0.28.2-r201
rename to metadata/cache/x11-libs/vte-0.28.2-r202
diff --git a/metadata/cache/x11-libs/vte-0.30.1-r1 b/metadata/cache/x11-libs/vte-0.30.1-r2
similarity index 100%
rename from metadata/cache/x11-libs/vte-0.30.1-r1
rename to metadata/cache/x11-libs/vte-0.30.1-r2
diff --git a/metadata/cache/x11-misc/i3status-2.3 b/metadata/cache/x11-misc/i3status-2.3
index c638ffbfd88c..b5bfb538b686 100644
--- a/metadata/cache/x11-misc/i3status-2.3
+++ b/metadata/cache/x11-misc/i3status-2.3
@@ -7,7 +7,7 @@ http://i3wm.org/i3status/
BSD
generates a status bar for dzen2, xmobar or similar
~amd64 ~x86
-multilib toolchain-funcs
+eutils multilib portability toolchain-funcs user versionator
+caps
diff --git a/metadata/cache/x11-misc/read-edid-2.0.0 b/metadata/cache/x11-misc/read-edid-2.0.0
deleted file mode 100644
index 8fac051ed917..000000000000
--- a/metadata/cache/x11-misc/read-edid-2.0.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libx86-1.1
->=dev-libs/libx86-1.1
-0
-http://www.polypux.org/projects/read-edid/read-edid-2.0.0.tar.gz
-
-http://www.polypux.org/projects/read-edid/
-GPL-2
-Program that can get information from a PnP monitor
--* ~amd64 ~x86
-
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a0039650d593..0dc3dec02ede 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Nov 2011 01:06:43 +0000
+Fri, 18 Nov 2011 11:36:43 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a0039650d593..2436364cce8b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Nov 2011 01:06:43 +0000
+Fri, 18 Nov 2011 11:36:44 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e6921e1757e6..f8284facf1b1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Nov 2011 01:06:44 +0000
+Fri, 18 Nov 2011 11:36:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 669f67fafd6e..c7646af9da26 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov 18 01:06:43 UTC 2011
+Fri Nov 18 11:36:43 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e6f9511cac80..1fb3bb1b49eb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 18 Nov 2011 01:30:01 +0000
+Fri, 18 Nov 2011 12:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c75fa62399c7..91f707ef30aa 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1321578301 Fri Nov 18 01:05:01 2011 UTC
+1321616101 Fri Nov 18 11:35:01 2011 UTC
diff --git a/net-analyzer/nb/files/nb-0.8.3-configure.patch b/net-analyzer/nb/files/nb-0.8.3-configure.patch
new file mode 100644
index 000000000000..645c80d0279b
--- /dev/null
+++ b/net-analyzer/nb/files/nb-0.8.3-configure.patch
@@ -0,0 +1,49 @@
+1) Use pkg-config to figure out openssl libraries (also fixes underlinking with
+ ld.gold, bug #371893).
+2) Respect CFLAGS/LDFLAGS.
+
+-jer
+
+
+--- a/lib/configure.ac
++++ b/lib/configure.ac
+@@ -113,7 +113,7 @@
+ AC_CHECK_LIB([pcre],[pcre_compile],,[AC_MSG_ERROR(Required library -lpcre not found. You may want to download it from http://www.pcre.org or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
+ AC_CHECK_LIB([readline],[readline],,[AC_MSG_ERROR(Required library -lreadline not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
+ AC_CHECK_LIB(history,add_history,,[AC_MSG_ERROR(Required library -lhistory not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
+-AC_CHECK_LIB(ssl,SSL_library_init,,[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
++PKG_CHECK_MODULES(libssl,openssl,LIBS="$LIBS `$PKG_CONFIG --cflags --libs openssl`",[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://www.openssl.org/ or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
+
+ AC_SEARCH_LIBS(socket,socket)
+ AC_SEARCH_LIBS(inet_ntoa,nsl)
+@@ -152,8 +152,6 @@
+ # define a release date variable
+ AC_DEFINE_UNQUOTED(NB_COMPILE_PLATFORM,"$host",[Define compile platform])
+
+-CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include"
+-LDFLAGS="-L/usr/local/ssl/lib"
+ case "$host" in
+ *-netbsd*)
+ AC_DEFINE(NETBSD,,[Define if NetBSD])
+--- a/module/configure.ac
++++ b/module/configure.ac
+@@ -100,8 +100,6 @@
+
+ AC_SUBST([NB_MOD_PATH],[../.libs])
+
+-CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include"
+-LDFLAGS="-L/usr/local/ssl/lib"
+
+ #=====================================
+ # Checks for header files.
+--- a/module/webster/configure.ac
++++ b/module/webster/configure.ac
+@@ -87,8 +87,6 @@
+ # AC_PATH_PROGS([NB],[nb-0.7.5 nb-0.7.4 nb-0.7.3 nb-0.7.2 nb-0.7.1 nb])
+ #fi
+
+-CFLAGS="-I/usr/local/include -I/usr/local/ssl/include"
+-LDFLAGS="-L/usr/local/ssl/lib"
+
+ #=====================================
+ # Checks for libraries.
diff --git a/net-analyzer/nb/nb-0.8.3.ebuild b/net-analyzer/nb/nb-0.8.3.ebuild
index 68c1b729be61..7047d33016c5 100644
--- a/net-analyzer/nb/nb-0.8.3.ebuild
+++ b/net-analyzer/nb/nb-0.8.3.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/net-analyzer/nb/nb-0.8.3.ebuild,v 1.2 2011/10/27 18:42:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.3.ebuild,v 1.3 2011/11/18 04:34:54 jer Exp $
EAPI="3"
-inherit autotools-utils
+inherit autotools autotools-utils eutils
DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
HOMEPAGE="http://nodebrain.sourceforge.net/"
@@ -15,7 +15,10 @@ SLOT="0"
KEYWORDS="~ppc ~x86"
IUSE="static-libs"
-DEPEND="dev-lang/perl"
+DEPEND="
+ dev-lang/perl
+ sys-apps/texinfo
+"
RDEPEND="
!sys-boot/netboot
!www-apps/nanoblogger
@@ -24,13 +27,16 @@ RDEPEND="
S="${WORKDIR}/nodebrain-${PV}"
src_prepare() {
- # Prevent make from rebuilding this target, since
- # fdl.texi is not included in the distribution
- touch doc/nbTutorial/nbTutorial.info || die
+ epatch "${FILESDIR}"/${P}-configure.patch
+
+ # fdl.texi is not included in the sources
+ sed -i doc/nbTutorial/nbTutorial.texi -e '/@include fdl.texi/d' || die
+
+ eautoreconf
}
src_configure() {
- econf $(use_enable static-libs static)
+ econf $(use_enable static-libs static) --include=/usr/include
}
src_compile() {
@@ -39,7 +45,6 @@ src_compile() {
}
src_install() {
- #DIR="${D}/usr" ./install-nb || die "install failed"
emake DESTDIR="${D}" install || die
use static-libs || remove_libtool_files
dodoc AUTHORS NEWS README THANKS sample/*
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
index e49884844df6..892a487c398c 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70.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-analyzer/snortsam/snortsam-2.70.ebuild,v 1.1 2011/07/31 12:56:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.70.ebuild,v 1.3 2011/11/18 05:09:16 jer Exp $
EAPI="2"
@@ -20,10 +20,15 @@ IUSE=""
S=${WORKDIR}/${PN}
src_prepare() {
- sed -i -e "s:sbin/functions.sh:etc/init.d/functions.sh:" \
- -e "s: -O2 : ${CFLAGS} :" \
- -e "s:gcc :$(tc-getCC) :" \
- -e "s:\( -o ../snortsam\): ${LDFLAGS}\1:" makesnortsam.sh || die "sed failed"
+ sed -i makesnortsam.sh \
+ -e "s:sbin/functions.sh:etc/init.d/functions.sh:" \
+ -e "s:-O2 : ${CFLAGS} :" \
+ -e "s:gcc :$(tc-getCC) :" \
+ -e "/^LDFLAGS=/d" \
+ -e "s:\( -o ../snortsam\): ${LDFLAGS}\1:" \
+ -e "s:\${SSP_LINUX_SRC} -o \${SNORTSAM}:& \${LINUX_LDFLAGS}:" \
+ || die "sed failed"
+
find "${S}" -depth -type d -name CVS -exec rm -rf \{\} \;
}
diff --git a/net-mail/dovecot/dovecot-2.0.16.ebuild b/net-mail/dovecot/dovecot-2.0.16.ebuild
index 1a8cd3246dd8..8b4a783b8633 100644
--- a/net-mail/dovecot/dovecot-2.0.16.ebuild
+++ b/net-mail/dovecot/dovecot-2.0.16.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-mail/dovecot/dovecot-2.0.16.ebuild,v 1.2 2011/11/17 15:49:39 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.0.16.ebuild,v 1.3 2011/11/18 05:23:15 jer Exp $
EAPI=4
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.dovecot.org/"
SLOT="0"
LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="bzip2 caps cydir sdbox doc ipv6 kerberos ldap +maildir managesieve mbox
mdbox mysql pam postgres sieve sqlite +ssl static-libs suid vpopmail zlib"
diff --git a/profiles/package.mask b/profiles/package.mask
index c01147c61faf..2ae153ba453d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13253 2011/11/18 00:05:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13254 2011/11/18 09:36:00 chainsaw Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,10 +31,6 @@
#--- END OF EXAMPLES ---
-# Tony Vroon (15 Nov 2011)
-# Fails to load any modules on hardened, needs more love
-=net-misc/asterisk-10.0.0*
-
# Christoph Junghans (15 Nov 2011)
# current version of google-talkplugin never clear what you get
=www-plugins/google-talkplugin-9999
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a0ff91fae403..0472f3f59e16 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1412,6 +1412,7 @@ dev-python/scrapy:ibl - Use Instace Based Learning alrogirithm for automatic ext
dev-python/spyder:ipython - Add support for dev-python/ipython
dev-python/spyder:matplotlib - Add support for dev-python/matplotlib
dev-python/spyder:numpy - Add support for dev-python/numpy
+dev-python/spyder:pep8 - Add support for dev-python/pep8
dev-python/spyder:pyflakes - Add support for dev-python/pyflakes
dev-python/spyder:pylint - Add support for dev-python/pylint
dev-python/spyder:rope - Add support for sci-libs/rope
diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch b/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch
new file mode 100644
index 000000000000..3f5896794725
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.7.5-dosym.patch
@@ -0,0 +1,33 @@
+From 87e10f2a3b5d9867c104ffb4ed023bff0a64f218 Mon Sep 17 00:00:00 2001
+From: Brian Harring
+Date: Thu, 17 Nov 2011 16:27:30 -0800
+Subject: [PATCH] allow dosym some-file directory/ despite PMS
+
+This conflicts with PMS (gentoo bug 379899), but neither the usage nor
+spec is being corrected to rectify it. Rather than break things for
+users, we now allow it.
+---
+ pkgcore/ebuild/eapi-bash/helpers/common/dohard | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/pkgcore/ebuild/eapi-bash/helpers/common/dohard b/pkgcore/ebuild/eapi-bash/helpers/common/dohard
+index 13ebeda..d00946f 100755
+--- a/pkgcore/ebuild/eapi-bash/helpers/common/dohard
++++ b/pkgcore/ebuild/eapi-bash/helpers/common/dohard
+@@ -8,9 +8,10 @@ check_args 2
+ ln_option=
+ src_prefix=
+ if [[ ${HELPER_NAME} == dosym ]]; then
+- # T while nonportable, is to ensure that if there is a directory
+- # conflict, it doesn't just create the sym w/in
+- ln_option=snT
++ ln_option=sn
++ if [[ ${2} == */ ]] || [[ -d $2 && ! -L $2 ]]; then
++ echo "QA: dosym target '$2' omits the filename target; see bug 379899" >&2
++ fi
+ else
+ src_prefix="${D}"
+ fi
+--
+1.7.8.rc1
+
diff --git a/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..3e834b935745
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.5-r2.ebuild,v 1.1 2011/11/18 04:04:58 ferringb Exp $
+
+EAPI="3"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils eutils
+
+DESCRIPTION="pkgcore package manager"
+HOMEPAGE="http://pkgcore.googlecode.com/"
+SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="-doc build"
+
+RDEPEND=">=dev-lang/python-2.4
+ >=dev-python/snakeoil-0.4.4
+ || ( >=dev-lang/python-2.5 dev-python/pycrypto )"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx dev-python/pyparsing )"
+
+DOCS="AUTHORS NEWS"
+
+pkg_setup() {
+ # disable snakeoil 2to3 caching...
+ unset PY2TO3_CACHEDIR
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "$FILESDIR/"$PN-$PV-force-python-binary.patch
+ epatch "$FILESDIR/"$PN-$PV-dosym.patch
+}
+
+src_compile() {
+ distutils_src_compile
+
+ if use doc; then
+ python setup.py build_docs || die "doc building failed"
+ fi
+}
+
+src_install() {
+ distutils_src_install
+
+ if use doc; then
+ dohtml -r build/sphinx/html/*
+ fi
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+ pplugincache
+
+ if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then
+ elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1."
+ elog "It is unused by pkgcore >= 0.2, remove it now."
+ die "remove /etc/pkgcore/plugins from pkgcore 0.1"
+ fi
+
+ # This is left behind by pkgcore 0.2.
+ rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache
+}
+
+pkg_postrm() {
+ # Careful not to remove this on up/downgrades.
+ local sitep="${ROOT}"$(python_get_sitedir)/site-packages
+ if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
+ ! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
+ rm "${sitep}/pkgcore/plugins/plugincache2"
+ fi
+ distutils_pkg_postrm
+}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 96034ec1f365..dad7f587db43 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,4 +1,2 @@
-DIST ncdu-1.3.tar.gz 98022 RMD160 b053ad48ec09eab39d9a383d9c3b2dc973d39ead SHA1 63c8327ab9a443d49f533fd5d64ad51fb228af2e SHA256 f556a4b07c07bb66eabb5f2a20b3c52ea22020a68f2b5302d03e7b93b0ffee54
-DIST ncdu-1.5.tar.gz 99040 RMD160 0b3339975b149f7dccbb624ec88d4a5b4f3050cb SHA1 355c6837acb372edb02fe8fb81bdef1ab20656c6 SHA256 f63292b80d0eae4968624eade660bb42c3180890d7ca887a5470f3d75bae8e08
-DIST ncdu-1.6.tar.gz 104265 RMD160 db2a9ea80d36b20a21e2950e7caac01c95719d0c SHA1 8de9954c119045ed01e447aac9a5def4de1a56fb SHA256 0922916eab6371adb2f7a567bf4477c0a738910e799dbdf477f30d138eff470c
DIST ncdu-1.7.tar.gz 109606 RMD160 3a11226c652dc7329d1b78efa6511887162f8754 SHA1 56fae723a6fe07b05731f111c53f9631a93989f6 SHA256 70dfe10b4c0843050ee17ab27b7ad4d65714682f117079b85d779f83431fb333
+DIST ncdu-1.8.tar.gz 114648 RMD160 37ffe863e66cb99c0398f68951296c4f7579c929 SHA1 3d98e78cf7035e32333d263d301d12e9b4352598 SHA256 42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099
diff --git a/sys-fs/ncdu/ncdu-1.3.ebuild b/sys-fs/ncdu/ncdu-1.3.ebuild
deleted file mode 100644
index 2fe46756fdbf..000000000000
--- a/sys-fs/ncdu/ncdu-1.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.3.ebuild,v 1.6 2009/01/09 19:41:25 josejx Exp $
-
-IUSE=""
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="http://dev.yorhel.nl/ncdu/"
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-DEPEND="sys-libs/ncurses"
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc README NEWS ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-1.6.ebuild b/sys-fs/ncdu/ncdu-1.6.ebuild
deleted file mode 100644
index 044f84ac5547..000000000000
--- a/sys-fs/ncdu/ncdu-1.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.6.ebuild,v 1.6 2010/11/19 17:42:34 jlec Exp $
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="http://dev.yorhel.nl/ncdu/"
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc README NEWS ChangeLog || die
-}
diff --git a/sys-fs/ncdu/ncdu-1.5.ebuild b/sys-fs/ncdu/ncdu-1.8.ebuild
similarity index 52%
rename from sys-fs/ncdu/ncdu-1.5.ebuild
rename to sys-fs/ncdu/ncdu-1.8.ebuild
index 0e3d34b48597..198dc7415cf3 100644
--- a/sys-fs/ncdu/ncdu-1.5.ebuild
+++ b/sys-fs/ncdu/ncdu-1.8.ebuild
@@ -1,17 +1,22 @@
-# 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/sys-fs/ncdu/ncdu-1.5.ebuild,v 1.1 2009/05/11 13:22:08 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.8.ebuild,v 1.1 2011/11/18 03:48:35 xmw Exp $
+
+EAPI=4
-IUSE=""
DESCRIPTION="NCurses Disk Usage"
HOMEPAGE="http://dev.yorhel.nl/ncdu/"
SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz"
+
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install
dodoc README NEWS ChangeLog
}
diff --git a/sys-power/phc-k8/Manifest b/sys-power/phc-k8/Manifest
index a10232acfaec..079480dc4bfe 100644
--- a/sys-power/phc-k8/Manifest
+++ b/sys-power/phc-k8/Manifest
@@ -1,2 +1,3 @@
DIST phc-k8-0.4.2.tar.gz 20532 RMD160 2774cd409afa14b7c2ced479f31d48c8edeebcef SHA1 3f526f90d0f0a2defa24802787546117fdc3e1e8 SHA256 7881a82c2082ff70e65862cd0b23492d213be52a475f2e35ecbbbf337036a296
DIST phc-k8-0.4.3.tar.gz 23324 RMD160 0f348b5cb66f421e501637b90c6389aa44c8f41b SHA1 420195733062f7b5b354b1e8559a5414932c5238 SHA256 b72b02f77afb0cc32f04c2abbc88e1a23241eb1e3a2e9ed3159045f18087d859
+DIST phc-k8-0.4.4.tar.gz 24535 RMD160 7510e06afedfdc0b5f47f8f545710647997699b2 SHA1 c4a553b65e01ed5df8a1811f32174b20126d784e SHA256 19744a7ae94f19c1327e3e5542522f9ab5f978e4466f1973b7518e1a83e91edd
diff --git a/sys-power/phc-k8/phc-k8-0.4.3.ebuild b/sys-power/phc-k8/phc-k8-0.4.3.ebuild
index 5c1eff8647ae..d505be41d104 100644
--- a/sys-power/phc-k8/phc-k8-0.4.3.ebuild
+++ b/sys-power/phc-k8/phc-k8-0.4.3.ebuild
@@ -1,8 +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/sys-power/phc-k8/phc-k8-0.4.3.ebuild,v 1.1 2010/12/04 19:34:35 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/phc-k8-0.4.3.ebuild,v 1.2 2011/11/18 08:45:18 xmw Exp $
-EAPI=2
+EAPI=4
inherit linux-info linux-mod
@@ -17,14 +17,25 @@ IUSE=""
S=${WORKDIR}/${PN}_v${PV}
-CONFIG_CHECK="~!X86_POWERNOW_K8"
-ERROR_X86_POWERNOW_K8="CONFIG_X86_POWERNOW_K8 should be configured to Module, to
+pkg_pretend() {
+ if kernel_is gt 3 0 0 ; then
+ eerror "This version is not compartible with linux 3.x (bug 376441)"
+ eerror "Please use >=sys-power/phc-k8-0.4.4 !"
+ einfo ; einfo ; einfo
+ die "wrong kernel version"
+ fi
+}
+
+pkg_setup() {
+ CONFIG_CHECK="~!X86_POWERNOW_K8"
+ ERROR_X86_POWERNOW_K8="CONFIG_X86_POWERNOW_K8 should be configured to Module, to
a) include needed symbol cpufreq_get_measured_perf and
b) enable the replacemant of powernow-k8 with phc-k8."
-MODULE_NAMES="phc-k8(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
+ MODULE_NAMES="phc-k8(misc:)"
+ BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+ BUILD_TARGETS="all"
+}
src_install() {
linux-mod_src_install
diff --git a/sys-power/phc-k8/phc-k8-0.4.4.ebuild b/sys-power/phc-k8/phc-k8-0.4.4.ebuild
new file mode 100644
index 000000000000..afe86a668280
--- /dev/null
+++ b/sys-power/phc-k8/phc-k8-0.4.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-k8/phc-k8-0.4.4.ebuild,v 1.1 2011/11/18 08:45:18 xmw Exp $
+
+EAPI=4
+
+inherit linux-info linux-mod
+
+DESCRIPTION="Processor Hardware Control for AMD K8 CPUs"
+HOMEPAGE="http://www.linux-phc.org/"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=124 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}_v${PV}
+
+pkg_setup() {
+ CONFIG_CHECK="~!X86_POWERNOW_K8"
+ ERROR_X86_POWERNOW_K8="CONFIG_X86_POWERNOW_K8 should be configured to Module, to
+a) include needed symbol cpufreq_get_measured_perf and
+b) enable the replacemant of powernow-k8 with phc-k8."
+
+ MODULE_NAMES="phc-k8(misc:)"
+ BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
+ BUILD_TARGETS="all"
+
+ linux-mod_pkg_setup
+}
+
+src_prepare() {
+ sed -e '/error Only support for 2.6 series kernels/d' \
+ -i Makefile || die
+
+ if kernel_is gt 2 6 32 ; then
+ #use mperf.{c,h,ko) from kerel
+ sed -e '/^MODULES/s:mperf.ko::' \
+ -e '/^obj-m/s:mperf.o::' \
+ -i Makefile || die
+ fi
+}
+
+src_install() {
+ linux-mod_src_install
+ dodoc Changelog README
+}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b904c0b85428..d46c457b7285 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,3 @@
-DIST chromium-15.0.874.120.tar.bz2 151131909 RMD160 97a453d189116336b5fb291b1efa8354f3297c29 SHA1 ba1df188fc786334cee8d623b3d6123599a802f7 SHA256 bdfc4533708249b50743acaae4f49772e56c8070ea2fc4af114694c40d8ed929
DIST chromium-15.0.874.121.tar.bz2 151129282 RMD160 086c7845d5735f0694b2d8f7eb0a092e8494fab2 SHA1 736556291ba40f5e27b6fc5f1ecdbd72502d711b SHA256 4d3e340b43ca1f5dd7bd5b7b0c575dfe158eee3ba5163a1c42be53dfc7db5aec
DIST chromium-16.0.912.32.tar.bz2 154126364 RMD160 be1928af8c0095f76a58a618f66b3b06f7e1ca6e SHA1 8d1fe0ab8bf8fa2d6332ef4ad0c2a3f255367f0c SHA256 e2cdff16e68a6b60e54c3f519e8af3256497192fe6d98400369906c915d06713
DIST chromium-16.0.912.36.tar.bz2 154332411 RMD160 74818d192905f00d5642b7b8388d74f3ece5b8fa SHA1 bc350d95d502aa07438ea1bbe598aac1bc0bbdde SHA256 75871833a9552f27e52f585411b514844e67b6328aba9535c9ec53b754e03541
diff --git a/www-client/chromium/chromium-15.0.874.120.ebuild b/www-client/chromium/chromium-15.0.874.120.ebuild
deleted file mode 100644
index 0a468f2e824d..000000000000
--- a/www-client/chromium/chromium-15.0.874.120.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.120.ebuild,v 1.3 2011/11/11 11:58:21 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
- pax-utils portability python toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
-
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
- dev-libs/dbus-glib
- >=dev-libs/icu-4.4.1
- >=dev-libs/libevent-1.4.13
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- >=dev-libs/nss-3.12.3
- gnome? ( >=gnome-base/gconf-2.24.0 )
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
- >=media-libs/alsa-lib-1.0.19
- media-libs/flac
- virtual/jpeg
- media-libs/libpng
- >=media-libs/libwebp-0.1.2
- media-libs/speex
- pulseaudio? ( media-sound/pulseaudio )
- cups? (
- dev-libs/libgcrypt
- >=net-print/cups-1.3.11
- )
- sys-libs/zlib
- x11-libs/gtk+:2
- x11-libs/libXinerama
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- >=dev-util/gperf-3.0.3
- >=dev-util/pkgconfig-0.23
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- >=sys-devel/make-3.81-r2
- test? (
- dev-python/pyftpdlib
- dev-python/simplejson
- )"
-RDEPEND+="
- x11-misc/xdg-utils
- virtual/ttf-fonts"
-
-gyp_use() {
- if [[ $# -lt 2 ]]; then
- echo "!!! usage: gyp_use " >&2
- return 1
- fi
- if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
-}
-
-egyp() {
- set -- build/gyp_chromium --depth=. "${@}"
- echo "${@}" >&2
- "${@}"
-}
-
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
- if [[ "$1" == "es_LA" ]]; then
- echo "es_419"
- else
- echo "$1"
- fi
-}
-
-pkg_setup() {
- CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX RANLIB
-
- # Make sure the build system will use the right python, bug #344367.
- python_set_active_version 2
- python_pkg_setup
-
- # Prevent user problems like bug #348235.
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
- ewarn "You may experience really long compilation times and/or increased memory usage."
- ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
- fi
- eshopts_pop
-
- # Warn if the kernel doesn't support features useful for sandboxing,
- # bug #363907.
- CONFIG_CHECK="~PID_NS ~NET_NS"
- check_extra_config
-
- if use bindist; then
- elog "bindist enabled: H.264 video support will be disabled."
- else
- elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
- fi
-}
-
-src_prepare() {
- cp "${FILESDIR}/nacl.gypi" chrome/ || die
-
- # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
- sed -i '1i#define OF(x) x' \
- third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
- chrome/common/zip.cc || die
-
- # Backport http://codereview.chromium.org/8038051, fix for bug #383121.
- epatch "${FILESDIR}/${PN}-kerberos-r0.patch"
-
- epatch_user
-
- # Remove most bundled libraries. Some are still needed.
- find third_party -type f \! -iname '*.gyp*' \
- \! -path 'third_party/WebKit/*' \
- \! -path 'third_party/angle/*' \
- \! -path 'third_party/cacheinvalidation/*' \
- \! -path 'third_party/cld/*' \
- \! -path 'third_party/expat/*' \
- \! -path 'third_party/ffmpeg/*' \
- \! -path 'third_party/flac/flac.h' \
- \! -path 'third_party/gpsd/*' \
- \! -path 'third_party/harfbuzz/*' \
- \! -path 'third_party/hunspell/*' \
- \! -path 'third_party/iccjpeg/*' \
- \! -path 'third_party/launchpad_translations/*' \
- \! -path 'third_party/leveldb/*' \
- \! -path 'third_party/leveldatabase/*' \
- \! -path 'third_party/libjingle/*' \
- \! -path 'third_party/libphonenumber/*' \
- \! -path 'third_party/libvpx/*' \
- \! -path 'third_party/mesa/*' \
- \! -path 'third_party/modp_b64/*' \
- \! -path 'third_party/mongoose/*' \
- \! -path 'third_party/npapi/*' \
- \! -path 'third_party/openmax/*' \
- \! -path 'third_party/ots/*' \
- \! -path 'third_party/protobuf/*' \
- \! -path 'third_party/sfntly/*' \
- \! -path 'third_party/skia/*' \
- \! -path 'third_party/smhasher/*' \
- \! -path 'third_party/speex/speex.h' \
- \! -path 'third_party/sqlite/*' \
- \! -path 'third_party/tcmalloc/*' \
- \! -path 'third_party/tlslite/*' \
- \! -path 'third_party/undoview/*' \
- \! -path 'third_party/v8-i18n/*' \
- \! -path 'third_party/webdriver/*' \
- \! -path 'third_party/webgl_conformance/*' \
- \! -path 'third_party/webrtc/*' \
- \! -path 'third_party/yasm/*' \
- \! -path 'third_party/zlib/contrib/minizip/*' \
- -delete || die
-
- # Make sure the build system will use the right python, bug #344367.
- # Only convert directories that need it, to save time.
- python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
- local myconf=""
-
- # Never tell the build system to "enable" SSE2, it has a few unexpected
- # additions, bug #336871.
- myconf+=" -Ddisable_sse2=1"
-
- # Disable NaCl temporarily, this tarball doesn't have IRT.
- myconf+=" -Ddisable_nacl=1"
-
- # Disable WebRTC until they make PulseAudio dependency optional,
- # bug #377847.
- myconf+=" -Denable_webrtc=0"
-
- # Use system-provided libraries.
- # TODO: use_system_ffmpeg
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
- # TODO: use_system_vpx
- myconf+="
- -Duse_system_bzip2=1
- -Duse_system_flac=1
- -Duse_system_icu=1
- -Duse_system_libevent=1
- -Duse_system_libjpeg=1
- -Duse_system_libpng=1
- -Duse_system_libwebp=1
- -Duse_system_libxml=1
- -Duse_system_speex=1
- -Duse_system_xdg_utils=1
- -Duse_system_zlib=1"
-
- # Optional dependencies.
- # TODO: linux_link_kerberos, bug #381289.
- myconf+="
- $(gyp_use cups use_cups)
- $(gyp_use gnome use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use kerberos use_kerberos)
- $(gyp_use pulseaudio use_pulseaudio)"
-
- # Enable sandbox.
- myconf+="
- -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
- -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
- if host-is-pax; then
- # Prevent the build from failing (bug #301880). The performance
- # difference is very small.
- myconf+=" -Dv8_use_snapshot=0"
- fi
-
- # Our system ffmpeg should support more codecs than the bundled one
- # for Chromium.
- # myconf+=" -Dproprietary_codecs=1"
-
- if ! use bindist; then
- # Enable H.624 support in bundled ffmpeg.
- myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
- fi
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- myconf+=" -Dtarget_arch=x64"
- elif [[ $myarch = x86 ]] ; then
- myconf+=" -Dtarget_arch=ia32"
- elif [[ $myarch = arm ]] ; then
- # TODO: check this again after
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
- append-flags -fno-tree-sink
-
- myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf+=" -Dwerror="
-
- # Avoid a build error with -Os, bug #352457.
- replace-flags "-Os" "-O2"
-
- egyp ${myconf} || die
-}
-
-src_compile() {
- emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
- pax-mark m out/Release/chrome
- if use test; then
- emake {base,crypto,googleurl,net}_unittests BUILDTYPE=Release V=1 || die
- pax-mark m out/Release/{base,crypto,googleurl,net}_unittests
- fi
-}
-
-src_test() {
- # For more info see bug #350349.
- local mylocale='en_US.utf8'
- if ! locale -a | grep -q "$mylocale"; then
- eerror "${PN} requires ${mylocale} locale for tests"
- eerror "Please read the following guides for more information:"
- eerror " http://www.gentoo.org/doc/en/guide-localization.xml"
- eerror " http://www.gentoo.org/doc/en/utf-8.xml"
- die "locale ${mylocale} is not supported"
- fi
-
- # For more info see bug #370957.
- if [[ $UID -eq 0 ]]; then
- die "Tests must be run as non-root. Please use FEATURES=userpriv."
- fi
-
- # For more info see bug #350347.
- LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
- '--gtest_filter=-ICUStringConversionsTest.*'
-
- LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
- LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
-
- # NetUtilTest: bug #361885.
- # NetUtilTest.GenerateFileName: some locale-related mismatch.
- # UDP: unstable, active development. We should revisit this later.
- LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
- '--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*'
-}
-
-src_install() {
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome || die
- doexe out/Release/chrome_sandbox || die
- fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-
- doexe out/Release/chromedriver || die
-
- # Install Native Client files on platforms that support it.
- # insinto "${CHROMIUM_HOME}"
- # case "$(tc-arch)" in
- # amd64)
- # doins native_client/irt_binaries/nacl_irt_x86_64.nexe || die
- # doins out/Release/libppGoogleNaClPluginChrome.so || die
- # ;;
- # x86)
- # doins native_client/irt_binaries/nacl_irt_x86_32.nexe || die
- # doins out/Release/libppGoogleNaClPluginChrome.so || die
- # ;;
- # esac
-
- newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser || die
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
-
- # Allow users to override command-line options, bug #357629.
- dodir /etc/chromium || die
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default" || die
-
- # Support LINGUAS, bug #332751.
- local pak
- for pak in out/Release/locales/*.pak; do
- local pakbasename="$(basename ${pak})"
- local pakname="${pakbasename%.pak}"
- local langname="${pakname//-/_}"
-
- # Do not issue warning for en_US locale. This is the fallback
- # locale so it should always be installed.
- if [[ "${langname}" == "en_US" ]]; then
- continue
- fi
-
- local found=false
- local lang
- for lang in ${LANGS}; do
- local crlang="$(chromium_lang ${lang})"
- if [[ "${langname}" == "${crlang}" ]]; then
- found=true
- break
- fi
- done
- if ! $found; then
- ewarn "LINGUAS warning: no ${langname} in LANGS"
- fi
- done
- local lang
- for lang in ${LANGS}; do
- local crlang="$(chromium_lang ${lang})"
- local pakfile="out/Release/locales/${crlang//_/-}.pak"
- if [ ! -f "${pakfile}" ]; then
- ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
- fi
- if ! use linguas_${lang}; then
- rm "${pakfile}" || die
- fi
- done
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/chrome.pak || die
- doins out/Release/resources.pak || die
-
- doins -r out/Release/locales || die
- doins -r out/Release/resources || die
-
- newman out/Release/chrome.1 chromium.1 || die
- newman out/Release/chrome.1 chromium-browser.1 || die
-
- # Chromium looks for these in its folder
- # See media_posix.cc and base_paths_linux.cc
- # dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
- # dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
- # dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
- doexe out/Release/libffmpegsumo.so || die
-
- # Install icons and desktop entry.
- for SIZE in 16 22 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
- newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
- chromium-browser.png || die
- done
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- make_desktop_entry chromium-browser "Chromium" chromium-browser \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- if use gnome; then
- dodir /usr/share/gnome-control-center/default-apps || die
- insinto /usr/share/gnome-control-center/default-apps
- doins "${FILESDIR}"/chromium-browser.xml || die
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- # For more info see bug #292201, bug #352263, bug #361859.
- elog
- elog "Depending on your desktop environment, you may need"
- elog "to install additional packages to get icons on the Downloads page."
- elog
- elog "For KDE, the required package is kde-base/oxygen-icons."
- elog
- elog "For other desktop environments, try one of the following:"
- elog " - x11-themes/gnome-icon-theme"
- elog " - x11-themes/tango-icon-theme"
-
- # For more info see bug #359153.
- elog
- elog "Some web pages may require additional fonts to display properly."
- elog "Try installing some of the following packages if some characters"
- elog "are not displayed properly:"
- elog " - media-fonts/arphicfonts"
- elog " - media-fonts/bitstream-cyberbit"
- elog " - media-fonts/droid"
- elog " - media-fonts/ipamonafont"
- elog " - media-fonts/ja-ipafonts"
- elog " - media-fonts/takao-fonts"
- elog " - media-fonts/wqy-microhei"
- elog " - media-fonts/wqy-zenhei"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/www-client/chromium/chromium-15.0.874.121.ebuild b/www-client/chromium/chromium-15.0.874.121.ebuild
index 1e08aa49f3fb..eef9bbf55048 100644
--- a/www-client/chromium/chromium-15.0.874.121.ebuild
+++ b/www-client/chromium/chromium-15.0.874.121.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/www-client/chromium/chromium-15.0.874.121.ebuild,v 1.2 2011/11/17 11:38:23 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-15.0.874.121.ebuild,v 1.3 2011/11/18 10:32:18 phajdan.jr Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
@@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio"
# en_US is ommitted on purpose from the list below. It must always be available.
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 4dd46f83588d..37ea257c9758 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_16.0.912.41-r110024_amd64.deb 25017198 RMD160 48866863e3
DIST google-chrome-beta_16.0.912.41-r110024_i386.deb 29240174 RMD160 681d424756dc506b9a7ecee9bd4e9862275e4c2f SHA1 ceb6ce543798fd6a3e669a01787180f228990c3e SHA256 a93676a4c2365a83aca3e01d4adf600784f6d8429e7e7b8fddc726cc645b349f
DIST google-chrome-stable_15.0.874.121-r109964_amd64.deb 24684554 RMD160 d966196ebd1a959dd13a3b3d687bd89dea5a46c2 SHA1 10481da150ce6771683b9a12968e3469c9c55603 SHA256 16a48c09c9df12719cf997168c423c978b9ff317e511d3535805ad84d5ca4e3b
DIST google-chrome-stable_15.0.874.121-r109964_i386.deb 28797978 RMD160 f6fcae050e0c128986f93e7719e12e37c3537c52 SHA1 74c93533b104d6d048ec722b922cdc9288969600 SHA256 affb155841f3f9b6717898f6c2cb7bbdb030f1097b676afd94305c90fd19b3f2
-DIST google-chrome-unstable_17.0.938.0-r109848_amd64.deb 25425852 RMD160 ffa874e7da311cd4f42160b787eda55471a1abb1 SHA1 fb9300bd73aff4a50bd285e35e14901e2d95b4e5 SHA256 1e7277f55dd9b0e8eb63ffcae25dc755b636d4d6c8f46801d780980482cd5a08
-DIST google-chrome-unstable_17.0.938.0-r109848_i386.deb 29602778 RMD160 0df043ff8c377334f501af5e2ce355011e233b70 SHA1 d41d4a28a1f489f2a32c9bdca0f00e8b6c35fcb4 SHA256 9e2ac801729f50206c3291a0cc2543acbc125931bdaf56e5684d18f4d1cd9bfd
+DIST google-chrome-unstable_17.0.942.0-r110446_amd64.deb 25440282 RMD160 99c3fbc835b2f55d6c907fd8bba070863c621763 SHA1 b5b66d050a008a7b64c50d3a4613ac05aa0892f4 SHA256 8e19b5170c86ea9005efcc1cf6dfa806db286cd29cc6fe0c03ddbda67e3ed0bf
+DIST google-chrome-unstable_17.0.942.0-r110446_i386.deb 29574122 RMD160 2ed219ca516731f6212650ca15d343471a9c244a SHA1 a0d967f4c05d7d7f92ddcc917b5754f32bdbe32a SHA256 efac95d5ef15bdd15e7417652da16aa3c0b5560875be8347c9fa504300d23cbf
diff --git a/www-client/google-chrome/google-chrome-17.0.938.0_alpha109848.ebuild b/www-client/google-chrome/google-chrome-17.0.942.0_alpha110446.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-17.0.938.0_alpha109848.ebuild
rename to www-client/google-chrome/google-chrome-17.0.942.0_alpha110446.ebuild
index 3d6d333a689e..121d0c323979 100644
--- a/www-client/google-chrome/google-chrome-17.0.938.0_alpha109848.ebuild
+++ b/www-client/google-chrome/google-chrome-17.0.942.0_alpha110446.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/www-client/google-chrome/google-chrome-17.0.938.0_alpha109848.ebuild,v 1.1 2011/11/15 00:58:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-17.0.942.0_alpha110446.ebuild,v 1.1 2011/11/18 03:11:40 floppym Exp $
EAPI="4"
diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
index 9ea611fde51c..bd364be5846c 100644
--- a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -1,14 +1,61 @@
-From 299e28dd3e5549b13ec54de991d583ac6a6ff11e Mon Sep 17 00:00:00 2001
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev
Date: Tue, 15 Nov 2011 03:06:40 -0500
Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
compatibility
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
https://bugzilla.gnome.org/show_bug.cgi?id=663779
---
+ src/keymap.c | 15 +++++++++++++--
src/keymap.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ {GDK_KEY (F35), _vte_keymap_GDK_F35},
+ };
+
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++ GdkModifierType mask)
++{
++ if (modifiers & VTE_META_MASK)
++ modifiers |= VTE_META_MASK;
++ return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+ * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ } else {
+ fkey_mode = fkey_default;
+ }
+- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+
+ /* Search for the conditions. */
+ for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ return;
+ }
+
+- switch (modifiers & significant_modifiers) {
++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ case 0:
+ modifier = 0;
+ break;
diff --git a/src/keymap.h b/src/keymap.h
index 243e22e..21d9b8e 100644
--- a/src/keymap.h
@@ -23,5 +70,5 @@ index 243e22e..21d9b8e 100644
/* Map the specified keyval/modifier setup, dependent on the mode, to either
--
-1.7.8.rc1
+1.7.8.rc3
diff --git a/x11-libs/vte/vte-0.28.2-r201.ebuild b/x11-libs/vte/vte-0.28.2-r202.ebuild
similarity index 93%
rename from x11-libs/vte/vte-0.28.2-r201.ebuild
rename to x11-libs/vte/vte-0.28.2-r202.ebuild
index 2ed069a11282..744b8db19a28 100644
--- a/x11-libs/vte/vte-0.28.2-r201.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r202.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/x11-libs/vte/vte-0.28.2-r201.ebuild,v 1.2 2011/11/16 20:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.28.2-r202.ebuild,v 1.1 2011/11/18 08:48:37 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
diff --git a/x11-libs/vte/vte-0.30.1-r1.ebuild b/x11-libs/vte/vte-0.30.1-r2.ebuild
similarity index 92%
rename from x11-libs/vte/vte-0.30.1-r1.ebuild
rename to x11-libs/vte/vte-0.30.1-r2.ebuild
index 238ee7b73993..80a32dd16446 100644
--- a/x11-libs/vte/vte-0.30.1-r1.ebuild
+++ b/x11-libs/vte/vte-0.30.1-r2.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/x11-libs/vte/vte-0.30.1-r1.ebuild,v 1.2 2011/11/16 20:54:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.30.1-r2.ebuild,v 1.1 2011/11/18 08:48:37 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
diff --git a/x11-misc/i3status/i3status-2.3.ebuild b/x11-misc/i3status/i3status-2.3.ebuild
index cc51b40cd3a6..9fa810f4f354 100644
--- a/x11-misc/i3status/i3status-2.3.ebuild
+++ b/x11-misc/i3status/i3status-2.3.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/x11-misc/i3status/i3status-2.3.ebuild,v 1.1 2011/07/22 08:14:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild,v 1.2 2011/11/18 09:32:09 tetromino Exp $
EAPI=4
-inherit toolchain-funcs
+inherit toolchain-funcs versionator
DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
HOMEPAGE="http://i3wm.org/i3status/"
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
# @DESCRIPTION:
# fcaps sets the specified capabilities in the effective and permitted set of
# the given file. In case of failure fcaps sets the given file-mode.
+# Requires versionator.eclass
fcaps() {
local uid_gid=$1
local perms=$2
@@ -48,10 +49,13 @@ fcaps() {
res=$?
if [ $res -ne 0 ]; then
- ewarn "Failed to set capabilities. Probable reason is missed kernel support."
- ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and _FS_SECURITY"
- ewarn "enabled (e.g. EXT3_FS_SECURITY) where is the filesystem to store"
- ewarn "${path}"
+ ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+ ewarn "Your kernel must have _FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+ ewarn "where is the filesystem to store ${path}"
+ if ! version_is_at_least 2.6.33 "$(uname -r)"; then
+ ewarn "For kernel 2.6.32 or older, you will also need to enable"
+ ewarn "SECURITY_FILE_CAPABILITIES."
+ fi
ewarn
ewarn "Falling back to suid now..."
chmod u+s ${path}
diff --git a/x11-misc/read-edid/read-edid-2.0.0.ebuild b/x11-misc/read-edid/read-edid-2.0.0.ebuild
deleted file mode 100644
index a7212603074e..000000000000
--- a/x11-misc/read-edid/read-edid-2.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-2.0.0.ebuild,v 1.3 2008/12/15 04:09:24 yngwin Exp $
-
-DESCRIPTION="Program that can get information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-DEPEND=">=dev-libs/libx86-1.1"
-RDEPEND="$DEPEND"
-
-src_compile() {
- econf --mandir=/usr/share/man || die "configure failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS README
-}