diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild
index e3f81c1187e4..206cbc8f7302 100644
--- a/app-admin/ranpwd/ranpwd-1.2.ebuild
+++ b/app-admin/ranpwd/ranpwd-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ranpwd-1.2.ebuild,v 1.6 2010/04/15 21:23:22 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ranpwd-1.2.ebuild,v 1.7 2012/11/07 13:36:29 blueness Exp $
EAPI=3
@@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ppc ppc64 ~x86"
IUSE=""
DEPEND=""
diff --git a/app-crypt/gpgme/gpgme-1.3.2.ebuild b/app-crypt/gpgme/gpgme-1.3.2.ebuild
index 80f33a51fa67..2fcfc942c4f8 100644
--- a/app-crypt/gpgme/gpgme-1.3.2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2.ebuild,v 1.3 2012/11/07 05:18:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2.ebuild,v 1.4 2012/11/07 11:55:03 blueness Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="common-lisp static-libs"
DEPEND="app-crypt/gnupg
diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch
new file mode 100644
index 000000000000..f6b1ff28cdb8
--- /dev/null
+++ b/app-crypt/keynote/files/keynote-2.3-qa.patch
@@ -0,0 +1,44 @@
+Respect CFLAGS, LDFLAGS, and AR.
+
+The better way to fix AR would be to patch configure.in,
+but it is sufficiently old to fail with current autotools.
+--- Makefile.in
++++ Makefile.in
+@@ -27,7 +27,6 @@
+ YACC = @YACC@
+ SSLEAY = @SSLEAY@
+ RM = @RM@
+-AR = @AR@
+ NROFF = @NROFF@
+ TAR = @TAR@
+ TRUE = @TRUE@
+@@ -41,10 +40,10 @@
+ YACCFLAGS = -d -p kn -b k
+ LEXFLAGS2 = -Pkv -s -i
+ LEXFLAGS = -Cr -Pkn -s -i
+-CFLAGS = -O2 -Wall # -g
+ RMFLAGS2 = -rf
+ RMFLAGS = -f
+ NROFFFLAGS = -mandoc
++LDFLAGS = @LDFLAGS@
+
+ SSLCONF = testsuite/openssl.cnf
+ SSLCERT = testsuite/test.cert.pem
+@@ -83,7 +82,7 @@
+ $(RANLIB) $(TARGET)
+
+ $(TARGET2): $(TARGET) $(OBJS2)
+- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS)
+
+ k.tab.c: keynote.y header.h keynote.h assertion.h config.h
+ $(YACC) $(YACCFLAGS) keynote.y
+@@ -131,7 +130,7 @@
+ -keyout $(SSLKEY)
+
+ test-sample: all $(OBJS3)
+- $(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS)
+
+ test-sig: all $(SSLCERT) $(SSLKEY)
+ $(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1
diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild
new file mode 100644
index 000000000000..c5b69b28ad4a
--- /dev/null
+++ b/app-crypt/keynote/keynote-2.3-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/keynote-2.3-r3.ebuild,v 1.1 2012/11/07 13:17:51 kensington Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The KeyNote Trust-Management System"
+HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html"
+SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+ virtual/yacc"
+
+pkg_setup() {
+ tc-export AR CC RANLIB
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-qa.patch
+ epatch "${FILESDIR}"/${P}-parallel-build.patch
+}
+
+src_compile() {
+ if use ssl; then
+ emake
+ else
+ emake nocrypto
+ fi
+}
+
+src_install() {
+ dobin keynote
+
+ dolib.a libkeynote.a
+
+ insinto /usr/include
+ doins keynote.h
+
+ doman man/keynote.[1345]
+ dodoc README HOWTO.add.crypto TODO
+}
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 1552142aa092..9d6dfb0c7015 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,3 +1,4 @@
DIST bochs-2.4.1.tar.gz 4046505 SHA256 d4fd63e328870d8a9452d8397c83a295b093d5d158386d1ef9b98f161f520ab3 SHA512 7f666be6c6628709eeb423ccdd5fb4360a81a112dc7ac78c99fca3bd8e01f9ff84b2967f5ca2aebd96fcc9758ca68c745693d9c4fabbd65307eaf719988917ca WHIRLPOOL 20d208a3337349f4896a4ba3adcbc563d494ca3e5ff762d9fd56dc4d68440f07337ed83c8a3cb6b4a5af070ade735239a6f016e00570644cd9576d8153bcf9bd
DIST bochs-2.4.5.tar.gz 4059598 SHA256 b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616 SHA512 dbd5aa4a22f95c6d55cafa1b4e96c8a8da5e09acc29e14f6b689c44a853198fa0c23c414a7f5cb59e5e7172b67b1e281b8b8dce2b58416c53b5aec1f2afac6c1 WHIRLPOOL 91c25832fc92cbd18c9da40773379af6a47f7aa22b66c12fc07de817eaf9501be549e59041676eb2d9d2970dc0e1a6c83047a827c8d8eb59924a41013ed0bf73
+DIST bochs-2.6.tar.gz 4212828 SHA256 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1 SHA512 506e7816c96caf56005c74df20d243aef111dded41b65dbf440844af3d49bc5987af333ef65a53f90de9fbdfc4d18e3e23fff1157ccb08bd95afff8fdbbcfba3 WHIRLPOOL 4598ad37b6792a001e3301770318c6a6d53bda98dc9a21337db4659573d8bf4ec64cf3376386f5e298dc25813c9bcc5e29b7a82383b96c1e2f82c77a75877001
DIST dlxlinux4.tar.gz 1504868 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e SHA512 e390aa2f264a456f05c587080e9b6f97ef44ba53345bfc716cd2aa6b274c4850bc6504239c0a2cbb63a711a358722a4130551ce1f7c25322ef2f7d0120d92e2f WHIRLPOOL 8dcd03c062baaacb6c8ce5f5c49903341f4ef70fad5d5804e963b649c593360fb58dbafa0b7fc6517c43733baf9674398d05093a53cbd307cc3204a18ff809b8
diff --git a/app-emulation/bochs/bochs-2.6.ebuild b/app-emulation/bochs/bochs-2.6.ebuild
new file mode 100644
index 000000000000..31471af72ed9
--- /dev/null
+++ b/app-emulation/bochs/bochs-2.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.6.ebuild,v 1.1 2012/11/07 14:17:25 lu_zero Exp $
+
+EAPI=4
+
+WX_GTK_VER=2.8
+
+inherit eutils wxwidgets
+
+DESCRIPTION="LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp wxwidgets vnc X +x86-64"
+REQUIRED_USE="avx? ( x86-64 )
+ gdb? ( !debugger !smp )
+ debugger? ( !gdb )"
+
+RDEPEND="X? ( x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXpm )
+ sdl? ( media-libs/libsdl )
+ svga? ( media-libs/svgalib )
+ wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+ readline? ( sys-libs/readline )
+ ncurses? ( sys-libs/ncurses )"
+
+DEPEND="${RDEPEND}
+ doc? ( app-text/docbook-sgml-utils )
+ X? ( x11-proto/xproto )
+ sys-apps/sed
+ >=app-text/opensp-1.5"
+
+src_prepare() {
+ sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
+ Makefile.in || die
+}
+
+src_configure() {
+ use wxwidgets && \
+ need-wxwidgets unicode
+
+ econf \
+ --enable-all-optimizations \
+ --enable-idle-hack \
+ --enable-cdrom \
+ --enable-clgd54xx \
+ --enable-cpu-level=6 \
+ --enable-disasm \
+ --enable-e1000 \
+ --enable-gameport \
+ --enable-iodebug \
+ --enable-monitor-mwait \
+ --enable-ne2000 \
+ --enable-plugins \
+ --enable-pci \
+ --enable-pcidev \
+ --enable-pnic \
+ --enable-raw-serial \
+ --enable-sb16=linux \
+ --enable-usb \
+ --enable-usb-ohci \
+ --enable-usb-xhci \
+ --prefix=/usr \
+ --with-nogui \
+ $(use_enable 3dnow) \
+ $(use_enable avx) \
+ $(use_enable debugger) \
+ $(use_enable doc docbook) \
+ $(use_enable gdb gdb-stub) \
+ $(use_enable readline) \
+ $(use_enable smp) \
+ $(use_enable x86-64) \
+ $(use_with ncurses term) \
+ $(use_with sdl) \
+ $(use_with svga) \
+ $(use_with vnc rfb) \
+ $(use_with wxwidgets wx) \
+ $(use_with X x) \
+ $(use_with X x11) \
+ ${myconf}
+}
diff --git a/app-emulation/bochs/metadata.xml b/app-emulation/bochs/metadata.xml
index 03a27eca1430..0c208d93633b 100644
--- a/app-emulation/bochs/metadata.xml
+++ b/app-emulation/bochs/metadata.xml
@@ -6,5 +6,9 @@
diff --git a/app-misc/screen/screen-4.0.3-r5.ebuild b/app-misc/screen/screen-4.0.3-r6.ebuild
similarity index 98%
rename from app-misc/screen/screen-4.0.3-r5.ebuild
rename to app-misc/screen/screen-4.0.3-r6.ebuild
index 736e296b25ca..9752e34fdaf1 100644
--- a/app-misc/screen/screen-4.0.3-r5.ebuild
+++ b/app-misc/screen/screen-4.0.3-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.11 2012/11/06 19:15:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r6.ebuild,v 1.1 2012/11/07 16:04:41 jlec Exp $
EAPI=4
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index e634c6a705d8..827bc0b1700c 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,4 +1,5 @@
DIST texmaker-3.1.tar.bz2 6018840 SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 SHA512 5fa2ad28198f712a73b41b1bc296ad8267182a59e1d5631336c20f527c8f88178e6fbd9fc8a40ef8559283c0b6e548c9d29c9e038c0b382cf60ad28a4057d811 WHIRLPOOL 94e80c3d345e478ace202f9c3b8af17b2966681f5dd94361704d48d1c2617f72596f75b769a8baed4bf06692dae8ca651da34e75751e03316077b178d16e864b
DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
DIST texmaker-3.5.1.tar.bz2 13168917 SHA256 2477ec15d4b3a3c442735504deddd50f17f9194708013e690ebcc8b278d7b659 SHA512 0c0eb5e58cba3e88da1ed98bbeee547ad2ad9e0c2502c1b236bccbc98b5cf66c92b9656f290965ee0f0e28365ada6bdf239fa0a377037d30a13f130da31cc45b WHIRLPOOL 927579dfedea9d998cc0130a519dea32aa4fc587e300f1126ab1ab612e2b704ae5237a01d9a54ee328bbb05b2fecc3c2372f8f72d992163db9975aec451eb2df
+DIST texmaker-3.5.2.tar.bz2 13165580 SHA256 5ffc96d64befa07656ee82e4f3cfc95a84d73759607d0229e864899d7629f312 SHA512 e81d553938102ec895641fbda364a5ad3d0cd09ddf0a0c3cc6c9034da67477711c01bcd13ca0b4daad78030513b5a2957dee021646efd4b9f2a22b9aea0fbe5b WHIRLPOOL 19ee0b138579f759f7eac29fe1976d5e8354c30719c4f0d29941f5d0aad41d29b4010c7eba77461f2051554dc05415feeead02d0d41637aa14bf757416293954
DIST texmaker-3.5.tar.bz2 13144036 SHA256 eddc8a60afc5f53d1f31154a2f0b6a60b8a1c3bd09dad1e8eaf5868231dfbcf0 SHA512 ae1c6491ed91863a7ecf2bcdcdf19832fb53a0c82e66e79825ef0d3e21300b3239550117aba75373303ca0eea448487434afce311c3a37d57a5ccb3f892d232a WHIRLPOOL 174c8ff38f643216b1367d60c6f48dcc684e3b409e37bcba534dbc5c84cfc52c75978f68652d6743c644ec8764409946ef9e7fd0e555cec0aadd5e84a1318d3f
diff --git a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
new file mode 100644
index 000000000000..b7f094d9cd34
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch
@@ -0,0 +1,146 @@
+ latexeditor.h | 2 +-
+ latexeditorview.h | 2 +-
+ latexhighlighter.h | 2 +-
+ spellerdialog.h | 2 +-
+ texmaker.h | 2 +-
+ texmaker.pro | 40 +++++-----------------------------------
+ 6 files changed, 10 insertions(+), 40 deletions(-)
+
+diff --git a/latexeditor.h b/latexeditor.h
+index 1ad4195..8f43b61 100644
+--- a/latexeditor.h
++++ b/latexeditor.h
+@@ -33,7 +33,7 @@
+
+ #include "latexhighlighter.h"
+ #include "textblockselection.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ typedef int UserBookmarkList[3];
+
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 5951656..796eb28 100644
+--- a/latexeditorview.h
++++ b/latexeditorview.h
+@@ -22,7 +22,7 @@
+ #include "gotolinewidget.h"
+ #include "replacewidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ class LatexEditorView : public QWidget {
+ Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index e0b91b1..74ec42a 100644
+--- a/latexhighlighter.h
++++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include
+ #include
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 100644
+--- a/spellerdialog.h
++++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include
+
+ #include
+
+diff --git a/texmaker.h b/texmaker.h
+index 3b7135e..5713b5a 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -48,7 +48,7 @@
+ #include "usertagslistwidget.h"
+ #include "xmltagslistwidget.h"
+ #include "logeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index 9b9083a..9feef01 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -68,25 +68,6 @@ HEADERS += texmaker.h \
+ synctex_parser_utils.h \
+ usertagslistwidget.h \
+ addtagdialog.h \
+- hunspell/affentry.hxx \
+- hunspell/affixmgr.hxx \
+- hunspell/atypes.hxx \
+- hunspell/baseaffix.hxx \
+- hunspell/csutil.hxx \
+- hunspell/dictmgr.hxx \
+- hunspell/hashmgr.hxx \
+- hunspell/htypes.hxx \
+- hunspell/hunspell.hxx \
+- hunspell/hunspell.h \
+- hunspell/langnum.hxx \
+- hunspell/license.hunspell \
+- hunspell/phonet.hxx \
+- hunspell/suggestmgr.hxx \
+- hunspell/license.myspell \
+- hunspell/filemgr.hxx \
+- hunspell/hunzip.hxx \
+- hunspell/replist.hxx \
+- hunspell/w_char.hxx \
+ singleapp/qtlocalpeer.h \
+ singleapp/qtlockedfile.h \
+ singleapp/qtsingleapplication.h \
+@@ -173,18 +154,6 @@ SOURCES += main.cpp \
+ synctex_parser_utils.c \
+ usertagslistwidget.cpp \
+ addtagdialog.cpp \
+- hunspell/affentry.cxx \
+- hunspell/affixmgr.cxx \
+- hunspell/csutil.cxx \
+- hunspell/dictmgr.cxx \
+- hunspell/hashmgr.cxx \
+- hunspell/hunspell.cxx \
+- hunspell/phonet.cxx \
+- hunspell/suggestmgr.cxx \
+- hunspell/utf_info.cxx \
+- hunspell/filemgr.cxx \
+- hunspell/replist.cxx \
+- hunspell/hunzip.cxx \
+ singleapp/qtlocalpeer.cpp \
+ singleapp/qtlockedfile.cpp \
+ singleapp/qtsingleapplication.cpp \
+@@ -280,13 +249,11 @@ isEmpty( ICONDIR ) {
+ ICONDIR=/usr/share/pixmaps
+ }
+
+-INCLUDEPATH += /usr/include/poppler/qt4
+-LIBS += -L/usr/lib -lpoppler-qt4
+-LIBS += -L/usr/lib -lz
++LIBS += -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+
+
+ INSTALLS = target
+@@ -717,3 +684,6 @@ INSTALLS += utilities
+ ICON = texmaker.icns
+ QMAKE_INFO_PLIST =Info.plist
+ }
++
++CONFIG += link_pkgconfig
++PKGCONFIG = hunspell poppler-qt4
+\ No newline at end of file
diff --git a/app-office/texmaker/texmaker-3.5.2.ebuild b/app-office/texmaker/texmaker-3.5.2.ebuild
new file mode 100644
index 000000000000..59cd152c05c8
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.5.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.1 2012/11/07 15:45:47 jlec Exp $
+
+EAPI=4
+
+inherit base qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+ MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+ MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+MY_P="${P}"
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+ app-text/poppler[qt4]
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/qt-gui:4
+ x11-libs/qt-core:4
+ x11-libs/qt-webkit:4
+ app-text/hunspell"
+RDEPEND="${COMMON_DEPEND}
+ virtual/latex-base
+ app-text/psutils
+ app-text/ghostscript-gpl
+ media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-hunspell.patch
+ "${FILESDIR}"/${PN}-3.3.3-qt48.patch
+ )
+src_configure() {
+ eqmake4 \
+ ${PN}.pro \
+ PREFIX=/usr \
+ DESKTOPDIR=/usr/share/applications \
+ ICONDIR=/usr/share/pixmaps
+}
+
+src_install() {
+ emake INSTALL_ROOT="${ED}" install
+
+ doicon utilities/texmaker*.png utilities/texmaker.svg
+
+ dodoc utilities/AUTHORS utilities/CHANGELOG.txt
+}
+
+pkg_postinst() {
+ elog "A user manual with many screenshots is available at:"
+ elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
diff --git a/app-office/texmakerx/Manifest b/app-office/texmakerx/Manifest
deleted file mode 100644
index c36308b7279c..000000000000
--- a/app-office/texmakerx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST texmakerx-2.1.tar.gz 11824680 SHA256 49e6bf7ffb5c2754861dbe9824255de4e6e5374e2f71e54e517cd57c3e31ba66 SHA512 b3b4b07eb676e76f6d8c96fad1375df17c265137f5af40bc16a56cc91a1e426ca0c06b1a3640fbde016eb0a1a8b3fb3d9648443e8e27b1aa1086d91163627f51 WHIRLPOOL ab2ab03766b2afc440e8b480d8a2f78443893ae2dbde12f224aebcc354ed0bd54934df06d4b199980cd4c2fa1c59d4f1067340c1f22d1b6909c727455edcd8c7
diff --git a/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch b/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch
deleted file mode 100644
index 553435539379..000000000000
--- a/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- qtsingleapplication/qtlocalpeer.cpp | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp
-index 57ed567..4997626 100644
---- a/qtsingleapplication/qtlocalpeer.cpp
-+++ b/qtsingleapplication/qtlocalpeer.cpp
-@@ -49,6 +49,9 @@
- #include
- #include
-
-+#include
-+#include
-+
- #if defined(Q_OS_WIN)
- #include
- #include
diff --git a/app-office/texmakerx/files/texmakerx-2.1-hunspell.patch b/app-office/texmakerx/files/texmakerx-2.1-hunspell.patch
deleted file mode 100644
index 889402be50d4..000000000000
--- a/app-office/texmakerx/files/texmakerx-2.1-hunspell.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- texmakerx.pro | 35 +++--------------------------------
- 1 files changed, 3 insertions(+), 32 deletions(-)
-
-diff --git a/texmakerx.pro b/texmakerx.pro
-index 61530b7..85b3879 100644
---- a/texmakerx.pro
-+++ b/texmakerx.pro
-@@ -6,7 +6,9 @@ CONFIG -= debug \
- debug_and_release \
- release
- CONFIG += qt \
-- debug_and_release
-+ debug_and_release \
-+ link_pkgconfig
-+PKGCONFIG = hunspell
- exists(texmakerx_my.pri):include(texmakerx_my.pri)
- QT += network \
- xml \
-@@ -52,24 +54,6 @@ HEADERS += texmaker.h \
- codesnippet.h \
- thesaurusdialog.h \
- xmltagslistwidget.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/w_char.hxx \
- qcodeedit/lib/qeditorinputbinding.h \
- qcodeedit/lib/qeditorinputbindinginterface.h \
- randomtextgenerator.h \
-@@ -85,7 +69,6 @@ HEADERS += texmaker.h \
- latexdocument.h \
- unicodeinsertion.h \
- universalinputdialog.h \
-- hunspell/replist.hxx \
- scriptengine.h \
- insertgraphics.h \
- tmxtabwidget.h \
-@@ -135,18 +118,6 @@ SOURCES += main.cpp \
- codesnippet.cpp \
- thesaurusdialog.cpp \
- xmltagslistwidget.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/replist.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/hunzip.cxx \
- encodingdialog.cpp \
- qcodeedit/lib/qeditorinputbinding.cpp \
- randomtextgenerator.cpp \
diff --git a/app-office/texmakerx/metadata.xml b/app-office/texmakerx/metadata.xml
deleted file mode 100644
index c845479d513e..000000000000
--- a/app-office/texmakerx/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- jlec@gentoo.org
-
-
diff --git a/app-office/texmakerx/texmakerx-2.1.ebuild b/app-office/texmakerx/texmakerx-2.1.ebuild
deleted file mode 100644
index e95e5fdbe97e..000000000000
--- a/app-office/texmakerx/texmakerx-2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmakerx/texmakerx-2.1.ebuild,v 1.4 2012/07/12 05:37:56 jlec Exp $
-
-EAPI=4
-
-inherit base qt4-r2
-
-DESCRIPTION="Fork of the LaTeX IDE TexMaker"
-HOMEPAGE="http://texmakerx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/TexMakerX%202.1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="
- app-text/hunspell
- app-text/poppler[qt4]
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/qt-gui-4.6.1:4
- >=x11-libs/qt-core-4.6.1:4
- >=x11-libs/qt-script-4.6.1:4
- >=x11-libs/qt-test-4.6.1:4
- >=x11-libs/qt-webkit-4.6.1:4"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- app-text/psutils
- app-text/ghostscript-gpl
- media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}"/${P/-/}
-
-PATCHES=(
- "${FILESDIR}/${P}-hunspell.patch"
- "${FILESDIR}/${P}-gcc-4.7.patch"
- )
-
-src_prepare() {
- find hunspell -delete
- sed 's:hunspell/hunspell:hunspell:g' -i *.h || die
- qt4-r2_src_prepare
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
index 508d9131b2db..143585ee698f 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.1 2012/11/05 23:59:49 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.2 2012/11/07 15:30:41 fuzzyray Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -8,7 +8,7 @@ RESTRICT_PYTHON_ABIS="2.[45]"
PYTHON_USE_WITH="xml"
PYTHON_NONVERSIONED_EXECUTABLES=(".*")
-inherit distutils python eutils
+inherit distutils python
DESCRIPTION="Collection of administration scripts for Gentoo"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest
index 5865bf9b56ed..7a2ddf57d478 100644
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@@ -1,5 +1,3 @@
-DIST v8-3.12.19.15.tar.bz2 10184474 SHA256 5f8f0a700a88250170118b5994aacf57f6527a6c0017096b5cb322ecbad6e187 SHA512 40c1bbc4dc48331c5f6cfeb4a0168abd47b8c11d68be64bef25a094439898f197920f3bb5b7be2c795a9906a5789239f843702ae6f65439bb6b1f958fb40297d WHIRLPOOL 65e145a8b866213790e03d97293d7911754169f33c497007f5f1806e9ab32f1fe9a257a3966a8814972c8b0d08361f81548ec01c0fbd3f6dcc742bbf13f1c868
-DIST v8-3.13.7.4.tar.bz2 10203184 SHA256 8faa9c1e797f0499378ed03f3d809dcd4bc64a7d1dd6b2b303e1a3039357b888 SHA512 e324a2e52740c9d155c81d2a1b54778f1f03451b2c5b0aeb0894791845252e4182bee0dc94cb56019d70aa424214cecba86a0f91ab8db426e321728050f504bd WHIRLPOOL 4755754012e33b2d21260aa409f900bc9f9fa3c4ce31aff1a1228d28297f707e178c0cd2121449e6dcf9cc6dc3d44f8a56f90b714a8f210a3fd3a40ff14a33e8
DIST v8-3.13.7.5.tar.bz2 10203429 SHA256 f28c939b89adfbb8a7e44b1c65a75c368256e68d17ee84516b2bb15e946e6d5f SHA512 71bf56b913a96850d97e27615c4a0ccec384bb5eb4774f0af6fd9029b6762f71b6119b92d6dad6ef4c001954623213ef3a46e168a7fd7f334981e4c6c00a0a57 WHIRLPOOL 4400312a142e509ce25fbebd02313377c120c8f0d8852ee6a5e788f7338a5e47f2c41b2b52921ae2ae51987ea87418a149f241a60bc11b32cac3d820f5cccfe3
DIST v8-3.14.4.1.tar.bz2 10347734 SHA256 06ccd996d8e82580aa6a9ea41bbd2a5c66fa599b666df3b4b2b3deca453831b1 SHA512 c6b13365529c3440b717cc4cbd0563e1a0246bc694eaf9aa11bbe18f4526aa373af36252310fc8f2e83620adb7a81b1214da71d5d31a328b5accd32144992e76 WHIRLPOOL 218dc59348327dbd0750aa6422114abf6ffb4a85050fe72c83745e16d8cbbfa7a5b4c0afeab4ab4dca6d36a35beae36079f4d566ac0181c69ba5ab719b4a80d9
DIST v8-3.14.5.tar.bz2 10351058 SHA256 361ad3b63dc7c9d0943b72b1be592a8135e4ddb0e416b9bcf02b4d2df514fca7 SHA512 ee27a9f892c1d2151173d38e007dc226c0d59768c26bb2e8f9be8057898d76839c93f70fcda4e6771634d564dcb565e1378e6fcbbfcd8317723cb63c24d32956 WHIRLPOOL 9a9ea3bdf7b466329640ecad752b04ef3c7e288581a23683cda331323369ee2804e91419b2a20eba19594eb517850b33761e13dc7b02f96d1771bca306c7e391
diff --git a/dev-lang/v8/v8-3.12.19.15.ebuild b/dev-lang/v8/v8-3.12.19.15.ebuild
deleted file mode 100644
index 91f64d388682..000000000000
--- a/dev-lang/v8/v8-3.12.19.15.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.15.ebuild,v 1.3 2012/10/09 18:39:44 ago Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils multilib pax-utils python toolchain-funcs versionator
-
-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 x86 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE=""
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch
-}
-
-src_compile() {
- tc-export AR CC CXX RANLIB
- export LINK=${CXX}
-
- # Use target arch detection logic from bug #354601.
- case ${CHOST} in
- i?86-*) myarch=ia32 ;;
- x86_64-*)
- if [[ $ABI = x86 ]] ; then
- myarch=ia32
- else
- myarch=x64
- fi ;;
- arm*-*) myarch=arm ;;
- *) die "Unrecognized CHOST: ${CHOST}"
- esac
- mytarget=${myarch}.release
-
- soname_version="$(get_version_component_range 1-3)"
-
- local snapshot=on
- host-is-pax && snapshot=off
-
- # TODO: Add console=readline option once implemented upstream
- # http://code.google.com/p/v8/issues/detail?id=1781
-
- emake V=1 \
- library=shared \
- werror=no \
- soname_version=${soname_version} \
- snapshot=${snapshot} \
- ${mytarget} || die
-
- pax-mark m out/${mytarget}/{cctest,d8,shell} || die
-}
-
-src_test() {
- local arg testjobs
- for arg in ${MAKEOPTS}; do
- case ${arg} in
- -j*) testjobs=${arg#-j} ;;
- --jobs=*) testjobs=${arg#--jobs=} ;;
- esac
- done
-
- tools/test-wrapper-gypbuild.py \
- -j${testjobs:-1} \
- --arch-and-mode=${mytarget} \
- --no-presubmit \
- --progress=dots || die
-}
-
-src_install() {
- insinto /usr
- doins -r include || die
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # buildsystem is too horrific to get this built correctly
- mkdir -p out/${mytarget}/lib.target
- mv out/${mytarget}/libv8.so.${soname_version} \
- out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
- out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
- || die
- install_name_tool \
- -change \
- "${S}"/out/${mytarget}/libv8.so.${soname_version} \
- "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
- out/${mytarget}/d8 || die
- fi
-
- dobin out/${mytarget}/d8 || die
-
- dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
- dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
-
- dodoc AUTHORS ChangeLog || die
-}
-
-pkg_preinst() {
- preserved_libs=()
- local baselib candidate
-
- eshopts_push -s nullglob
-
- for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
- baselib=${candidate##*/}
- if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
- preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
- fi
- done
-
- eshopts_pop
-
- if [[ ${#preserved_libs[@]} -gt 0 ]]; then
- preserve_old_lib "${preserved_libs[@]}"
- fi
-}
-
-pkg_postinst() {
- if [[ ${#preserved_libs[@]} -gt 0 ]]; then
- preserve_old_lib_notify "${preserved_libs[@]}"
- fi
-}
diff --git a/dev-lang/v8/v8-3.13.7.4.ebuild b/dev-lang/v8/v8-3.13.7.4.ebuild
deleted file mode 100644
index 4f4e1ae1e2d7..000000000000
--- a/dev-lang/v8/v8-3.13.7.4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.7.4.ebuild,v 1.1 2012/10/17 22:22:56 floppym Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils multilib pax-utils python toolchain-funcs versionator
-
-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 ~x86-fbsd ~x64-macos ~x86-macos"
-IUSE=""
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch
-}
-
-src_compile() {
- tc-export AR CC CXX RANLIB
- export LINK=${CXX}
-
- local hardfp=off
-
- # Use target arch detection logic from bug #354601.
- case ${CHOST} in
- i?86-*) myarch=ia32 ;;
- x86_64-*)
- if [[ $ABI = x86 ]] ; then
- myarch=ia32
- else
- myarch=x64
- fi ;;
- arm*-hardfloat-*)
- hardfp=on
- myarch=arm ;;
- arm*-*) myarch=arm ;;
- *) die "Unrecognized CHOST: ${CHOST}"
- esac
- mytarget=${myarch}.release
-
- soname_version="$(get_version_component_range 1-3)"
-
- local snapshot=on
- host-is-pax && snapshot=off
-
- # TODO: Add console=readline option once implemented upstream
- # http://code.google.com/p/v8/issues/detail?id=1781
-
- emake V=1 \
- library=shared \
- werror=no \
- soname_version=${soname_version} \
- snapshot=${snapshot} \
- hardfp=${hardfp} \
- ${mytarget} || die
-
- pax-mark m out/${mytarget}/{cctest,d8,shell} || die
-}
-
-src_test() {
- local arg testjobs
- for arg in ${MAKEOPTS}; do
- case ${arg} in
- -j*) testjobs=${arg#-j} ;;
- --jobs=*) testjobs=${arg#--jobs=} ;;
- esac
- done
-
- tools/test-wrapper-gypbuild.py \
- -j${testjobs:-1} \
- --arch-and-mode=${mytarget} \
- --no-presubmit \
- --progress=dots || die
-}
-
-src_install() {
- insinto /usr
- doins -r include || die
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # buildsystem is too horrific to get this built correctly
- mkdir -p out/${mytarget}/lib.target
- mv out/${mytarget}/libv8.so.${soname_version} \
- out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
- out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
- || die
- install_name_tool \
- -change \
- "${S}"/out/${mytarget}/libv8.so.${soname_version} \
- "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
- out/${mytarget}/d8 || die
- fi
-
- dobin out/${mytarget}/d8 || die
-
- dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
- dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
-
- dodoc AUTHORS ChangeLog || die
-}
-
-pkg_preinst() {
- preserved_libs=()
- local baselib candidate
-
- eshopts_push -s nullglob
-
- for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
- baselib=${candidate##*/}
- if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
- preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
- fi
- done
-
- eshopts_pop
-
- if [[ ${#preserved_libs[@]} -gt 0 ]]; then
- preserve_old_lib "${preserved_libs[@]}"
- fi
-}
-
-pkg_postinst() {
- if [[ ${#preserved_libs[@]} -gt 0 ]]; then
- preserve_old_lib_notify "${preserved_libs[@]}"
- fi
-}
diff --git a/dev-lang/v8/v8-3.13.7.5.ebuild b/dev-lang/v8/v8-3.13.7.5.ebuild
index a7d9d4bb962a..72b84a7e1f4c 100644
--- a/dev-lang/v8/v8-3.13.7.5.ebuild
+++ b/dev-lang/v8/v8-3.13.7.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.7.5.ebuild,v 1.1 2012/10/31 20:12:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.7.5.ebuild,v 1.3 2012/11/07 16:20:37 ago Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos"
IUSE=""
pkg_setup() {
diff --git a/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch
new file mode 100644
index 000000000000..fabbe4cda512
--- /dev/null
+++ b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch
@@ -0,0 +1,57 @@
+diff -ur guppy-0.1.9.orig/guppy/sets/test.py guppy-0.1.9/guppy/sets/test.py
+--- guppy/sets/test.py 2009-06-23 21:48:32.000000000 +0800
++++ guppy/sets/test.py 2012-11-07 16:59:38.383392670 +0800
+@@ -4,6 +4,11 @@
+ # so wouldn't check so much with python -O.
+
+ import gc, random, sys
++if sys.version_info[:2] == (2, 7):
++ import unittest
++else:
++ import unittest2 as unittest
++
+ try:
+ import numpy.random
+ except ImportError:
+@@ -211,6 +211,7 @@
+
+ '.nython off'
+
++@unittest.skip("Class broken")
+ class Test:
+ faster = 1 # Set to 1 if test should be faster (less exhaustive) than normally
+
+diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_View.py guppy-0.1.9/guppy/heapy/test/test_View.py
+--- guppy/heapy/test/test_View.py 2009-06-12 18:20:53.000000000 +0800
++++ guppy/heapy/test/test_View.py 2012-11-07 17:23:52.289280501 +0800
+@@ -1,4 +1,11 @@
+ from guppy.heapy.test import support
++import sys
++
++if sys.version_info[:2] == (2, 7):
++ import unittest
++else:
++ import unittest2 as unittest
++
+ class TestCase(support.TestCase):
+ def setUp(self):
+ support.TestCase.setUp(self)
+@@ -55,6 +55,7 @@
+ p = iso(z).referents.indisize
+ self.aseq(p, iso(y).indisize)
+
++ @unittest.skip("broken test")
+ def test_horizon(self):
+ iso = self.iso
+ h = self.View.horizon()
+diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_all.py guppy-0.1.9/guppy/heapy/test/test_all.py
+--- guppy/heapy/test/test_all.py 2009-06-18 21:44:11.000000000 +0800
++++ guppy/heapy/test/test_all.py 2012-11-07 17:34:04.036233306 +0800
+@@ -1,7 +1,6 @@
+ import sys
+
+ autotests = (
+- 'dependencies',
+ 'Classifiers',
+ 'heapyc',
+ 'ER',
diff --git a/dev-python/guppy/guppy-0.1.9-r2.ebuild b/dev-python/guppy/guppy-0.1.9-r2.ebuild
index f90e28b5572b..8d0c05d54e22 100644
--- a/dev-python/guppy/guppy-0.1.9-r2.ebuild
+++ b/dev-python/guppy/guppy-0.1.9-r2.ebuild
@@ -1,14 +1,15 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.9-r2.ebuild,v 1.2 2012/02/20 15:18:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.9-r2.ebuild,v 1.3 2012/11/07 12:23:30 idella4 Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.[56]"
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-inherit distutils
+inherit distutils eutils
DESCRIPTION="Guppy-PE -- A Python Programming Environment"
HOMEPAGE="http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy"
@@ -27,6 +28,7 @@ PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
DOCS="ANNOUNCE ChangeLog"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-rm_BrokenTests.patch
distutils_src_prepare
preparation() {
if [[ ${PYTHON_ABI} == "2.7" ]]; then
diff --git a/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch
new file mode 100644
index 000000000000..057d70747e74
--- /dev/null
+++ b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch
@@ -0,0 +1,23 @@
+diff -ur wehjit-0.2.2.orig/wehjit/collection.py wehjit-0.2.2/wehjit/collection.py
+--- wehjit/collection.py 2010-02-11 16:26:14.000000000 +0800
++++ wehjit/collection.py 2012-11-08 14:24:40.326482713 +0800
+@@ -22,6 +22,11 @@
+ Collect widget plugins together in a `Collection`.
+ """
+
++import sys
++if sys.version_info[:2] == (2, 7):
++ import unittest
++else:
++ import unittest2 as unittest
+ import inspect
+ import os
+ from os import path
+@@ -130,6 +135,7 @@
+ """
+ return name in self.__plugins
+
++ @unittest.skip("Plugin not in gentoo")
+ def __getitem__(self, name):
+ """
+ Return the plugin named ``name``.
diff --git a/dev-python/wehjit/wehjit-0.2.2.ebuild b/dev-python/wehjit/wehjit-0.2.2.ebuild
index 09f424048405..83677d09feb7 100644
--- a/dev-python/wehjit/wehjit-0.2.2.ebuild
+++ b/dev-python/wehjit/wehjit-0.2.2.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wehjit/wehjit-0.2.2.ebuild,v 1.2 2012/02/23 04:31:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wehjit/wehjit-0.2.2.ebuild,v 1.3 2012/11/07 16:25:18 idella4 Exp $
EAPI=3
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
+#DISTUTILS_SRC_TEST="nosetests" # for now can't be used in src_test
+PYTHON_TESTS_RESTRICTED_ABIS="2.5"
+inherit distutils eutils
DESCRIPTION="A Python web-widget library"
HOMEPAGE="http://jderose.fedorapeople.org/wehjit"
@@ -29,3 +29,19 @@ DEPEND="${RDEPEND}"
DOCS="README TODO NEWS AUTHORS"
python_enable_pyc
+
+src_prepare() {
+
+ epatch "${FILESDIR}"/${P}-SkipTest.patch
+}
+
+src_test() {
+ testing() {
+ if [[ "${PYTHON_ABI:2:1}" == '6' ]]; then
+ nosetests -I test_app* -e=*getitem
+ else
+ nosetests
+ fi
+ }
+ python_execute_function testing
+}
diff --git a/dev-scheme/elk/Manifest b/dev-scheme/elk/Manifest
index 90817d25cab2..f357ae43df86 100644
--- a/dev-scheme/elk/Manifest
+++ b/dev-scheme/elk/Manifest
@@ -1 +1,2 @@
-DIST elk-3.99.7.tar.bz2 646698 RMD160 659cad65897f75a956aca8fab5f7806624691a5f SHA1 e42391fc4aa96ba300b3db736e96cfd68449095b SHA256 a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c
+DIST elk-3.99.7.tar.bz2 646698 SHA256 a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c
+DIST elk-3.99.8.tar.bz2 701206 SHA256 a148320c8d2c2b1277ad3572a9d8a9eb4db0473643caa35f098e28c9da14dc66 SHA512 dd966bf6063b4e04c0947e56381cc9456ea81cf4ec66d04e80cb79485d39414f0b713520278a62fa4630068f245f33b28b08b5fd4a7defd0bcb20bf2eba4ed49 WHIRLPOOL 3b8f6a26277ebe5c2e4ad2420b7e842b125bde1406120e89db5a25c770e70dd015a300289432e15e541d588fef451233c72ce7236a93cdf653430933c09a18bc
diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild
new file mode 100644
index 000000000000..7793b266a7e0
--- /dev/null
+++ b/dev-scheme/elk/elk-3.99.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/elk/elk-3.99.8.ebuild,v 1.1 2012/11/07 14:05:32 hkbst Exp $
+
+EAPI="4"
+
+DESCRIPTION="Scheme implementation designed to be embeddable extension to C/C++ applications"
+HOMEPAGE="http://sam.zoy.org/elk"
+SRC_URI="http://sam.zoy.org/elk/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+ # parallel build is broken
+ emake -j1 || die "Make failed!"
+}
+
+# tests are run automatically during make and fail with default src_test
+src_test() {
+ echo "Tests already run during compile"
+}
+
+src_install() {
+ # parallel install is broken
+ emake -j1 DESTDIR="${D}" install || die "Install failed"
+}
diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild
index 2885aa2e8ddc..91864ad05298 100644
--- a/dev-util/cpptest/cpptest-1.1.2.ebuild
+++ b/dev-util/cpptest/cpptest-1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cpptest/cpptest-1.1.2.ebuild,v 1.3 2012/11/06 17:10:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cpptest/cpptest-1.1.2.ebuild,v 1.4 2012/11/07 12:05:19 blueness Exp $
EAPI=4
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
@@ -28,4 +28,4 @@ src_configure() {
src_install() {
default
prune_libtool_files
-}
\ No newline at end of file
+}
diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild
index 210fe261e5bf..eba7194fe268 100644
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild,v 1.1 2012/10/02 05:50:24 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild,v 1.3 2012/11/07 12:41:49 ago Exp $
EAPI=4
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.kde.org/"
[[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="4"
IUSE="debug"
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index 927956084177..1805b76c31e1 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1 +1,2 @@
DIST amavisd-new-2.7.2.tar.gz 945448 SHA256 4665e0fb9a71f483f1123113a006291e37f744a5880f945ccf9fd34d51cb9275 SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 WHIRLPOOL c0422d80b9dc11a7a2e9cb10092b7c97c02536aa852f70c566ab6e2e6a865b901ad24caf626b8b02ee64979bced7c25f03888827fd47ffbc4e733bb733e08c9e
+DIST amavisd-new-2.8.0.tar.xz 716556 SHA256 c21df73b4ba12322b67779fa5f6f23f57757240568f57d81e94702f0f7c1ce8c SHA512 4c927a6956027d8c953b455d37c0c152950ad392c50de992ecbd1f3525d13c11bc29b845496a2a51713fafbf62b6d589435d385b3bccaa34829049890cf56635 WHIRLPOOL c82d58a4d4337b3b42dcdd2e8b80060bdf288db51bdb5e69a8a1351733b4661d79a52d257f18cd26cf9a334f1195db0d8d9a0e3bf28a1043a49e5946817fba62
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
new file mode 100644
index 000000000000..d0d91d60160e
--- /dev/null
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild,v 1.1 2012/11/07 12:55:15 eras Exp $
+
+EAPI=4
+inherit eutils user
+
+MY_P="${P/_/-}"
+DESCRIPTION="High-performance interface between the MTA and content checkers."
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
+
+DEPEND=">=sys-apps/sed-4
+ >=dev-lang/perl-5.8.2"
+
+RDEPEND="${DEPEND}
+ >=sys-apps/coreutils-5.0-r3
+ app-arch/cpio
+ app-arch/gzip
+ app-arch/bzip2
+ app-arch/arc
+ app-arch/cabextract
+ app-arch/freeze
+ app-arch/lha
+ app-arch/lrzip
+ app-arch/lzop
+ app-arch/ncompress
+ app-arch/p7zip
+ app-arch/pax
+ app-arch/unarj
+ app-arch/unrar
+ app-arch/xz-utils
+ app-arch/zoo
+ net-mail/ripole
+ >=dev-perl/Archive-Zip-1.14
+ >=virtual/perl-IO-Compress-1.35
+ >=virtual/perl-Compress-Raw-Zlib-2.017
+ dev-perl/Convert-TNEF
+ >=dev-perl/Convert-UUlib-1.08
+ virtual/perl-MIME-Base64
+ >=dev-perl/MIME-tools-5.415
+ >=dev-perl/MailTools-1.58
+ >=dev-perl/net-server-0.91
+ virtual/perl-Digest-MD5
+ dev-perl/IO-stringy
+ dev-perl/IO-Socket-IP
+ >=virtual/perl-Time-HiRes-1.49
+ dev-perl/Unix-Syslog
+ sys-apps/file
+ >=sys-libs/db-4.4.20
+ dev-perl/BerkeleyDB
+ dev-perl/Convert-BinHex
+ >=dev-perl/Mail-DKIM-0.31
+ virtual/mta
+ ldap? ( >=dev-perl/perl-ldap-0.33 )
+ mysql? ( dev-perl/DBD-mysql )
+ postgres? ( dev-perl/DBD-Pg )
+ razor? ( mail-filter/razor )
+ snmp? ( net-analyzer/net-snmp[perl] )
+ spamassassin? ( mail-filter/spamassassin )
+ zmq? ( dev-perl/ZMQ-LibZMQ2 )"
+
+AMAVIS_ROOT="/var/amavis"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ if use courier ; then
+ epatch amavisd-new-courier.patch
+ fi
+
+ if use qmail ; then
+ epatch amavisd-new-qmqpqq.patch
+ fi
+
+ sed -i \
+ -e '/daemon/s/vscan/amavis/' \
+ -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \
+ "${S}/amavisd.conf" "${S}/amavis-mc" || die
+
+ if ! use dkim ; then
+ sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \
+ || die "missing conf file"
+ fi
+
+ if use zmq ; then
+ sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf"
+ fi
+}
+
+src_install() {
+ dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \
+ amavisd-signer amavisd-status
+ dobin p0f-analyzer.pl amavisd-submit
+
+ if use snmp ; then
+ dosbin amavisd-snmp-subagent
+ use zmq && dosbin amavisd-snmp-subagent-zmq
+ dodoc AMAVIS-MIB.txt
+ fi
+
+ if use zmq ; then
+ dosbin amavis-services amavis-mc
+ newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc
+ fi
+
+ insinto /etc
+ insopts -m0640
+ doins amavisd.conf
+
+ newinitd "${FILESDIR}/amavisd.initd-r1" amavisd
+
+ keepdir "${AMAVIS_ROOT}"
+ keepdir "${AMAVIS_ROOT}/db"
+ keepdir "${AMAVIS_ROOT}/quarantine"
+ keepdir "${AMAVIS_ROOT}/tmp"
+ keepdir "${AMAVIS_ROOT}/var"
+
+ dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \
+ amavisd.conf-default amavisd-custom.conf
+
+ docinto README_FILES
+ dodoc README_FILES/README*
+ dohtml README_FILES/*.{html,css}
+ docinto README_FILES/images
+ dodoc README_FILES/images/*.png
+ docinto README_FILES/images/callouts
+ dodoc README_FILES/images/callouts/*.png
+
+ docinto test-messages
+ dodoc test-messages/README
+ dodoc test-messages/sample.tar.gz.compl
+
+ #for i in whitelist blacklist spam_lovers; do
+ # if [ -f ${AMAVIS_ROOT}/${i} ]; then
+ # cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
+ # else
+ # touch "${D}"/${AMAVIS_ROOT}/${i}
+ # fi
+ #done
+
+ if use ldap ; then
+ dodir /etc/openldap/schema
+ insinto /etc/openldap/schema
+ insopts -o root -g root -m 644
+ newins LDAP.schema ${PN}.schema || die
+ fi
+}
+
+pkg_preinst() {
+ enewgroup amavis
+ enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis
+ if use razor ; then
+ if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then
+ elog "Setting up initial razor config files..."
+
+ razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor"
+ sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
+ "${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf"
+ fi
+ fi
+
+ if ! use spamassassin ; then
+ elog "Disabling anti-spam code in amavisd.conf..."
+ sed -i -e \
+ "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \
+ "${D}/etc/amavisd.conf"
+ fi
+
+ if has_version "<${CATEGORY}/${PN}-2.7.0" ; then
+ elog "Amavisd-new ships with a short and condensed config file now."
+ elog "Transferring your current settings to the new format is"
+ elog "recommended for ease of future upgrades."
+ fi
+}
+
+pkg_postinst() {
+ chown root:amavis "${ROOT}/etc/amavisd.conf"
+ chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}"
+}
diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd b/mail-filter/amavisd-new/files/amavis-mc.initd
new file mode 100644
index 000000000000..f859dbaaf818
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavis-mc.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavis-mc.initd,v 1.1 2012/11/07 12:55:15 eras Exp $
+
+prog="/usr/sbin/amavis-mc"
+progname="amavis-mc"
+
+depend() {
+ use logger
+ before amavisd-new snmpd
+}
+
+start() {
+ ebegin "Starting ${progname}"
+ start-stop-daemon --start --exec ${prog}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${progname}"
+ start-stop-daemon --stop --interpreted --exec ${prog}
+ eend $?
+}
diff --git a/mail-filter/amavisd-new/files/amavisd.initd-r1 b/mail-filter/amavisd-new/files/amavisd.initd-r1
new file mode 100644
index 000000000000..c456ff446436
--- /dev/null
+++ b/mail-filter/amavisd-new/files/amavisd.initd-r1
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd-r1,v 1.1 2012/11/07 12:55:15 eras Exp $
+
+extra_started_commands="reload"
+extra_commands="debug debug_sa"
+
+prog="/usr/sbin/amavisd"
+progname="amavisd-new"
+
+depend() {
+ use net logger antivirus snmpd
+ before mta
+}
+
+start() {
+ ebegin "Starting ${progname}"
+ "${prog}" start
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${progname}"
+ "${prog}" stop 1>/dev/null
+ eend $?
+}
+
+reload() {
+ ebegin "Reloading ${progname}"
+ "${prog}" reload 1>/dev/null
+ eend $?
+}
+
+debug() {
+ ebegin "Starting ${progname} in debug mode"
+ "${prog}" debug
+ eend $?
+}
+
+debug_sa() {
+ ebegin "Starting ${progname} in debug-sa mode"
+ "${prog}" debug-sa
+ eend $?
+}
diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index 72688c123820..ad94427b2e9a 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -9,5 +9,6 @@
Add qmail support
Add support for mail-filter/razor
Add support for mail-filter/spamassassin
+ Add support for zeromq sockets
diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index 1453370deeba..6ac11a86f48c 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1 +1 @@
-DIST mediastreamer-2.7.3.tar.gz 758146 RMD160 ce37caec4b80012b3231929a9e337147ee730d1f SHA1 5d3c94b74131d2d333212de7315c39d230b91539 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0
+DIST mediastreamer-2.7.3.tar.gz 758146 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0 SHA512 f9ebfa12b1c760b5c24b5496466d92148a170ee2d522d9085db3fb72cc93f8e3e71ba1ae14f57d94a33b752450555c7d3ebf59267447203861247a8685e18259 WHIRLPOOL c1528bcca27c979ac29d6ccb6e32eac53ddd9e69d3f034056ad579d5ff6cd295c9224db6b841d6aa708e2c60251b192e85d6843342c14f8ead75d9f137c8d818
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..c242b5fe139c
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch
@@ -0,0 +1,94 @@
+Fix build with recent ffmpeg releases.
+https://bugs.gentoo.org/show_bug.cgi?id=419453
+
+Index: mediastreamer-2.7.3/src/videoenc.c
+===================================================================
+--- mediastreamer-2.7.3.orig/src/videoenc.c
++++ mediastreamer-2.7.3/src/videoenc.c
+@@ -53,7 +53,6 @@ void ms_ffmpeg_log_callback(void* ptr, i
+
+ void ms_ffmpeg_check_init(){
+ if(!avcodec_initialized){
+- avcodec_init();
+ avcodec_register_all();
+ avcodec_initialized=TRUE;
+ #ifdef ENABLE_LOG_FFMPEG
+@@ -107,6 +106,7 @@ typedef struct EncState{
+ uint32_t framenum;
+ VideoStarter starter;
+ bool_t req_vfu;
++ AVDictionary * ff_opts;
+ }EncState;
+
+ static int enc_set_fps(MSFilter *f, void *arg){
+@@ -214,6 +214,7 @@ static void enc_init(MSFilter *f, enum C
+ s->req_vfu=FALSE;
+ s->framenum=0;
+ s->av_context.codec=NULL;
++ s->ff_opts = NULL;
+ }
+
+ static void enc_h263_init(MSFilter *f){
+@@ -300,9 +301,9 @@ static void prepare_h263(EncState *s){
+ if (s->profile==0){
+ s->codec=CODEC_ID_H263;
+ }else{
+- c->flags|=CODEC_FLAG_H263P_UMV;
++ av_dict_set(&(s->ff_opts), "umv", "1", 0);
+ c->flags|=CODEC_FLAG_AC_PRED;
+- c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
++ av_dict_set(&(s->ff_opts), "structured_slices", "1", 0);
+ /*
+ c->flags|=CODEC_FLAG_OBMC;
+ c->flags|=CODEC_FLAG_AC_PRED;
+@@ -342,9 +343,9 @@ static void enc_preprocess(MSFilter *f){
+ ms_error("could not find encoder for codec id %i",s->codec);
+ return;
+ }
+- error=avcodec_open(&s->av_context, s->av_codec);
++ error=avcodec_open2(&s->av_context, s->av_codec, &(s->ff_opts));
+ if (error!=0) {
+- ms_error("avcodec_open() failed: %i",error);
++ ms_error("avcodec_open2() failed: %i",error);
+ return;
+ }
+ video_starter_init(&s->starter);
+@@ -372,7 +373,7 @@ static void add_rfc2190_header(mblk_t **
+ // assume video size is CIF or QCIF
+ if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
+ else header->b_wptr[1] = 0x40;
+- if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
++ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
+ header->b_wptr += 4;
+ header->b_cont = *packet;
+ *packet = header;
+@@ -779,7 +780,7 @@ static void process_frame(MSFilter *f, m
+ s->req_vfu=TRUE;
+ }
+ if (s->req_vfu){
+- pict.pict_type=FF_I_TYPE;
++ pict.pict_type=AV_PICTURE_TYPE_I;
+ s->req_vfu=FALSE;
+ }
+ comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
+@@ -799,7 +800,7 @@ static void process_frame(MSFilter *f, m
+ if (s->framenum==1){
+ video_starter_first_frame (&s->starter,f->ticker->time);
+ }
+- if (c->coded_frame->pict_type==FF_I_TYPE){
++ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
+ ms_message("Emitting I-frame");
+ }
+ comp_buf->b_wptr+=error;
+Index: mediastreamer-2.7.3/src/h264dec.c
+===================================================================
+--- mediastreamer-2.7.3.orig/src/h264dec.c
++++ mediastreamer-2.7.3/src/h264dec.c
+@@ -46,7 +46,6 @@ typedef struct _DecData{
+ static void ffmpeg_init(){
+ static bool_t done=FALSE;
+ if (!done){
+- avcodec_init();
+ avcodec_register_all();
+ done=TRUE;
+ }
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch
new file mode 100644
index 000000000000..66d055ede084
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch
@@ -0,0 +1,130 @@
+Update videoenc.c to the 2.8.2 version. Fixes some but not all problems with
+ffmpeg.
+
+
+--- mediastreamer-2.7.3/src/videoenc.c 2010-12-17 05:59:50.000000000 -0300
++++ mediastreamer-2.8.2/src/videoenc.c 2012-02-17 06:16:20.000000000 -0300
+@@ -164,6 +164,7 @@
+ }else{
+ ms_warning("unsupported video size %s",tmp);
+ ret=FALSE;
++ goto end;
+ }
+ divider=atoi(equal+1);
+ if (divider!=0){
+@@ -174,6 +175,8 @@
+ ret=FALSE;
+ }
+ }else ret=FALSE;
++
++end:
+ ms_free(tmp);
+ return ret;
+ }
+@@ -231,11 +234,7 @@
+
+ static void prepare(EncState *s){
+ AVCodecContext *c=&s->av_context;
+-#ifdef ANDROID
+ const int max_br_vbv=128000;
+-#else
+- const int max_br_vbv=256000;
+-#endif
+
+ avcodec_get_context_defaults(c);
+ if (s->codec==CODEC_ID_MJPEG)
+@@ -315,13 +314,6 @@
+ static void prepare_mpeg4(EncState *s){
+ AVCodecContext *c=&s->av_context;
+ c->max_b_frames=0; /*don't use b frames*/
+- c->flags|=CODEC_FLAG_AC_PRED;
+- c->flags|=CODEC_FLAG_H263P_UMV;
+- /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
+- c->flags|=CODEC_FLAG_4MV;
+- c->flags|=CODEC_FLAG_GMC;
+- c->flags|=CODEC_FLAG_LOOP_FILTER;
+- c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
+ }
+
+ static void enc_uninit(MSFilter *f){
+@@ -681,7 +673,7 @@
+ uint8_t *pbuf_ptr=full_frame->b_rptr;
+ uint8_t *buf_end=full_frame->b_wptr;
+
+- ms_message("image size: %i)", buf_end-pbuf_ptr);
++ ms_message("image size: %li)", (long)(buf_end-pbuf_ptr));
+
+ *lqt=NULL;
+ *cqt=NULL;
+@@ -689,7 +681,7 @@
+ err = find_marker(&pbuf_ptr, buf_end);
+ while (err!=-1)
+ {
+- ms_message("marker found: %x (offset from beginning%i)", err, pbuf_ptr-full_frame->b_rptr);
++ ms_message("marker found: %x (offset from beginning %li)", err, (long)(pbuf_ptr-full_frame->b_rptr));
+ if (err==0xdb)
+ {
+ /* copy DQT table */
+@@ -772,10 +764,12 @@
+ int error;
+ mblk_t *comp_buf=s->comp_buf;
+ int comp_buf_sz=comp_buf->b_datap->db_lim-comp_buf->b_datap->db_base;
++ YuvBuf yuv;
+
++ ms_yuv_buf_init_from_mblk(&yuv, inm);
+ /* convert image if necessary */
+ avcodec_get_frame_defaults(&pict);
+- avpicture_fill((AVPicture*)&pict,(uint8_t*)inm->b_rptr,c->pix_fmt,c->width,c->height);
++ avpicture_fill((AVPicture*)&pict,yuv.planes[0],c->pix_fmt,c->width,c->height);
+
+ /* timestamp used by ffmpeg, unset here */
+ pict.pts=AV_NOPTS_VALUE;
+@@ -796,7 +790,9 @@
+ comp_buf->b_wptr+=4;
+ comp_buf_sz-=4;
+ }
++
+ error=avcodec_encode_video(c, (uint8_t*)comp_buf->b_wptr,comp_buf_sz, &pict);
++
+ if (error<=0) ms_warning("ms_AVencoder_process: error %i.",error);
+ else{
+ s->framenum++;
+@@ -837,6 +833,14 @@
+ EncState *s=(EncState*)f->data;
+ bool_t snow=s->codec==CODEC_ID_SNOW;
+ s->maxbr=*(int*)arg;
++ if (s->av_context.codec!=NULL){
++ /*when we are processing, apply new settings immediately*/
++ ms_filter_lock(f);
++ enc_postprocess(f);
++ enc_preprocess(f);
++ ms_filter_unlock(f);
++ return 0;
++ }
+ if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){
+ s->vsize.width = MS_VIDEO_SIZE_SVGA_W;
+ s->vsize.height = MS_VIDEO_SIZE_SVGA_H;
+@@ -854,7 +858,7 @@
+ s->vsize.height=MS_VIDEO_SIZE_CIF_H;
+ s->fps=17;
+ s->qmin=3;
+- }else if (s->maxbr>=170000){
++ }else if (s->maxbr>=170000 && s->codec!=CODEC_ID_H263P && s->codec!=CODEC_ID_H263){
+ s->vsize.width=MS_VIDEO_SIZE_QVGA_W;
+ s->vsize.height=MS_VIDEO_SIZE_QVGA_H;
+ s->fps=15;
+@@ -875,14 +879,6 @@
+ s->fps=5;
+ s->qmin=5;
+ }
+-
+- if (s->av_context.codec!=NULL){
+- /*apply new settings dynamically*/
+- ms_filter_lock(f);
+- enc_postprocess(f);
+- enc_preprocess(f);
+- ms_filter_unlock(f);
+- }
+ return 0;
+ }
+
diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
index bb566d1f9d14..cd537c69e7f3 100644
--- a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.13 2012/05/05 08:02:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.14 2012/11/07 11:40:25 aballier Exp $
EAPI="4"
@@ -67,6 +67,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch"
epatch "${FILESDIR}/${P}-sdl-build.patch"
+ epatch "${FILESDIR}/${P}-videoenc_282.patch"
+ epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch"
# linux/videodev.h dropped in 2.6.38
sed -i -e 's:msv4l.c::' src/Makefile.am || die
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3b94cd8d712d..647b73e0c4f6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Nov 2012 11:37:00 +0000
+Wed, 07 Nov 2012 16:37:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 54a93a1492a1..031b3bcde9be 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Nov 2012 11:37:01 +0000
+Wed, 07 Nov 2012 16:37:02 +0000
diff --git a/metadata/md5-cache/app-admin/ranpwd-1.2 b/metadata/md5-cache/app-admin/ranpwd-1.2
index 62b4549ba9a4..8d6a0846c45d 100644
--- a/metadata/md5-cache/app-admin/ranpwd-1.2
+++ b/metadata/md5-cache/app-admin/ranpwd-1.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install test
DESCRIPTION=Generate random passwords using the in-kernel cryptographically secure random number generator
EAPI=3
HOMEPAGE=http://www.kernel.org/pub/software/utils/admin/ranpwd/
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ia64 ppc ppc64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://kernel/software/utils/admin/ranpwd/ranpwd-1.2.tar.gz
-_md5_=c9f9ec80d5098ff98cc72ab6c4885302
+_md5_=c397dc2ff6546e1093243f42c5819774
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.3.2 b/metadata/md5-cache/app-crypt/gpgme-1.3.2
index 805d98e8d2bd..ac19b85d7d19 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.3.2
+++ b/metadata/md5-cache/app-crypt/gpgme-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
EAPI=4
HOMEPAGE=http://www.gnupg.org/related_software/gpgme
IUSE=common-lisp static-libs
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4
SLOT=1
SRC_URI=mirror://gnupg/gpgme/gpgme-1.3.2.tar.bz2
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0253a95e51aecbf0bd299cab08c7e934
+_md5_=3b5e5d4b2713bd2a079c1ca00a2ba4c1
diff --git a/metadata/md5-cache/app-crypt/keynote-2.3-r3 b/metadata/md5-cache/app-crypt/keynote-2.3-r3
new file mode 100644
index 000000000000..f28d9246fe36
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keynote-2.3-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=ssl? ( dev-libs/openssl ) virtual/yacc
+DESCRIPTION=The KeyNote Trust-Management System
+EAPI=5
+HOMEPAGE=http://www1.cs.columbia.edu/~angelos/keynote.html
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=as-is
+RDEPEND=ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://www1.cs.columbia.edu/~angelos/Code/keynote-2.3.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1cc3732befde136f59d91c8574db9b2c
diff --git a/metadata/md5-cache/app-emulation/bochs-2.6 b/metadata/md5-cache/app-emulation/bochs-2.6
new file mode 100644
index 000000000000..3834cb4693bc
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/bochs-2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses ) doc? ( app-text/docbook-sgml-utils ) X? ( x11-proto/xproto ) sys-apps/sed >=app-text/opensp-1.5
+DESCRIPTION=LGPL-ed pc emulator
+EAPI=4
+HOMEPAGE=http://bochs.sourceforge.net/
+IUSE=3dnow avx debugger doc gdb ncurses readline svga sdl +smp wxwidgets vnc X +x86-64
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses )
+REQUIRED_USE=avx? ( x86-64 ) gdb? ( !debugger !smp ) debugger? ( !gdb )
+SLOT=0
+SRC_URI=mirror://sourceforge/bochs/bochs-2.6.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 wxwidgets fb1a306837717dfa2af841ecdf929565
+_md5_=f6a90b55d29029b8fd6e72a59d70199d
diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r5 b/metadata/md5-cache/app-misc/screen-4.0.3-r6
similarity index 96%
rename from metadata/md5-cache/app-misc/screen-4.0.3-r5
rename to metadata/md5-cache/app-misc/screen-4.0.3-r6
index 5bdd500a297d..22750dcd1e99 100644
--- a/metadata/md5-cache/app-misc/screen-4.0.3-r5
+++ b/metadata/md5-cache/app-misc/screen-4.0.3-r6
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinu
SLOT=0
SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=deb1995c1588cfd42e59351ca2312bfe
+_md5_=220bb2eeb7ff07aa1bbe868560ac7ed2
diff --git a/metadata/md5-cache/app-office/texmaker-3.5.2 b/metadata/md5-cache/app-office/texmaker-3.5.2
new file mode 100644
index 000000000000..90f9660b93fa
--- /dev/null
+++ b/metadata/md5-cache/app-office/texmaker-3.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=app-text/poppler[qt4] sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-webkit:4 app-text/hunspell virtual/pkgconfig
+DESCRIPTION=A nice LaTeX-IDE
+EAPI=4
+HOMEPAGE=http://www.xm1math.net/texmaker/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-text/poppler[qt4] sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-webkit:4 app-text/hunspell virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm
+SLOT=0
+SRC_URI=http://www.xm1math.net/texmaker/texmaker-3.5.2.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-r2 75aa32643ef22632eb9b45989b4c03fc toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=1a1055c23de30e4af28652b8427d84ad
diff --git a/metadata/md5-cache/app-office/texmakerx-2.1 b/metadata/md5-cache/app-office/texmakerx-2.1
deleted file mode 100644
index 04fda7c239e5..000000000000
--- a/metadata/md5-cache/app-office/texmakerx-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/hunspell app-text/poppler[qt4] x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-script-4.6.1:4 >=x11-libs/qt-test-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 virtual/pkgconfig
-DESCRIPTION=Fork of the LaTeX IDE TexMaker
-EAPI=4
-HOMEPAGE=http://texmakerx.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=app-text/hunspell app-text/poppler[qt4] x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-script-4.6.1:4 >=x11-libs/qt-test-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm
-SLOT=0
-SRC_URI=mirror://sourceforge/texmakerx/texmakerx/TexMakerX%202.1/texmakerx-2.1.tar.gz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-r2 75aa32643ef22632eb9b45989b4c03fc toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f39693c969143918437485e07b4f2852
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
index f1eb5e81ae15..e98a25fd3d2b 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse dev-lang/python[xml] dev-lang/python
SLOT=0
SRC_URI=mirror://gentoo/gentoolkit-0.3.0.7.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2836f20e253d2c2b26540bbdd5ce0b9e
+_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
+_md5_=4ccc53cc26794651641feb04d911cba5
diff --git a/metadata/md5-cache/dev-lang/v8-3.12.19.15 b/metadata/md5-cache/dev-lang/v8-3.12.19.15
deleted file mode 100644
index 80b8650b2b05..000000000000
--- a/metadata/md5-cache/dev-lang/v8-3.12.19.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Google's open source JavaScript engine
-EAPI=4
-HOMEPAGE=http://code.google.com/p/v8
-KEYWORDS=amd64 x86 ~x86-fbsd ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.12.19.15.tar.bz2
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=bdf577535fe38e4b98a25a635e09ab63
diff --git a/metadata/md5-cache/dev-lang/v8-3.13.7.4 b/metadata/md5-cache/dev-lang/v8-3.13.7.4
deleted file mode 100644
index 04205954f372..000000000000
--- a/metadata/md5-cache/dev-lang/v8-3.13.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup test
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Google's open source JavaScript engine
-EAPI=4
-HOMEPAGE=http://code.google.com/p/v8
-KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.13.7.4.tar.bz2
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=543bdd862da4227fdc72fc040bf5543b
diff --git a/metadata/md5-cache/dev-lang/v8-3.13.7.5 b/metadata/md5-cache/dev-lang/v8-3.13.7.5
index eca15be08941..e400003f1340 100644
--- a/metadata/md5-cache/dev-lang/v8-3.13.7.5
+++ b/metadata/md5-cache/dev-lang/v8-3.13.7.5
@@ -3,10 +3,10 @@ DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
DESCRIPTION=Google's open source JavaScript engine
EAPI=4
HOMEPAGE=http://code.google.com/p/v8
-KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
SLOT=0
SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.13.7.5.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=66dcb9c7f55642cb50b9073726e803fb
+_md5_=e6d40e1662362cd3d69f068feead326c
diff --git a/metadata/md5-cache/dev-python/guppy-0.1.9-r2 b/metadata/md5-cache/dev-python/guppy-0.1.9-r2
index c6c0005ec2d0..1324ef4b80ee 100644
--- a/metadata/md5-cache/dev-python/guppy-0.1.9-r2
+++ b/metadata/md5-cache/dev-python/guppy-0.1.9-r2
@@ -8,5 +8,5 @@ LICENSE=MIT
RDEPEND==dev-lang/python-2*
SLOT=0
SRC_URI=mirror://pypi/g/guppy/guppy-0.1.9.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=c4c66383f1390ec7a341c0d802ed4352
+_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cee96ae37480680f16dda73bb78b3d2d
diff --git a/metadata/md5-cache/dev-python/wehjit-0.2.2 b/metadata/md5-cache/dev-python/wehjit-0.2.2
index bd85ab2f88bf..81fda47edb34 100644
--- a/metadata/md5-cache/dev-python/wehjit-0.2.2
+++ b/metadata/md5-cache/dev-python/wehjit-0.2.2
@@ -1,13 +1,12 @@
DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/genshi dev-python/assets dev-python/paste dev-python/pygments dev-lang/python test? ( dev-python/nose )
+DEPEND=dev-python/genshi dev-python/assets dev-python/paste dev-python/pygments dev-lang/python
DESCRIPTION=A Python web-widget library
EAPI=3
HOMEPAGE=http://jderose.fedorapeople.org/wehjit
-IUSE=test
KEYWORDS=~x86 ~amd64
LICENSE=GPL-3
RDEPEND=dev-python/genshi dev-python/assets dev-python/paste dev-python/pygments dev-lang/python
SLOT=0
SRC_URI=http://jderose.fedorapeople.org/wehjit/0.2.2/wehjit-0.2.2.tar.gz
-_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=225f230a961a4b039988eefce3ee2bba
+_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4d255502dca632adf8acd43b0ba1cde6
diff --git a/metadata/md5-cache/dev-scheme/elk-3.99.8 b/metadata/md5-cache/dev-scheme/elk-3.99.8
new file mode 100644
index 000000000000..5422d3d84315
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/elk-3.99.8
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=Scheme implementation designed to be embeddable extension to C/C++ applications
+EAPI=4
+HOMEPAGE=http://sam.zoy.org/elk
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://sam.zoy.org/elk/elk-3.99.8.tar.bz2
+_md5_=ae598b89a979c89545be2bb8b5efdd73
diff --git a/metadata/md5-cache/dev-util/cpptest-1.1.2 b/metadata/md5-cache/dev-util/cpptest-1.1.2
index 82f5d8e256a6..2e1d35eec4cf 100644
--- a/metadata/md5-cache/dev-util/cpptest-1.1.2
+++ b/metadata/md5-cache/dev-util/cpptest-1.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Simple but powerful unit testing framework for C++
EAPI=4
HOMEPAGE=http://cpptest.sourceforge.net/
IUSE=doc
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ppc ppc64 ~sparc ~x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=mirror://sourceforge/cpptest/cpptest-1.1.2.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76541bf94b68566bbb6a4f3379fc903c
+_md5_=e2843ad0f1e256b077b3956ff1826ead
diff --git a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5 b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5
index f93cb56a8fba..07ff3c50b59b 100644
--- a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5
+++ b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=KDE frontend for NetworkManager
EAPI=4
HOMEPAGE=http://www.kde.org/
IUSE=debug linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fa linguas_fi linguas_ga linguas_hu linguas_it linguas_ja linguas_kk linguas_km linguas_lt linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_se linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=kde-base/solid-4.4:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
SLOT=4
SRC_URI=mirror://kde/unstable/networkmanagement/0.9.0.5/src/networkmanagement-0.9.0.5.tar.bz2
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils d9d351169c1d554e8f47f1a19f17becd eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 6e4e3fc3a36f43b71c84ad615e804a83 kde4-functions 37767566f9ffa88075c4d392a59100a9 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2e123646829d2562a08d3df89226d663
+_md5_=0e3ef823c9c6a1d8923218fbf31b6eff
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.8.0 b/metadata/md5-cache/mail-filter/amavisd-new-2.8.0
new file mode 100644
index 000000000000..eff3bfb76e2d
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.8.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare
+DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2
+DESCRIPTION=High-performance interface between the MTA and content checkers.
+EAPI=4
+HOMEPAGE=http://www.ijs.si/software/amavisd/
+IUSE=courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy dev-perl/IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin ) zmq? ( dev-perl/ZMQ-LibZMQ2 )
+SLOT=0
+SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.8.0.tar.xz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d762097c746b85ad63b42bcd50677562
diff --git a/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3 b/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3
index 5c0176755e35..e1cd404445ba 100644
--- a/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3
+++ b/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( oss alsa jack portaudio coreaudio pulseaudio ) video? ( || ( s
SLOT=0
SRC_URI=mirror://nongnu/linphone/mediastreamer/mediastreamer-2.7.3.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7dbab6f3994cbbcd50b0268fb851115f
+_md5_=e993c431f61e41aa8cb01b9d12bead10
diff --git a/metadata/md5-cache/net-analyzer/bwmon-1.3-r2 b/metadata/md5-cache/net-analyzer/bwmon-1.3-r2
index bdad7517d163..3caf9e6624f4 100644
--- a/metadata/md5-cache/net-analyzer/bwmon-1.3-r2
+++ b/metadata/md5-cache/net-analyzer/bwmon-1.3-r2
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses
DESCRIPTION=Simple ncurses bandwidth monitor
EAPI=4
HOMEPAGE=http://bwmon.sourceforge.net/
-KEYWORDS=amd64 hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 hppa ppc ~sparc ~x86
LICENSE=GPL-2 public-domain
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=mirror://sourceforge/bwmon/bwmon-1.3.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7f046a6215870d10e3d07b198107cc25
+_md5_=dac3d42b56c81d5de1bc0672cdc65a8a
diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
index b96bd910ed05..58d1825b30d2 100644
--- a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
+++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware
EAPI=4
HOMEPAGE=http://www.kismetwireless.net/spectools/
IUSE=ncurses gtk
-KEYWORDS=amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 arm ppc ~x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 )
SLOT=0
SRC_URI=http://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz
_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=fb0b097201f63a3c0d18f6d8d0620b63
+_md5_=2c4dfdb0d2b090c2e13213d07c6db9da
diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.2-r1 b/metadata/md5-cache/sys-apps/dstat-0.7.2-r1
index 2beeaeffa577..f37a97e353dc 100644
--- a/metadata/md5-cache/sys-apps/dstat-0.7.2-r1
+++ b/metadata/md5-cache/sys-apps/dstat-0.7.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Versatile replacement for vmstat, iostat and ifstat
EAPI=4
HOMEPAGE=http://dag.wieers.com/home-made/dstat/
IUSE=wifi
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=wifi? ( net-wireless/python-wifi ) =dev-lang/python-2*
SLOT=0
SRC_URI=http://dag.wieers.com/home-made/dstat/dstat-0.7.2.tar.bz2
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c761f1a8f566fdaa6d1171a16b4478bd
+_md5_=4f051d9ebe3179a4a41d9263492dc498
diff --git a/metadata/md5-cache/sys-apps/grep-2.14 b/metadata/md5-cache/sys-apps/grep-2.14
index ffa9c7d0286a..a2184027dfed 100644
--- a/metadata/md5-cache/sys-apps/grep-2.14
+++ b/metadata/md5-cache/sys-apps/grep-2.14
@@ -4,9 +4,9 @@ DESCRIPTION=GNU regular expression matcher
EAPI=3
HOMEPAGE=http://www.gnu.org/software/grep/
IUSE=nls pcre
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=nls? ( virtual/libintl ) pcre? ( >=dev-libs/libpcre-7.8-r1 ) virtual/libiconv
SLOT=0
SRC_URI=mirror://gnu/grep/grep-2.14.tar.xz mirror://gentoo/grep-2.14.tar.xz
-_md5_=369088db48e59924fb9195cc17da032f
+_md5_=cc1a58e5366f714daad7ff627fda2980
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index 4f01d12ccc8c..0e82fb4816fc 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -8,4 +8,4 @@ LICENSE=BSD-2
RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=mail-mta/ssmtp-2.64-r2[mta] =mail-mta/msmtp-1.4.19-r1[mta] =mail-mta/ssmtp-2.64-r2[mta] =mail-mta/msmtp-1.4.19-r1[mta] =net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=4
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +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_ms +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
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.94.tar.bz2
-_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=122ba60705a7540e3253871f0b5d06ba
diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.40 b/metadata/md5-cache/www-client/chromium-23.0.1271.40
deleted file mode 100644
index 4669bafd943c..000000000000
--- a/metadata/md5-cache/www-client/chromium-23.0.1271.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=4
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +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_ms +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
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2
-_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f2fd7ab0f1a3077a9100cfe299ff6584
diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.60 b/metadata/md5-cache/www-client/chromium-23.0.1271.60
deleted file mode 100644
index caa50ad0d989..000000000000
--- a/metadata/md5-cache/www-client/chromium-23.0.1271.60
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=4
-HOMEPAGE=http://chromium.org/
-IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +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_ms +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
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.60.tar.bz2
-_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=46cef513843158ccf1057c0966d4ab58
diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.64 b/metadata/md5-cache/www-client/chromium-23.0.1271.64
index c570ab31f0e5..2f158a7d4825 100644
--- a/metadata/md5-cache/www-client/chromium-23.0.1271.64
+++ b/metadata/md5-cache/www-client/chromium-23.0.1271.64
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source version of Google Chrome web browser
EAPI=4
HOMEPAGE=http://chromium.org/
IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +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_ms +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
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=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 >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
SLOT=0
SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.64.tar.bz2
_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9e3b2e8ee05bb309e2f4d89c2c8c68c5
+_md5_=3004c9f61fa4c5d62d1790ed92d52ff6
diff --git a/metadata/md5-cache/www-client/opera-12.11.1653 b/metadata/md5-cache/www-client/opera-12.11.1653
new file mode 100644
index 000000000000..9b2b9eb564e5
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-12.11.1653
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser and Internet suite
+EAPI=4
+HOMEPAGE=http://www.opera.com/
+IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=OPERA-12 LGPL-2 LGPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core:4 x11-libs/qt-gui:4 ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta )
+SLOT=0
+SRC_URI=amd64? ( http://snapshot.opera.com/unix/19084_12.11-1653/opera-12.11-1653.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/19084_12.11-1653/opera-12.11-1653.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/19084_12.11-1653/opera-12.11-1653.i386.freebsd.tar.xz )
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=512a35d51f9dd4aa24b1959ed691d813
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.243 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.243
deleted file mode 100644
index 6b74c3436965..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.243
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst pretend setup unpack
-DEPEND=amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
-DESCRIPTION=Adobe Flash Player
-EAPI=4
-HOMEPAGE=http://www.adobe.com/products/flashplayer.html
-IUSE=multilib -32bit +64bit vdpau kde +sse2check
-KEYWORDS=-* amd64 x86
-LICENSE=AdobeFlash-10.3
-RDEPEND=x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( multilib? ( 64bit? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) 32bit? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) ) !multilib? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=x86? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_i386.tar.gz -> adobe-flash-11.2.202.243.i386.tar.gz ) amd64? ( multilib? ( 32bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_i386.tar.gz -> adobe-flash-11.2.202.243.i386.tar.gz ) 64bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_x86_64.tar.gz -> adobe-flash-11.2.202.243.x86_64.tar.gz ) ) !multilib? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_x86_64.tar.gz -> adobe-flash-11.2.202.243.x86_64.tar.gz ) )
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 nsplugins b195a1306f4ee7cf507037dc6aa5ba89 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ed1c4ebcc86bd17ad09fd94835935079
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index eb94b03b6931..0e580dbedec5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Nov 2012 11:37:03 +0000
+Wed, 07 Nov 2012 16:37:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 55b1f06681be..212c8904cd29 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov 7 11:37:00 UTC 2012
+Wed Nov 7 16:37:01 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 85b1edb92e09..a0700fbe3fdb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 07 Nov 2012 12:00:01 +0000
+Wed, 07 Nov 2012 17:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0ab8a43c34c1..81a7fd7df21c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1352288101 Wed Nov 7 11:35:01 2012 UTC
+1352306101 Wed Nov 7 16:35:01 2012 UTC
diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
index 32301bc18561..d9434b931201 100644
--- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
+++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.3 2012/11/07 03:23:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.4 2012/11/07 13:14:40 blueness Exp $
EAPI="4"
@@ -15,7 +15,7 @@ RDEPEND="${DEPEND}"
SLOT="0"
LICENSE="GPL-2 public-domain"
-KEYWORDS="amd64 hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ~sparc ~x86"
IUSE=""
src_prepare() {
diff --git a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
index 3cf64b92549f..6058eb7013ec 100644
--- a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
+++ b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.2 2012/11/06 17:08:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.4 2012/11/07 13:27:51 blueness Exp $
EAPI=4
inherit toolchain-funcs
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~ppc ~x86"
+ KEYWORDS="amd64 arm ppc ~x86"
fi
DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
diff --git a/profiles/package.mask b/profiles/package.mask
index 00b29c8bb1a9..3e1b8684125b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14198 2012/11/06 22:30:01 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14199 2012/11/07 16:07:20 jer 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
@@ -591,6 +591,7 @@ sys-apps/systemd-sysv-utils
# Opera Next and Opera snapshots are unsupported and eternally unstable.
#
www-client/opera-next
+=www-client/opera-12.11*
# Hanno Boeck (15 Dec 2011)
# Breaks pam_mount, which is its only user in the tree.
diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012
index 6a5369d87a8e..b0699e7bdd56 100644
--- a/profiles/updates/4Q-2012
+++ b/profiles/updates/4Q-2012
@@ -42,3 +42,4 @@ slotmove dev-util/boost-build 1.50 0
slotmove dev-util/boost-build 1.51 0
slotmove net-im/emesene 2 0
move sci-chemistry/mmtk sci-libs/mmtk
+move app-office/texmakerx app-office/texstudio
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4180e086860d..fd95802c4a5c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -405,7 +405,10 @@ app-emacs/slime:xref - Install xref.lisp cross-referencing tool
app-emacs/vm:bbdb - Include support for app-emacs/bbdb
app-emacs/wanderlust:bbdb - Include support for app-emacs/bbdb
app-emacs/wikipedia-mode:outline-magic - Enable support for outline-mode extensions (app-emacs/outline-magic)
-app-emulation/bochs:debugger - Enable the bochs debugger
+app-emulation/bochs:avx - Enable support for Advanced Vector Extensions (AVX)
+app-emulation/bochs:debugger - Enable debugger (slows down emulation)
+app-emulation/bochs:gdb - Enable support for the remote GDB stub
+app-emulation/bochs:x86-64 - Enable support for emulation of 64-bit CPUs
app-emulation/e-uae:capslib - Add CAPS library support
app-emulation/e-uae:sdl-sound - Use media-libs/sdl-sound for audio output
app-emulation/emul-linux-x86-baselibs:development - Install pkgconfig files
@@ -2381,6 +2384,7 @@ mail-filter/amavisd-new:dkim - Add DomainKeys Identified Mail support
mail-filter/amavisd-new:qmail - Add qmail support
mail-filter/amavisd-new:razor - Add support for mail-filter/razor
mail-filter/amavisd-new:spamassassin - Add support for mail-filter/spamassassin
+mail-filter/amavisd-new:zmq - Add support for zeromq sockets
mail-filter/ask:procmail - Adds support for mail-filter/procmail
mail-filter/assp:spf - Adds support for Sender Policy Framework
mail-filter/assp:srs - Adds support for Sender Rewriting Scheme
diff --git a/sys-apps/dstat/dstat-0.7.2-r1.ebuild b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
index 547225f889ff..6e00d91609a6 100644
--- a/sys-apps/dstat/dstat-0.7.2-r1.ebuild
+++ b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.7 2012/11/07 10:42:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.8 2012/11/07 13:10:16 blueness Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="wifi"
RDEPEND="wifi? ( net-wireless/python-wifi )"
diff --git a/sys-apps/grep/grep-2.14.ebuild b/sys-apps/grep/grep-2.14.ebuild
index 32b7a860f6df..70474482f48e 100644
--- a/sys-apps/grep/grep-2.14.ebuild
+++ b/sys-apps/grep/grep-2.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.14.ebuild,v 1.3 2012/11/07 04:38:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.14.ebuild,v 1.4 2012/11/07 13:00:47 blueness Exp $
EAPI="3"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls pcre"
RDEPEND="nls? ( virtual/libintl )
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 3cd60fa98a2a..8a179bda7366 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.114 2012/10/31 23:43:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.115 2012/11/07 14:59:23 williamh Exp $
EAPI=4
@@ -141,24 +141,24 @@ add_boot_init() {
local runlevel=${2:-boot}
# if the initscript is not going to be installed and is not
# currently installed, return
- [[ -e ${ED}/etc/init.d/${initd} || -e ${EROOT}/etc/init.d/${initd} ]] \
+ [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
|| return
- [[ -e ${EROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
+ [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
# if runlevels dont exist just yet, then create it but still flag
# to pkg_postinst that it needs real setup #277323
- if [[ ! -d ${EROOT}/etc/runlevels/${runlevel} ]] ; then
- mkdir -p "${EROOT}"/etc/runlevels/${runlevel}
- touch "${EROOT}"/etc/runlevels/.add_boot_init.created
+ if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+ mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+ touch "${EROOT}"etc/runlevels/.add_boot_init.created
fi
elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
- ln -snf "${EROOT}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd}
+ ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
}
add_boot_init_mit_config() {
local config=$1 initd=$2
if [[ -e ${EROOT}${config} ]] ; then
- if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"/${config}) ]] ; then
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
add_boot_init ${initd}
fi
fi
@@ -172,55 +172,55 @@ pkg_preinst() {
# manager doesnt go throwing etc-update crap at us -- postinst is
# too late to prevent that. this behavior also lets us keep the
# file in the CONTENTS for binary packages.
- [[ -e ${EROOT}/etc/conf.d/net ]] && \
- cp "${EROOT}"/etc/conf.d/net "${ED}"/etc/conf.d/
+ [[ -e "${EROOT}"etc/conf.d/net ]] && \
+ cp "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/
# avoid default thrashing in conf.d files when possible #295406
- if [[ -e ${EROOT}/etc/conf.d/hostname ]] ; then
+ if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
(
unset hostname HOSTNAME
- source "${EROOT}"/etc/conf.d/hostname
+ source "${EROOT}"etc/conf.d/hostname
: ${hostname:=${HOSTNAME}}
[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
)
fi
# upgrade timezone file ... do it before moving clock
- if [[ -e ${EROOT}/etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
+ if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
(
unset TIMEZONE
- source "${EROOT}"/etc/conf.d/clock
- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"/etc/timezone
+ source "${EROOT}"etc/conf.d/clock
+ [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone
)
fi
# /etc/conf.d/clock moved to /etc/conf.d/hwclock
local clock
use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
- if [[ -e ${EROOT}/etc/conf.d/clock ]] ; then
- mv "${EROOT}"/etc/conf.d/clock "${EROOT}"/etc/conf.d/${clock}
+ if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then
+ mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock}
fi
- if [[ -e ${EROOT}/etc/init.d/clock ]] ; then
- rm -f "${EROOT}"/etc/init.d/clock
+ if [[ -e "${EROOT}"etc/init.d/clock ]] ; then
+ rm -f "${EROOT}"etc/init.d/clock
fi
- if [[ -L ${EROOT}/etc/runlevels/boot/clock ]] ; then
- rm -f "${EROOT}"/etc/runlevels/boot/clock
- ln -snf /etc/init.d/${clock} "${EROOT}"/etc/runlevels/boot/${clock}
+ if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then
+ rm -f "${EROOT}"etc/runlevels/boot/clock
+ ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock}
fi
- if [[ -L ${EROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
- rm -f "${EROOT}${LIBDIR}"/rc/init.d/started/clock
- ln -snf /etc/init.d/${clock} "${EROOT}${LIBDIR}"/rc/init.d/started/${clock}
+ if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then
+ rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock
+ ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock}
fi
# /etc/conf.d/rc is no longer used for configuration
- if [[ -e ${EROOT}/etc/conf.d/rc ]] ; then
+ if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then
elog "/etc/conf.d/rc is no longer used for configuration."
elog "Please migrate your settings to /etc/rc.conf as applicable"
elog "and delete /etc/conf.d/rc"
fi
# force net init.d scripts into symlinks
- for f in "${EROOT}"/etc/init.d/net.* ; do
+ for f in "${EROOT}"etc/init.d/net.* ; do
[[ -e ${f} ]] || continue # catch net.* not matching anything
[[ ${f} == */net.lo ]] && continue # real file now
[[ ${f} == *.openrc.bak ]] && continue
@@ -276,8 +276,8 @@ migrate_udev_init_script() {
# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
migrate_udev_mount_script() {
- if [ -e "${EROOT}"/etc/runlevels/sysinit/udev -a \
- ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]; then
+ if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+ ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
add_boot_init udev-mount sysinit
fi
return 0
@@ -297,22 +297,22 @@ migrate_from_baselayout_1() {
add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
add_boot_init_mit_config /etc/mdadm.conf mdraid
add_boot_init_mit_config /etc/evms.conf evms
- [[ -e ${EROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
- [[ -e ${EROOT}/sbin/vgscan ]] && add_boot_init lvm
+ [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper
+ [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm
elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
elog "init.d scripts. If you use such a thing, make sure you have the"
elog "required init.d scripts added to your boot runlevel."
# Upgrade our state for baselayout-1 users
- if [[ ! -e ${EROOT}${LIBDIR}/rc/init.d/started ]] ; then
+ if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then
(
- [[ -e ${EROOT}/etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
+ [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
svcdir=${svcdir:-/var/lib/init.d}
- if [[ ! -d ${EROOT}${svcdir}/started ]] ; then
+ if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then
ewarn "No state found, and no state exists"
elog "You should reboot this host"
else
- mkdir -p "${EROOT}${LIBDIR}/rc/init.d"
+ mkdir -p "${EROOT}"${LIBDIR}/rc/init.d
einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d"
mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d
rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \
@@ -324,13 +324,13 @@ migrate_from_baselayout_1() {
fi
# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
- if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then
+ if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
- rm -f "${EROOT}"/etc/modules.autoload.d/.keep*
- rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null
- if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then
+ rm -f "${EROOT}"etc/modules.autoload.d/.keep*
+ rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
+ if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
local f v
- for f in "${EROOT}"/etc/modules.autoload.d/* ; do
+ for f in "${EROOT}"etc/modules.autoload.d/* ; do
v=${f##*/}
v=${v#kernel-}
v=${v//[^[:alnum:]]/_}
@@ -354,7 +354,7 @@ migrate_from_baselayout_1() {
' "${f}" >> "${ED}"/etc/conf.d/modules
done
rm -f "${f}"
- rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null
+ rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
fi
fi
}
@@ -363,29 +363,29 @@ pkg_postinst() {
local LIBDIR=$(get_libdir)
# Remove old baselayout links
- rm -f "${EROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
- rm -f "${EROOT}"/etc/init.d/{depscan,runscript}.sh
+ rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin}
+ rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh
# Make our runlevels if they don't exist
- if [[ ! -e ${EROOT}/etc/runlevels ]] || [[ -e ${EROOT}/etc/runlevels/.add_boot_init.created ]] ; then
+ if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
einfo "Copying across default runlevels"
- cp -RPp "${EROOT}"/usr/share/${PN}/runlevels "${EROOT}"/etc
- rm -f "${EROOT}"/etc/runlevels/.add_boot_init.created
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+ rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
else
- if [[ ! -e ${EROOT}/etc/runlevels/sysinit/devfs ]] ; then
- mkdir -p "${EROOT}"/etc/runlevels/sysinit
- cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/sysinit/* \
- "${EROOT}"/etc/runlevels/sysinit
+ if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+ mkdir -p "${EROOT}"etc/runlevels/sysinit
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+ "${EROOT}"etc/runlevels/sysinit
fi
- if [[ ! -e ${EROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
- mkdir -p "${EROOT}"/etc/runlevels/shutdown
- cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/shutdown/* \
- "${EROOT}"/etc/runlevels/shutdown
+ if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+ mkdir -p "${EROOT}"etc/runlevels/shutdown
+ cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+ "${EROOT}"etc/runlevels/shutdown
fi
fi
# /etc/conf.d/net.example is no longer valid
- local NET_EXAMPLE="${EROOT}/etc/conf.d/net.example"
+ local NET_EXAMPLE="${EROOT}etc/conf.d/net.example"
local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
if [[ -e "${NET_EXAMPLE}" ]] ; then
if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
@@ -395,11 +395,11 @@ pkg_postinst() {
sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
elog "${NET_EXAMPLE} should be removed."
fi
- elog "The new file is ${EROOT}/usr/share/doc/${PF}/net.example"
+ elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example"
fi
# /etc/conf.d/wireless.example is no longer valid
- local WIRELESS_EXAMPLE="${EROOT}/etc/conf.d/wireless.example"
+ local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example"
local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
@@ -410,11 +410,11 @@ pkg_postinst() {
elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
fi
elog "If you are using the old style network scripts,"
- elog "Configure wireless settings in ${EROOT}/etc/conf.d/net"
- elog "after reviewing ${EROOT}/usr/share/doc/${PF}/net.example"
+ elog "Configure wireless settings in ${EROOT}etc/conf.d/net"
+ elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example"
fi
- if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then
+ if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
ewarn "/etc/modules.autoload.d is no longer used. Please convert"
ewarn "your files to /etc/conf.d/modules and delete the directory."
fi
@@ -450,7 +450,7 @@ pkg_postinst() {
local netscript=net.lo
fi
- if [ ! -e "${EROOT}"/etc/runlevels/boot/${netscript} ]; then
+ if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then
ewarn "Please add the $netscript script to your boot runlevel"
ewarn "as soon as possible. Not doing so could leave you with a system"
ewarn "without networking."
@@ -460,7 +460,7 @@ pkg_postinst() {
ewarn "satisfies the net virtual."
ewarn "If you have services now which do not start because of this,"
ewarn "They can be fixed by adding rc_need=\"!net\""
- ewarn "to the ${EROOT}/etc/conf.d/ file."
+ ewarn "to the ${EROOT}etc/conf.d/ file."
ewarn "You should also file a bug against the service asking that"
ewarn "need net be dropped from the dependencies."
ewarn "The bug you file should block the following tracker:"
diff --git a/virtual/mta/mta-0.ebuild b/virtual/mta/mta-0.ebuild
index 504d037b59ea..d14a82788726 100644
--- a/virtual/mta/mta-0.ebuild
+++ b/virtual/mta/mta-0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mta/mta-0.ebuild,v 1.7 2012/04/26 14:23:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mta/mta-0.ebuild,v 1.8 2012/11/07 11:42:04 eras Exp $
EAPI=3
@@ -24,7 +24,6 @@ RDEPEND="|| ( >=mail-mta/ssmtp-2.64-r2[mta]
mail-mta/mini-qmail
>=mail-mta/msmtp-1.4.19-r1[mta]
web-apps
- sysadmin
+
+ tampakrap@gentoo.org
+