Sync with portage [Fri Sep 7 22:04:59 MSK 2012].

12 years ago · 9c2e998762
parent 191bf40ee3
commit 9c2e998762
592 changed files with 7257 additions and 3262 deletions
--- a/app-admin/eselect-boost/eselect-boost-0.4.ebuild
+++ b/app-admin/eselect-boost/eselect-boost-0.4.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-admin/eselect-boost/eselect-boost-0.4.ebuild,v 1.8 2012/06/03 16:25:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-boost/eselect-boost-0.4.ebuild,v 1.9 2012/09/05 22:34:58 blueness Exp $

 inherit multilib

@ -10,7 +10,7 @@ SRC_URI=""

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""

 DEPEND=""
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@ -0,0 +1 @@
+DIST openrc-settingsd-1.0.tar.xz 243464 SHA256 1ab2da6de3fe53adc9138c88c8b5e06cae0ba8451cdb53f70197aa5b0306adf0 SHA512 d3a2ce493dbf0c1f449589bf731d85ee1f024226d439780b9986624cafccaa58032658e28f3f05bf1f4a3400bc19c14fcd0418bdf054777bc7d2f9cdf026135f WHIRLPOOL 6482ad2cecfad54891c1959febd0a334fc0c2b4290294bddb5526eaf606721bf98542e4b4a798283da6aca4d0c7060ff3d3186745e792316c67738f9dae6a4ed
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>tetromino@gentoo.org</email>
+	<name>Alexandre Rostovtsev</name>
+</maintainer>
+<herd>gnome</herd>
+<use>
+	<flag name="systemd">Use the versions of dbus and polkit files provided by
+		<pkg>sys-apps/systemd</pkg></flag>
+</use>
+</pkgmetadata>
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild,v 1.1 2012/09/07 16:20:23 tetromino Exp $
+
+EAPI=4
+
+DESCRIPTION="System settings D-Bus service for OpenRC"
+HOMEPAGE="http://gnome.gentoo.org/openrc-settingsd.xml"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
+	dev-libs/libdaemon
+	sys-apps/dbus
+	sys-apps/openrc
+	sys-auth/polkit"
+RDEPEND="${COMMON_DEPEND}
+	sys-auth/nss-myhostname
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/gdbus-codegen
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--with-pidfile="${EPREFIX}"/var/run/openrc-settingsd.pid
+}
+
+src_install() {
+	default
+	if use systemd; then
+		# Avoid file collision with systemd
+		rm -vr "${ED}"usr/share/{dbus-1,polkit-1} "${ED}"etc/dbus-1 || die "rm failed"
+	fi
+}
+
+pkg_postinst() {
+	if use systemd; then
+		elog "You installed ${PN} with USE=systemd. In this mode,"
+		elog "${PN} will not start via simple dbus activation, so you"
+		elog "will have to manually enable it as an rc service:"
+		elog " # /etc/init.d/openrc-settingsd start"
+		elog " # rc-update add openrc-settingsd default"
+	fi
+}
--- a/app-arch/pbzip2/pbzip2-1.1.8.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.8.ebuild,v 1.1 2012/08/06 23:19:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.8.ebuild,v 1.2 2012/09/07 15:45:36 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"

 LICENSE="PBZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"

 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
--- a/app-arch/pigz/pigz-2.2.5.ebuild
+++ b/app-arch/pigz/pigz-2.2.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/app-arch/pigz/pigz-2.2.5.ebuild,v 1.2 2012/08/06 19:34:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.2.5.ebuild,v 1.3 2012/09/07 15:43:35 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"

 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
+KEYWORDS="~alpha amd64 ~mips ~sparc ~x86 ~amd64-linux ~sparc64-solaris"
 IUSE="static symlink test"

 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
--- a/app-editors/nano/nano-2.3.1-r2.ebuild
+++ b/app-editors/nano/nano-2.3.1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r2.ebuild,v 1.1 2012/08/26 03:24:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r2.ebuild,v 1.2 2012/09/06 19:56:00 vapier Exp $

 EAPI="3"

@ -56,7 +56,7 @@ src_configure() {

 src_install() {
 	emake DESTDIR="${D}" install || die
-	rm -r "${ED}"/usr/share/nano/man-html || die
+	rm -rf "${ED}"/usr/share/nano/man-html

 	dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
 	dohtml doc/faq.html
--- a/app-editors/xemacs/files/xemacs.desktop
+++ b/app-editors/xemacs/files/xemacs.desktop
@ -29,6 +29,6 @@ Exec=xemacs %f
 Icon=xemacs
 Type=Application
 Terminal=false
-Categories=Development;TextEditor;
+Categories=Development;TextEditor;Utility;
 Encoding=UTF-8
 StartupWMClass=Emacs
--- a/app-editors/xemacs/xemacs-21.5.31.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.31.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-editors/xemacs/xemacs-21.5.31.ebuild,v 1.10 2012/09/05 08:48:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.11 2012/09/07 13:21:53 graaff Exp $

 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@ -39,7 +39,7 @@ RDEPEND="
 	motif? ( >=x11-libs/openmotif-2.3:0[xft=] )
 	athena? ( x11-libs/libXaw )
 	Xaw3d? ( x11-libs/libXaw3d )
-	xft? ( media-libs/freetype x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
 	tiff? ( media-libs/tiff )
--- a/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.19.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-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.1 2012/07/21 09:40:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-daemon/emacs-daemon-0.19.ebuild,v 1.2 2012/09/06 15:56:49 ago Exp $

 inherit elisp

@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""

 DEPEND=">=virtual/emacs-23"
--- a/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-mipsen.patch
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-mipsen.patch
@ -0,0 +1,18 @@
+Fixes link failure due to missing piix symbols.
+
+  LINK  mips-softmmu/qemu-system-mips
+hw/mips/../mips_malta.o: In function `mips_malta_init':
+mips_malta.c:(.text+0x2314): undefined reference to `piix4_pm_init'
+collect2: error: ld returned 1 exit status
+diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
+index 29a5d0d..89af0e9 100644
+--- a/hw/mips/Makefile.objs
+++ b/hw/mips/Makefile.objs
+@@ -1,6 +1,7 @@
+ obj-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
+ obj-y += mips_addr.o mips_timer.o mips_int.o
+ obj-y += gt64xxx.o mc146818rtc.o
+obj-y += acpi.o acpi_piix4.o
+ obj-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
+ 
+ obj-y := $(addprefix ../,$(obj-y))
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.57 2012/08/31 16:34:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.59 2012/09/07 12:39:49 slyfox Exp $

 EAPI="4"

@ -30,9 +30,9 @@ kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
 smartcard spice static systemtap tci tls usbredir vde +vhost-net \
 virtfs xattr xen xfs"

-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"

 # Setup the default SoftMMU targets, while using the loops
 # below to setup the other targets. x86_64 should be the only
@ -193,6 +193,7 @@ src_prepare() {

 	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"

+	epatch "${FILESDIR}"/${P}-fix-mipsen.patch
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
@ -251,6 +252,8 @@ src_configure() {
 	# --enable-vnc-thread will go away in 1.2
 	# $(use_enable xen xen-pci-passthrough) for 1.2
 	# $(use_enable debug debug-mon) goes away for 1.2
+	# --disable-seccomp as in-tree seccomp is API incompatible (in-tree
+	# version is ancient)
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-bsd-user \
@ -261,6 +264,7 @@ src_configure() {
 		--enable-vnc-jpeg \
 		--enable-vnc-png \
 		--python=python2 \
+		--disable-seccomp \
 		$(use_enable aio linux-aio) \
 		$(use_enable bluetooth bluez) \
 		$(use_enable brltty brlapi) \
@ -271,7 +275,6 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable fdt) \
 		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux kvm-device-assignment) \
 		$(use_enable kernel_linux nptl) \
 		$(use_enable kernel_linux uuid) \
 		$(use_enable ncurses curses) \
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.20 2012/08/18 18:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.21 2012/09/07 13:35:48 slyfox Exp $

 EAPI=4

@ -26,9 +26,9 @@ IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
 opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
 +vhost-net xattr xen xfs"

-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"

 for target in ${IUSE_SOFTMMU_TARGETS}; do
 	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@ -90,7 +90,7 @@ DEPEND="${RDEPEND}
 # alpha ELF binary. don't let portage mess with it
 STRIP_MASK="usr/share/qemu/palcode-clipper"

-QA_PRESTRIPPED="
+QA_PREBUILT="
 	usr/share/qemu/openbios-ppc
 	usr/share/qemu/openbios-sparc64
 	usr/share/qemu/openbios-sparc32
@ -108,6 +108,7 @@ QA_WX_LOAD="${QA_PRESTRIPPED}
 	usr/bin/qemu-microblazeel
 	usr/bin/qemu-mips
 	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
 	usr/bin/qemu-ppc
 	usr/bin/qemu-ppc64
 	usr/bin/qemu-ppc64abi32
@ -192,7 +193,6 @@ src_configure() {
 		$(use_enable sdl)
 		$(use_enable spice)
 		$(use_enable ssl vnc-tls)
-		$(use_enable threads vnc-thread)
 		$(use_enable vde)
 		$(use_enable vhost-net)
 		$(use_enable xen)
@ -215,6 +215,7 @@ src_configure() {
 		--disable-libiscsi \
 		--enable-nptl \
 		--enable-uuid \
+		--disable-seccomp \
 		${conf_opts} \
 		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
 		--audio-drv-list="${audio_opts}" \
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@ -1,2 +1,3 @@
 DIST binwalk-0.4.3.tar.gz 701052 SHA256 2eceb316bfb65d43c3422caf5cdd3752ec5d79b1fed57253f47e8513cd9dcaac SHA512 9a648566817f1f640c0c23149aba3d39b9bed8c9f62b2b1a238e46a5d49746b1a13450581a845c65f146028321b76f167ce798d8f4da2064665aed5a6b646cfd WHIRLPOOL 556e2db7a033a2bdf1df07c70b172116198d2ba65b50a070e697d8839620aee1e13be507f9becab277de28519310f2f7ce25c22efacf79df3dfb43c539386a4d
 DIST binwalk-0.4.4.tar.gz 110296 SHA256 211d50230e8af62ea5a85b4a31f812dba3f9b31310f07ec6f6a2df4f7509578e SHA512 4723cead712683118d1cad5fa19ba6abe413ee535ecfdd5c42a4f7e09168581c271046f31ed556e53f5655a1a844c0f9110f989cf5e4158117f4c7189035ac79 WHIRLPOOL 3ddada89eb10219db89dee054ae5646177419986b57d21335e1947b625df5483742054bf694e60b9c605b27c3812d690703ab71bba59f2141adcd7e58c183145
+DIST binwalk-0.4.5.tar.gz 112526 SHA256 0797173ef20f581e7573976c70e4b2575656d56b482a9392a8795714436da2f0 SHA512 1670ca6c00857b9e7af0d58fcf5bb2b85bbfc79c605ff2910a78f29d246493608ccd74e35e078fe88cd50778dbf1fb4e98c5eabcfc9e4300265e3003079823b7 WHIRLPOOL a2d008532b8f39559454d5fb69caaf2ce108338ba3815f7e09e4a3ab552c666a005fa6854d5cec74d3ac20e0ddde6c44ea9abccd8e2f8eb9aaf7dc24e44ea48a
--- a/app-misc/binwalk/binwalk-0.4.5.ebuild
+++ b/app-misc/binwalk/binwalk-0.4.5.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-0.4.5.ebuild,v 1.1 2012/09/07 08:51:48 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="http://code.google.com/p/binwalk/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/file"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../docs/README )
+
+src_configure() {
+	econf --disable-updates
+}
--- a/app-misc/ttysnoop/metadata.xml
+++ b/app-misc/ttysnoop/metadata.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
  <email>maksbotan@gentoo.org</email>
 </maintainer>
--- a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
+++ b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ttysnoop/ttysnoop-0.12d.ebuild,v 1.1 2012/07/02 11:46:15 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ttysnoop/ttysnoop-0.12d.ebuild,v 1.2 2012/09/07 11:04:56 xarthisius Exp $

 EAPI="4"

--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@ -1 +1,2 @@
 DIST kmymoney-4.6.2.tar.bz2 22762330 SHA256 add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75 SHA512 004d3f09c18a860e1ee24f5c9074587ebf2f4bedcb8fd4bf990c43d3bf3c6664ba2b6d00f465793256576009a39df42ae98a048d1996d4ac350fc48fd67dbce3 WHIRLPOOL eed36c3855c42fe17b5b0ed9ccbb48541aba1f42eac97d9beb7f3074ebcc61b32a9d3197db905d6f7f7ab373a8da81a939ac09391e1a91de23c11b6e52757682
+DIST kmymoney-4.6.3.tar.bz2 22114966 SHA256 94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e SHA512 4fc618718463a324c67abc4d8b43f682b364c63299aca25c6730c9a2f6a1affc1bec02b65352de1e6e5b58f06b66c600e96f1c20de126719d90c2a0b933fd00a WHIRLPOOL fd53a0dee4ccad438a3c15dee85aa9270b0806d39311045a1ca1e4f3cc1f969800e723a9aa780966c84c3a8f909a3d5e09e805deddfd548077f07fe1c7bdc015
--- a/app-office/kmymoney/kmymoney-4.6.3.ebuild
+++ b/app-office/kmymoney/kmymoney-4.6.3.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.3.ebuild,v 1.1 2012/09/07 10:59:33 johu Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl
+	hu it ja kk lt ms nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+	KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+	KDE_HANDBOOK="optional"
+	SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
+fi
+
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+
+inherit kde4-base
+
+DESCRIPTION="Personal finance manager for KDE"
+HOMEPAGE="http://kmymoney2.sourceforge.net/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug calendar doc hbci ofx quotes test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme
+	>=app-office/libalkimia-4.3.2
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp:2.6
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-libs/gmp
+	dev-libs/libgpg-error
+	dev-libs/libxml2
+	$(add_kdebase_dep kdepimlibs)
+	x11-misc/shared-mime-info
+	calendar? ( dev-libs/libical )
+	hbci? (
+		>=net-libs/aqbanking-5.0.1
+		>=sys-libs/gwenhywfar-4.0.1[qt4]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	quotes? ( dev-perl/Finance-Quote )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.2-gcc-4.7.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake-utils_use_enable calendar LIBICAL)
+		$(cmake-utils_use_use doc DEVELOPER_DOC)
+		$(cmake-utils_use_enable hbci KBANKING)
+		$(cmake-utils_use_enable ofx LIBOFX)
+		$(cmake-utils_use test KDE4_BUILD_TESTS)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	use doc && kde4-base_src_compile apidoc
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/")
+	kde4-base_src_install
+}
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@ -1,24 +1,12 @@
-DIST amd64-debug-libreoffice-base-3.5.4.2-r1.tar.xz 711671980 SHA256 227247ccad116075bd3dba42697fe426c88c4581c9e611cb4c84f083f601c7c8
 DIST amd64-debug-libreoffice-base-3.5.5.3.tar.xz 711950432 SHA256 78317e01f55513229bbd732ee960ef307c9b5934075fd8d43b5bab813bdcc043 SHA512 8d99202248de21ba372fb81a501cbbd69e0e3dd2dd3dd35cf8678772ea06e7ead6862393fc8c4938c61ddebcb612fc60e86bd06388189889c1d2600fdd5a9ed9 WHIRLPOOL ce0a56fa708f2d8773383b93f6a196d2385c0cc6c841027a76efcff4754436ea489128f0bb3cca049f9e03e8ec20794c26eafdaa11020ccf12b7021b091e5e0b
-DIST amd64-debug-libreoffice-base-java-3.5.4.2-r1.tar.xz 715402016 SHA256 253cba52c0139bc487755aaf29d6642101adc5195e124c91415309fd360e8038
 DIST amd64-debug-libreoffice-base-java-3.5.5.3.tar.xz 715671200 SHA256 ec2bd886ad94bb86b8c83ac2e3858f024c547f39641ef7fa32823fed29dc657e SHA512 740fd6dd01abc088945b7296883a1cbbaf08ce1fbcf1fda3310d9410b3f5d82e3a04cc8954a5f9800af4052b3344821d7e6983b85b8c703ad3cf21bc942cf7c2 WHIRLPOOL 0669c357559570a49196363238630d787c1171103e3aaac3cf1f58f5fe602273ef55845ab3caf304e5f41634bd724ab7dc7975dac6f2be9ac5653e2a73c2538c
-DIST amd64-debug-libreoffice-gnome-3.5.4.2-r1.tar.xz 712804256 SHA256 41b0790bef58630ce4dc39d79f807d519194fc703af001de66b5cac94e38a888
 DIST amd64-debug-libreoffice-gnome-3.5.5.3.tar.xz 713053536 SHA256 7c1f0e1b7d64cd64c0f5f3c1befba41e26befe2599ce74ae7159e72ccc685bd8 SHA512 f93b7316eaf9ec0e81ba6c32eaa5a3141b18e5a063555f1d0ac53e9a77e986bef259ac20071edf025646453d3cbeae9216fde2dc0677cc8782c35a55bbe7d556 WHIRLPOOL ca215008463392fb3f23f1b9b078ab8cc11900e916f962b5ef5f14c4ea434f20ffb01133854285ff6d2ab29cc2569d2e53e034f4f7bb0ae048904e3c3e8e631f
-DIST amd64-debug-libreoffice-gnome-java-3.5.4.2-r1.tar.xz 716506324 SHA256 f01ca08bb58550b75bcfb1f64e87346614f281ff2b3a2702a4eb6cd04f14216d
 DIST amd64-debug-libreoffice-gnome-java-3.5.5.3.tar.xz 716797872 SHA256 0e02dac57f2e73211437f9c2b35addb96c0f9e32682050eefbc6e7555cfc3c23 SHA512 4b1aec46716300d9a27d2f1c3cc5c5c7cdee5a642d6c6474007e6040fa464fdb3f4344308b05650355fddbf150ff7477efd1ecb76b2721f1b265d8e0ed6cbd86 WHIRLPOOL 4e7ca69571ffc884e454e8586c335f4188cb04d947884575097c1cbdd58b205dc9ac03200e95c3dda00c7cc41a922d1150dfeb78ea8199b1e9f822d508a25c6a
-DIST amd64-debug-libreoffice-kde-3.5.4.2-r1.tar.xz 712736540 SHA256 5d1f6e9177cba3e0f851915de6fd7fa4474cfec06b41ce085f7f4c4cf02cf0d4
 DIST amd64-debug-libreoffice-kde-3.5.5.3.tar.xz 712999132 SHA256 cdd20ef0411b2ecc6805746f0022fa9a6748bcc4dd4c9cc531391da616bb9550 SHA512 7ec3c40d8be50856118b7369da877e4b66dd40f3a0784b8e0bf5ad43fb5b467630e3fe268187505dcf95c8f94a40caa25e8a6cd5d8b5df1fe2a2d21662d588e4 WHIRLPOOL 1465d6f681bdd3c573ca6adc73e9d85e3d8f84e2352982de97aaf830ee77f2eb611a427bf8c6ed9e539473bbccdc2f4852688c12c5750ee5076ee194d8121043
-DIST amd64-debug-libreoffice-kde-java-3.5.4.2-r1.tar.xz 716454632 SHA256 a1f71526ecae1e2a69b2e9bf6964a4ed6c2b05d59e58d34e873a3737b30b5488
 DIST amd64-debug-libreoffice-kde-java-3.5.5.3.tar.xz 716729108 SHA256 5678a4d140d7ca6cfcc1984aafda4dc5e99947c0c1fdd2c418528526aa3686ef SHA512 80a34788f62c3546e2d1615a4f05dc44b4d0f3e77d5da173ec6261a2cbb39bbee06504ad55edbcd29ee6ff5a78f3442100c5702d7ca45000abce15fe70e703b7 WHIRLPOOL d61e2fb193fd68c396c19437e02e6ee37b4274f5f1b3393103c9fb0fb54611951293577aeb6e352f20dcc8121f476144474c61f8712c9f39c769c82e26dd3822
-DIST x86-debug-libreoffice-base-3.5.4.2-r1.tar.xz 691539092 SHA256 6d1ea855159498b74b18c4ad506d2b0b806c281c156de14248c5ea196fddb1f4 SHA512 6b4f985d922103d3e8e24aa2344a634e5d0b62f992aa406c8789017a17d69c307d41c363dac96692ce6353feee5afcb8fc1e43d6f2143f905a9974fb6b378716 WHIRLPOOL 6aa86b10f73680012ffe26a2fcd7a0476ee0326d25744812ed0a1df7645cee9c951919a4ccb6564381445a82a52c34f1e4135513855b899f37e18e692859d1a2
 DIST x86-debug-libreoffice-base-3.5.5.3.tar.xz 692423300 SHA256 1e880e0471bee8c836c3ea27e1a4aaf98f8c49b47ddd7d45b8c8ea5739868e68 SHA512 fda6b3bb35b9c4a49a3e8f1726203f3032ec3fcd4d791764c88a428640509001b3f5d9d0bd7b3b54f18c072474c0e46b93db64d641ecc2a50760b7733cbd8dc1 WHIRLPOOL c90dc1e072cfd3f1fb15b853b6f334bc2d8d5bc9804bfe7e3ba9365e8494977fec138a1c007cd88cd1ba9f089132696832e50c997fbaa334d52bc9af1e0b8d9d
-DIST x86-debug-libreoffice-base-java-3.5.4.2-r1.tar.xz 695126588 SHA256 1e5329234952950299cb69953939be7303f533264f5ed1d73eb09ece19c74317 SHA512 5235c5d0c5b88bb73993c84e837ec0ae6f1985637946f5cd849a3709bba12313af24c800e058b5bd9e492618ca3c7f493a15a543a9cab0b5242963203809d901 WHIRLPOOL e61afc6bb27aff354c7e81d7b50990505b5305ee915dcb68a7f734d94d86417bfe0ea49f5f1c65048f5225b6b6843791d16b4cd06ff2b78013063e0dea738ecc
 DIST x86-debug-libreoffice-base-java-3.5.5.3.tar.xz 695993560 SHA256 a4a6264532192f21c552606cd62c7334a3b87bfe4586a251c951d9f9d7f2d29d SHA512 33425c08d77b5307dcf7a127002b01070ddf5f71726c8825ed413a12bd27123527a8c44084bd81d0821b39ab844417948b0bea703d166bc05a817ea703f556b4 WHIRLPOOL 30e433ed62e76d2e913443bd0ed615efffffcba582e8c7083f46443939af45ba869d5ba3119cf49f5b45a2d59dee92caa6ee5072ea530db00136e526bced0e80
-DIST x86-debug-libreoffice-gnome-3.5.4.2-r1.tar.xz 692615448 SHA256 74d64cbfdf781a61405a5b69fbe13c0eb9293f48b7fb636fa41415c87851b462 SHA512 424f3f6aaa01c81c4b54d98b3b235fee38c1210fa7010e11426a3149f6e485f8a470a6aa79b23e5f66f34a66ccff4c4c4435dee76d43d48c8a4771a6caad930a WHIRLPOOL 108c3d01fe01a8553422046f4a1ee3137e8e79f2050e8d1b6cc328beab8ff8dd0d25fee46ec506d4eb8e8895925eaddb23858c264b4af0841a448d9e0b533fb5
 DIST x86-debug-libreoffice-gnome-3.5.5.3.tar.xz 693498740 SHA256 cf10fb4813300fe510b895342fb37333e8bd64b3ddf5f9bb3041d5d7ccb34f07 SHA512 5c1bfc89ef0fc38e6624c2db0650d14545cdf26431f8631399f73a50d6095205ac467f826916ffe8dca9d78cc79f70065a06b3b262a8ff80437362f09d0a727c WHIRLPOOL 6d8101b6450793532382a14ffbb751582d650613e10380f6130fec772509120fc789ec41d02c000a797e664b134fb1a974b7fdd9f3b49d7b219e893214a65b54
-DIST x86-debug-libreoffice-gnome-java-3.5.4.2-r1.tar.xz 696210568 SHA256 cb00c241826c95342c98159dfce61bec1bc06df0be63b70345934b974ba7a508 SHA512 d67d786d977a60381fb5fc887fe7d2d10aaf441fed04651cbaf2de383cdcedaebd5e935fd3b1629b3e6af703adc8e843da29e1cfdeab42ef4224fd1a4ff12d25 WHIRLPOOL 9febf88baa95516dac7abf7bea605301a9a9c6aaf6f968a6d0ae0cffcb2742cb61739078be5283a3e23213a953d0b0312fc3861c406b80b84f22b4be308c3e63
 DIST x86-debug-libreoffice-gnome-java-3.5.5.3.tar.xz 697080844 SHA256 f8d5d3e05e865ac02d023bf1ed2b49d42c5e16226da45cf53e3457421c1700bd SHA512 05ae4fb90f7bcdde9c873958984d8b3d241ec090787e45ab391f25f88fc524830de304e3add79f45a7c03ccef3713b7e261ff035608fc13f5a3dae4ac2e758f2 WHIRLPOOL 7c6636b54d87e8c47744eacff335c034aeb5db435c89c1bcd0d0980ffc781815cdd5d5aca9cb7c1ed2c763c3cda29e91b23b89d62813241ba718f6f7f2835db4
-DIST x86-debug-libreoffice-kde-3.5.4.2-r1.tar.xz 692592664 SHA256 4910db826bbbc79bdc2c36047a1d784ce89186b9cf2591eb0f23a484a69a4877 SHA512 3f7b30f30ffd473e5d9f320b357def40032bef5ff60e0047556799ae601c30aedc735b31eb9b2753eb120be76ebcf920839bf11de0a8d6347136ca061e3eef33 WHIRLPOOL ea9bce29e4207e8e710d880f44c6efa4d458b9bbc2c2796f94c98d9a0b78fa5197da7f45efe7a8663d5ac776a8f8bcdea4f6df9a3288a2fd0c4565bfcc811146
 DIST x86-debug-libreoffice-kde-3.5.5.3.tar.xz 693466024 SHA256 8b5db5211aaac48f0919b4cf0eb5921f9c25ec386a363c7d79c8562a907ed33b SHA512 7df7da4e8d5892df06a2b69f9dbc46f4e9a9b88f37988e39ae1313b3ce10d7a0c502f19e5240a6a97603a15f306a6d700fe926cac63c043f4740c4a5112ad8dc WHIRLPOOL 8a8099e9a12682ce31ac99dfcfd5a6c8bbade83237e56c2001fcb273d494d0d9602df9eafdab0a658fd7d76bce04e5da1d5f050115a213fe0b20f76994552839
-DIST x86-debug-libreoffice-kde-java-3.5.4.2-r1.tar.xz 696193320 SHA256 c43b409f302f20d936892b47fe6b831265e14b5c0aebf0fcebd74f87f6fe470d SHA512 6d477912950edc9a7206c0c97675c90484cf9f69815e8489a87b017fd27291b4018ee573667cac89e704a2dba959fbb1def3dd5b30781105c3c61b3a8724cac6 WHIRLPOOL fb7668f8bee6a3b430c56f5ca30b595d86aaf5e583b38956ceec01b189b51ecbc7970dd5d73067039766f87cd11a5551650ebf846a6ff6361668073e4b8b375d
 DIST x86-debug-libreoffice-kde-java-3.5.5.3.tar.xz 697065564 SHA256 f84657158628050644c15cec8a02163d55266ac55521f2e3f08048653699527c SHA512 18fa0bd5ba49033079d596f1ab4427a716e44b0ba3bb46173208600459094e615c861408ad372c53c769784ab27908bed0b5726296f7c6fd1ca2eb53c61c2d46 WHIRLPOOL 6d5d0ab84890d35e8535069653000871fb852656108a673ad3639569f163e08713c4eb5c237dcf55aecd5fb77b6f7d9ac0c56dfe9f48b7e994bc9dc70ae2e382
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild
@ -1,64 +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/libreoffice-bin-debug/libreoffice-bin-debug-3.5.4.2-r1.ebuild,v 1.4 2012/06/11 19:27:55 jdhore Exp $
-
-EAPI=4
-
-BASE_AMD64_URI="mirror://gentoo/amd64-debug-"
-BASE_X86_URI="mirror://gentoo/x86-debug-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info."
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI_AMD64="
-	kde? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-kde-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-kde-java-${PVR}.tar.xz )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-gnome-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-gnome-java-${PVR}.tar.xz )
-	)
-	!kde? ( !gnome? (
-		!java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-base-${PVR}.tar.xz )
-		java? ( ${BASE_AMD64_URI}${PN/-bin-debug}-base-java-${PVR}.tar.xz )
-	) )
-"
-SRC_URI_X86="
-	kde? (
-		!java? ( ${BASE_X86_URI}${PN/-bin-debug}-kde-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin-debug}-kde-java-${PVR}.tar.xz )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}${PN/-bin-debug}-gnome-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin-debug}-gnome-java-${PVR}.tar.xz )
-	)
-	!kde? ( !gnome? (
-		!java? ( ${BASE_X86_URI}${PN/-bin-debug}-base-${PVR}.tar.xz )
-		java? ( ${BASE_X86_URI}${PN/-bin-debug}-base-java-${PVR}.tar.xz )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
--- a/app-pda/gtkpod/gtkpod-2.1.2.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.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/app-pda/gtkpod/gtkpod-2.1.2.ebuild,v 1.2 2012/08/02 13:41:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.2.ebuild,v 1.3 2012/09/07 15:48:44 ago Exp $

 EAPI=4
 inherit eutils gnome2-utils
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis webkit"

 COMMON_DEPEND="dev-libs/gdl:3
--- a/app-portage/install-mask/install-mask-0.0.2-r1.ebuild
+++ b/app-portage/install-mask/install-mask-0.0.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/app-portage/install-mask/install-mask-0.0.2-r1.ebuild,v 1.1 2012/08/31 09:09:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/install-mask/install-mask-0.0.2-r1.ebuild,v 1.2 2012/09/07 10:47:31 mgorny Exp $

 EAPI=4
 PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
@ -8,8 +8,8 @@ PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
 inherit base python-distutils-ng

 DESCRIPTION="Handle INSTALL_MASK setting in make.conf"
-HOMEPAGE="https://github.com/mgorny/install-mask/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://bitbucket.org/mgorny/install-mask/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/app-portage/install-mask/metadata.xml
+++ b/app-portage/install-mask/metadata.xml
@ -10,6 +10,6 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/install-mask/issues/</bugs-to>
+		<bugs-to>https://bitbucket.org/mgorny/install-mask/issues/</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/app-shells/esh/esh-0.8.5-r1.ebuild
+++ b/app-shells/esh/esh-0.8.5-r1.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r1.ebuild,v 1.4 2012/03/18 15:36:43 armin76 Exp $
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A UNIX Shell with a simplified Scheme syntax"
-HOMEPAGE="http://slon.ttk.ru/esh/"
-SRC_URI="http://slon.ttk.ru/esh/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i \
-		-e 's|-g ||' \
-		-e 's|-DMEM_DEBUG ||' \
-		-e 's|^CFLAGS|&+|g' \
-		-e 's|^LIB=|LIB= -lncurses |' \
-		-e 's|$(CC) |&$(CFLAGS) $(LDFLAGS) |g' \
-		-e 's:-ltermcap::' \
-		Makefile || die "sed Makefile"
-	}
-src_compile() {
-	# For some reason, this tarball has binary files in it for x86.
-	# Make clean so we can rebuild for our arch and optimization.
-	emake clean
-
-	use debug && append-flags -DMEM_DEBUG
-
-	emake \
-		CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin esh || die
-	doinfo doc/esh.info
-	dodoc CHANGELOG CREDITS GC_README HEADER READLINE-HACKS TODO
-	dohtml doc/*.html
-	docinto examples
-	dodoc examples/*
-	insinto /usr/share/emacs/site-lisp/
-	doins emacs/esh-mode.el
-}
--- a/app-shells/esh/esh-0.8.5-r2.ebuild
+++ b/app-shells/esh/esh-0.8.5-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r2.ebuild,v 1.2 2012/09/01 13:39:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/esh/esh-0.8.5-r2.ebuild,v 1.4 2012/09/07 13:26:57 johu Exp $

 EAPI="2"

@ -12,7 +12,7 @@ SRC_URI="http://slon.ttk.ru/esh/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"

 DEPEND=">=sys-libs/ncurses-5.1
--- a/app-text/bibletime/bibletime-2.9.1.ebuild
+++ b/app-text/bibletime/bibletime-2.9.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.9.1.ebuild,v 1.1 2012/09/04 13:32:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.9.1.ebuild,v 1.4 2012/09/07 12:15:19 johu Exp $

 EAPI=4
 inherit cmake-utils
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20so

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"

 # bug 313657
@ -37,8 +37,6 @@ DOCS=( ChangeLog README )
 src_prepare() {
 	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt;:" \
 	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
-
-	cmake-utils_src_prepare
 }

 src_configure() {
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-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/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild,v 1.1 2012/07/03 20:39:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.77.1-r1.ebuild,v 1.4 2012/09/07 13:14:46 johu Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="ruby"

 RDEPEND=">=app-text/build-docbook-catalog-1.4
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@ -1,3 +1,4 @@
 DIST dos2unix-5.3.3.tar.gz 58085 SHA256 60f62dc6536a22252204bc7cba8b411d5303859cd8b7eff27443445b0fc056ba SHA512 2e5ebe3568a756a02b8d8ed9c1f3dc46b133c18818b11099f3e5afbe3b244921a451282502156f74c99c3b4e018e25b1f28ba4581f72e92040a994eb44fa852e WHIRLPOOL b67386cd78468c5474d2fe6abf4336dae8a8f9aa8ea2630b24a0ed72c6685a4b6793e3aefa000d1be6a44a2576c389c580e796b6e0166b91eda789ed228de968
 DIST dos2unix-6.0.1.tar.gz 70487 SHA256 d96096041ac6f8d1e641aeb0f7e6e7d2e0e4cc8fd13817d70610c4f89d53e749 SHA512 d19ca2fe880be5c7309ea63e55b150dffb95796d9ce26601c887b91686743ce19cf3b0b9be4c6a9581cf11afaee811c8331265df824759acdc1ef5a9e380e9cd WHIRLPOOL c443da06dd3cbcf8ae3038b1c737277fe19410b50b0975a5f3dd0f09ae2d62b164869f58d1adbb79d1507323560b8a2eaf5f0c68a5afe63b6b85453a1f226884
+DIST dos2unix-6.0.2.tar.gz 73801 SHA256 6a46e4e2e0cb2ed2b609a11f9c7245aa45ac57ea75a3452b1bca8960184441be SHA512 261e544032cff7fc1d518ccca4096b41b59155545aff6a5f840925d8c7a93a604a8f7c41b31d97dd205bef830fdde28e7a3d70a4aaa42181bc4433c1b06a38e6 WHIRLPOOL 79f88962bf51b88706037f1ec7dabb4076003706f3b8f711d50f923425a8aada557fbecf22a2c9b881c04337138db6548b26506a06fbc0fe9e6791242ec763e7
 DIST dos2unix-6.0.tar.gz 67666 SHA256 0a3dafe5ca3dc6f640a73197322975a4cb20e9bba699ebfecaaecc15f962389e SHA512 7be4bd090cf0399572cd5c4bad01b005dfa2294bc6d02382852770c4bb197b480cbfea95b9646618bedf8fcb8c491e0939656361ed12b92289d72dd62e762dec WHIRLPOOL 64ddbc80ecfd400ae96cd67b5ecdcd6a686ec90117977340eec8e679ab9df30618cfe9bef4a30c8239078c90bcf6be38f8d3b93ed220090f79fd5ff89b56ea6f
--- a/app-text/dos2unix/dos2unix-6.0.2.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.2.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.2.ebuild,v 1.1 2012/09/06 22:06:44 radhermit Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls"
+
+RDEPEND="
+	!app-text/hd2u
+	!app-text/unix2dos
+	virtual/libintl"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/^CC/s|=|?=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(use nls || echo "ENABLE_NLS=") install
+}
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@ -1 +0,0 @@
-DIST epdfview-0.1.8.tar.bz2 466270 SHA256 948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0 SHA512 e81ca39158ed77040a00b69cdbbea4726a1bbf4885a096aaa3dfc4c64d0cbcadabdc69c559bb14d23c2bf7fc8244799176d2c2d5689ab670c13237edc10e8e40 WHIRLPOOL b95d399826923f9b10e119071845b0f4873021f64f58b6b369b087043282e9e7de44ccf8d75bc4aaa8b71a57a3b5b050c3f0808a1fdb1f63e10ede981b511e0c
--- a/app-text/epdfview/epdfview-0.1.8-r1.ebuild
+++ b/app-text/epdfview/epdfview-0.1.8-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8-r1.ebuild,v 1.4 2012/05/04 03:33:15 jdhore Exp $
-
-EAPI=4
-inherit eutils fdo-mime
-
-DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
-HOMEPAGE="http://trac.emma-soft.com/epdfview/"
-SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cups nls test"
-
-RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
-	>=x11-libs/pango-1.28.4
-	>=x11-libs/gtk+-2.6:2
-	cups? ( >=net-print/cups-1.1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/cppunit )
-	userland_GNU? ( >=sys-apps/findutils-4.4 )"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
-		data/epdfview.desktop || die
-	epatch "${FILESDIR}/${P}-swap-blue-red-channels.patch" \
-		"${FILESDIR}/${P}-glib-2.31-build-fix.patch"
-}
-
-src_configure() {
-	econf $(use_with cups) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	local res
-	for res in 24 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps
-		newins data/icon_epdfview-${res}.png epdfview.png || die
-	done
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
--- a/app-text/epdfview/epdfview-0.1.8.ebuild
+++ b/app-text/epdfview/epdfview-0.1.8.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.8.ebuild,v 1.10 2012/05/04 03:33:15 jdhore Exp $
-
-EAPI=4
-inherit fdo-mime
-
-DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
-HOMEPAGE="http://trac.emma-soft.com/epdfview/"
-SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="cups nls test"
-
-RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
-	>=x11-libs/pango-1.28.4
-	>=x11-libs/gtk+-2.6:2
-	cups? ( >=net-print/cups-1.1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/cppunit )
-	userland_GNU? ( >=sys-apps/findutils-4.4 )"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e 's:Icon=icon_epdfview-48:Icon=epdfview:' \
-		data/epdfview.desktop || die
-}
-
-src_configure() {
-	econf $(use_with cups) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	local res
-	for res in 24 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps
-		newins data/icon_epdfview-${res}.png epdfview.png || die
-	done
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
--- a/app-text/epdfview/files/epdfview-0.1.8-glib-2.31-build-fix.patch
+++ b/app-text/epdfview/files/epdfview-0.1.8-glib-2.31-build-fix.patch
@ -1,11 +0,0 @@
-Index: trunk/src/gtk/StockIcons.h
-===================================================================
--- trunk/src/gtk/StockIcons.h	(revision 325)
-+++ trunk/src/gtk/StockIcons.h	(revision 369)
-@@ -19,5 +19,5 @@
- #define __STOCK_ICONS_H__
- 
-#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
--- a/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch
+++ b/app-text/epdfview/files/epdfview-0.1.8-swap-blue-red-channels.patch
@ -1,39 +0,0 @@
-Index: /trunk/src/PDFDocument.cxx
-===================================================================
--- /trunk/src/PDFDocument.cxx	(revision 361)
-+++ /trunk/src/PDFDocument.cxx	(revision 367)
-@@ -21,4 +21,5 @@
- #include <poppler.h>
- #include <unistd.h>
-+#include <algorithm>
- #include "epdfview.h"
- 
-@@ -33,4 +34,22 @@
- static PageMode convertPageMode (gint pageMode);
- static gchar *getAbsoluteFileName (const gchar *fileName);
-+
-+namespace
-+{
-+    void
-+    convert_bgra_to_rgba (guint8 *data, int width, int height)
-+    {
-+        using std::swap;
-+
-+        for (int y = 0; y < height; y++)
-+        {
-+            for (int x = 0; x < width; x++)
-+            {
-+                swap(data[0], data[2]);
-+                data += 4;
-+            }
-+        }
-+    }
-+}
- 
- ///
-@@ -651,4 +670,5 @@
-         cairo_destroy(context);
-         cairo_surface_destroy (surface);
-+        convert_bgra_to_rgba(renderedPage->getData (), width, height);
- #else // !HAVE_POPPLER_0_17_0
-         // Create the pixbuf from the data and render to it.
--- a/app-text/epdfview/metadata.xml
+++ b/app-text/epdfview/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>printing</herd>
-  <maintainer>
-    <email>billie@gentoo.org</email>
-    <name>Daniel Pielmeier</name>
-  </maintainer>
-</pkgmetadata>
--- a/app-text/mftrace/mftrace-1.2.18.ebuild
+++ b/app-text/mftrace/mftrace-1.2.18.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.18.ebuild,v 1.1 2011/12/16 05:46:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mftrace/mftrace-1.2.18.ebuild,v 1.3 2012/09/07 15:47:53 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -11,7 +11,7 @@ DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
 HOMEPAGE="http://lilypond.org/mftrace/"
 SRC_URI="http://lilypond.org/download/sources/mftrace/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ~x86 ~x86-fbsd"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
 IUSE="test truetype"
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@ -1 +1,2 @@
 DIST qpdf-3.0.1.tar.gz 4841926 SHA256 db65d6f4f0462d4793049afb7edf9ac9386fb8bdb51d10b5b88a004e1cc36bc6 SHA512 dcff4a66d8e7ca555ab59f5abba944a67a0d73dd32b48fcaf5152530750d7cff4d18bf9649a0b2057ab4cb0a85b20a5bb45b23c1c32a2038094094747e3a6834 WHIRLPOOL 82799491850cfb9e6a37e0b1447c90bd22a974a6b87c0e64271bc13d1b9bbd81a53ff0af86ba7aba01d744b2856e3741199b6f7e5ee324c213e120896823594f
+DIST qpdf-3.0.2.tar.gz 4846068 SHA256 b0c284945a49c46a0da6f54b06ff25237491ccc0c8bb062ae57d30aee80e165e SHA512 0ee534cb3f1fb31a85e8d1e0e78d02630dd4e008660c93b376e1dfd3850b313e73ba4db4f148f263ecccebb357b3d44b70d89babfaa2117c1b634467547f14a8 WHIRLPOOL 39768d1dc70dddb73cd2a50b3b9eaffae2295a8715d5683b007d801b0d183acce040e9f405338cd01757dfbe13950d4de328eba0014d67c934ade25bcf432385
--- a/app-text/qpdf/qpdf-3.0.2.ebuild
+++ b/app-text/qpdf/qpdf-3.0.2.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-3.0.2.ebuild,v 1.1 2012/09/07 08:46:04 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="A command-line program that does structural, content-preserving transformations on PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+IUSE="doc examples static-libs test"
+
+RDEPEND="dev-libs/libpcre
+	sys-libs/zlib
+	>=dev-lang/perl-5.8"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl
+	)"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+	# Manually install docs
+	sed -i -e "/docdir/d" make/libtool.mk || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		dodoc doc/qpdf-manual.pdf
+		dohtml doc/*
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+}
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@ -1 +1,2 @@
 DIST qpdfview-0.3.2.tar.gz 93403 SHA256 dd55c4e8d6e94a881d3bf40044b9e230df15d64371e9be176bf5be9650d75b7b SHA512 3e62fa85492fbd42c7af165f918afa75d167695d617276dfa597e2d500e732b3dc86609bfe1c87118565f8a57c82c7a61fc4031aa529c27da8da05d80991117a WHIRLPOOL 7e16534adfede582fdf3c37b9f5a2f2e02bbec918b1abe9406b1963dfa9bc52e3ca37e4d43f8669ca3405217e593e8165f9e0c217b4215e12663e3b0c833ab27
+DIST qpdfview-0.3.3.tar.gz 110069 SHA256 759d1377ab132805b97b18bc3b720d249897efddf96f181de36b3140be424a85 SHA512 c41e7e0fa7c128323110a038f5713b542d3a08570e2a4c57e28b270cf1bb37f51c1d96a038eb5ef0c4ec198890e8a81bf9236b3ab0f4c8e4682a0a35711dc9e2 WHIRLPOOL ee20c26dc3c4f9f3ca553f2828161318efa43a7110c1899b8c44b2223513cfd8882b6245a03217f6e4ceba54016105a1ae397d678902c9ee542ecc908f44ad16
--- a/app-text/qpdfview/qpdfview-0.3.3.ebuild
+++ b/app-text/qpdfview/qpdfview-0.3.3.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.3.ebuild,v 1.1 2012/09/06 04:20:14 ssuominen Exp $
+
+EAPI=4
+PLOCALES="cs de el ru sk uk"
+inherit l10n qt4-r2
+
+DESCRIPTION="A tabbed PDF viewer using the poppler library"
+HOMEPAGE="http://launchpad.net/qpdfview"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups dbus svg"
+
+RDEPEND="app-text/poppler[qt4]
+	x11-libs/qt-core:4[iconv]
+	x11-libs/qt-gui:4
+	cups? ( net-print/cups )
+	dbus? ( x11-libs/qt-dbus:4 )
+	svg? ( x11-libs/qt-svg:4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="CONTRIBUTORS README TODO"
+
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_configure() {
+	local config i
+
+	for i in cups dbus svg ; do
+		if ! use ${i} ; then
+			config+=" without_${i}"
+		fi
+	done
+
+	eqmake4 CONFIG+="${config}"
+}
+
+rm_loc() {
+	einfo "Removing ${1} localization..."
+	sed -e "s;translations/${PN}_${1}.ts;;" \
+		-i ${PN}.pro || die "sed translations failed"
+	rm translations/${PN}_${1}.{qm,ts} || die "rm translations failed"
+}
--- a/app-text/zathura/zathura-0.2.1.ebuild
+++ b/app-text/zathura/zathura-0.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.1.ebuild,v 1.1 2012/09/03 18:43:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura/zathura-0.2.1.ebuild,v 1.2 2012/09/06 17:42:21 ssuominen Exp $

 EAPI=4
 inherit eutils multilib toolchain-funcs
@ -28,7 +28,7 @@ pkg_setup() {
 		ZATHURA_GTK_VERSION=2
 		WITH_SQLITE=$(usex sqlite 1 0)
 		LIBDIR='${PREFIX}'/$(get_libdir)
-		RSTTOMAN="$(type -P rst2man.py || echo true)"
+		RSTTOMAN="$(use doc && type -P rst2man.py)"
 		CC="$(tc-getCC)"
 		SFLAGS=""
 		VERBOSE=1
@ -36,6 +36,12 @@ pkg_setup() {
 		)
 }

+src_prepare() {
+	# http://bugs.pwmt.org/msg816
+	# these are 0 byte files in dist tarball wrt #434140
+	rm *.{1,5}
+}
+
 src_compile() {
 	emake "${myzathuraconf[@]}"
 }
@ -43,7 +49,4 @@ src_compile() {
 src_install() {
 	emake "${myzathuraconf[@]}" install
 	dodoc AUTHORS
-
-	# For rst2man.py and type -P hack in pkg_setup()
-	use doc || rm -rf "${ED}"/usr/share/man
 }
--- a/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
+++ b/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild,v 1.11 2011/03/04 16:37:53 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/nagios-syntax/nagios-syntax-20050105.ebuild,v 1.12 2012/09/05 21:54:58 blueness Exp $

 inherit vim-plugin

 DESCRIPTION="vim plugin: Nagios configuration files syntax"
 HOMEPAGE="http://dev.gentoo.org/~ramereth/vim/syntax/nagios.vim"
 LICENSE="as-is"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""

 VIM_PLUGIN_HELPTEXT=\
--- a/app-vim/python-mode/Manifest
+++ b/app-vim/python-mode/Manifest
@ -1 +1 @@
-DIST python-mode-0.6.6.tar.gz 469157 SHA256 1d94126215245ee9f89502df65f6e250925db142cd240fbba50afbaabd174954 SHA512 e3cb5201bece4336f0859c982c78d81a67198f445b3a0dd6be8030189bbfb1c9b4b9f508832a44e95f00e11fb8b8810b4bc9fd9e195adbbc620ba70df6a04ab5 WHIRLPOOL b6dc882db4e2e0645503d6b3afe9bc24b2425d72fac1b5bbe353d3ad10cf34399371105ea04ad7ec9b81dcc19260c0267e06432216fabeca7a83833eb23cfdc5
+DIST python-mode-0.6.8.tar.gz 471053 SHA256 5df9e99f4d3b6e8dd884359f32b028e5777e55383e518f7ece5895433bdc7573 SHA512 40c1ae9c6f6df22b29b6f5c2bc47a60d085b2e7dc8be6d51ee125d1067ec1e10567e794200a093ec392faded5231654be7376ba45816b77fb045e4b7770666f8 WHIRLPOOL 7b91c3a569dffb87a655765dc7a6f4365a84b90228538f00aaff09a77330ee232a38e85932cfb6e482cda78dc6e121d4fe0a506fcd0e63247ca2fdb1a556b7d0
--- a/app-vim/python-mode/python-mode-0.6.8.ebuild
+++ b/app-vim/python-mode/python-mode-0.6.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/python-mode/python-mode-0.6.6.ebuild,v 1.1 2012/08/03 08:20:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/python-mode/python-mode-0.6.8.ebuild,v 1.1 2012/09/07 09:39:22 xarthisius Exp $

 EAPI=4

--- a/dev-cpp/ETL/metadata.xml
+++ b/dev-cpp/ETL/metadata.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
 <email>lu_zero@gentoo.org</email>
 <name>Luca Barbato</name>
--- a/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-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/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild,v 1.2 2012/09/03 22:46:56 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/clucene/clucene-2.3.3.4-r3.ebuild,v 1.4 2012/09/07 12:14:18 johu Exp $

 EAPI=4

@ -15,8 +15,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"

 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"

 IUSE="debug doc static-libs"

--- a/dev-db/libzdb/Manifest
+++ b/dev-db/libzdb/Manifest
@ -0,0 +1,2 @@
+DIST libzdb-2.10.3.tar.gz 600834 SHA256 8716d2cb3563478228f33de43e89857b3d190576be36a1f490dc245ffe60f959 SHA512 b2d358a4dbeddced3237aea02d94e6a60a089db10fb137c781389c735e27820f81697ea8e514ca13934b5dba3c3446db7140facaa7d03459f9a117b339fc343f WHIRLPOOL 8c10068502ab2d044f22a7c0de655b5779d9c8a82be7f7f2893fcd925abeb6dece7f0fd8c3dc8e20134310af8b51811cfeb6808065515b349aa461ba51adc812
+DIST libzdb-2.10.5.tar.gz 597491 SHA256 2ed89c57bab95cb52a9a8d54b46453b1e4d95b0e8e23e4faf2a7337fb4de631d SHA512 60f041175ec3b4ac5c6d90c422b384ca07e6077bf93e6bd6777bd7680fefe65a2061048528a63b1ad5ae84654a35a7a0635d2da8b42a1b380f64d8e555854472 WHIRLPOOL 5505ff0dd79117ef5bce3de0c403867e3ea486578bbfef23d0e08829fd7ff238a4e20550b86d98a19181ebe04d2235b3824257f6aa46e290a5f6303c4f5fb522
--- a/dev-db/libzdb/files/sqlite_configure.patch
+++ b/dev-db/libzdb/files/sqlite_configure.patch
@ -0,0 +1,18 @@
+--- configure.ac_orig	2012-07-14 07:14:19.000000000 +1000
+++ configure.ac	2012-07-23 14:17:38.702411605 +1000
+@@ -298,12 +298,11 @@
+                 CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
+                 AC_CHECK_HEADERS([sqlite3.h], [
+                         sqlite="yes"
+-                        if test -r "$with_sqlite/lib/libsqlite3.a"; then
+                        AC_CHECK_LIB(sqlite3, main,[
+
+                                 DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include"
+                                 DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3"
+-                        else
+-                                sqlite="no"
+-                        fi
+                        ],[sqlite="no"])
+                 ], [sqlite="no"])
+                 LDFLAGS=$svd_LDFLAGS
+                 CPPFLAGS=$svd_CPPFLAGS
--- a/dev-db/libzdb/libzdb-2.10.3.ebuild
+++ b/dev-db/libzdb/libzdb-2.10.3.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.3.ebuild,v 1.2 2012/09/05 19:27:25 lordvan Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs autotools-utils
+
+DESCRIPTION="A thread safe high level multi-database connection pool library"
+HOMEPAGE="http://www.tildeslash.com/libzdb/"
+SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs"
+REQUIRED_USE=" || ( postgres mysql sqlite )"
+
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( >=dev-db/sqlite-3 )
+	sqliteunlock? ( >=dev-db/sqlite-3.6.12[unlock-notify] )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
+	if ( use sqlite); then
+		epatch "$FILESDIR/sqlite_configure.patch"
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	## TODO: check what --enable-optimized actually does
+	## TODO: find someone with oracle db to add oci8 support
+	myconf=""
+	if  [[ $(gcc-version) < 4.1 ]];then
+		myconf="${myconf} --disable-protected"
+	else
+		myconf="${myconf} --enable-protected"
+	fi
+
+	if ( use sqlite ); then
+		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/"
+		if has_version 'dev-db/sqlite[unlock-notify]'; then
+			myconf="${myconf} --enable-sqliteunlock"
+		fi
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	if use mysql; then
+		myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use postgres; then
+		myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
+	else
+		myconf="${myconf} --without-postgresql"
+	fi
+
+	econf \
+		$(use_enable debug profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable ssl openssl) \
+		--without-oci \
+		${myconf}
+}
+
+src_compile() {
+	default_src_compile
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the --disable-static flag only skips .a
+	use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
+
+	dodoc AUTHORS CHANGES README
+	if use doc;then
+		dohtml -r "${S}/doc/api-docs"/*
+	fi
+}
+
+src_test() {
+	emake verify
+}
--- a/dev-db/libzdb/libzdb-2.10.5.ebuild
+++ b/dev-db/libzdb/libzdb-2.10.5.ebuild
@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.1 2012/09/07 12:25:40 lordvan Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A thread safe high level multi-database connection pool library"
+HOMEPAGE="http://www.tildeslash.com/libzdb/"
+SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs"
+REQUIRED_USE=" || ( postgres mysql sqlite )"
+
+RESTRICT=test
+
+RDEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( >=dev-db/sqlite-3 )
+	sqliteunlock? ( >=dev-db/sqlite-3.6.12[unlock-notify] )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	sed -i -e "s|&& ./pool||g" test/Makefile.in || die
+}
+
+src_configure() {
+	## TODO: check what --enable-optimized actually does
+	## TODO: find someone with oracle db to add oci8 support
+	myconf=""
+	if  [[ $(gcc-version) < 4.1 ]];then
+		myconf="${myconf} --disable-protected"
+	else
+		myconf="${myconf} --enable-protected"
+	fi
+
+	if ( use sqlite ); then
+		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/"
+		if has_version 'dev-db/sqlite[unlock-notify]'; then
+			myconf="${myconf} --enable-sqliteunlock"
+		fi
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	if use mysql; then
+		myconf="${myconf} --with-mysql=${EPREFIX}/usr/bin/mysql_config"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use postgres; then
+		myconf="${myconf} --with-postgresql=${EPREFIX}/usr/bin/pg_config"
+	else
+		myconf="${myconf} --without-postgresql"
+	fi
+
+	econf \
+		$(use_enable debug profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable ssl openssl) \
+		--without-oci \
+		${myconf}
+}
+
+src_compile() {
+	default_src_compile
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# the --disable-static flag only skips .a
+	use static-libs || rm -f "${D}"/usr/lib*/libzdb.la
+
+	dodoc AUTHORS CHANGES README
+	if use doc;then
+		dohtml -r "${S}/doc/api-docs"/*
+	fi
+}
+
+src_test() {
+	emake verify
+}
--- a/dev-db/libzdb/metadata.xml
+++ b/dev-db/libzdb/metadata.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>no-herd</herd>
+  <maintainer>
+        <email>lordvan@gentoo.org</email>
+ 	<name>Thomas Raschbacher</name>
+  </maintainer>
+  <maintainer>
+        <email>bugs@bergstroem.nu</email>
+ 	<name>Johan Bergström</name>
+	<description>Proxy Maintainer. CC on bugs</description>
+  </maintainer>
+  <use>
+	<flag name="sqliteunlock">Enable SQLite unlock notification api</flag>
+  </use>
+</pkgmetadata>
--- a/dev-db/sqliteodbc/sqliteodbc-0.96.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.96.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-db/sqliteodbc/sqliteodbc-0.96.ebuild,v 1.1 2012/07/30 07:51:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.96.ebuild,v 1.3 2012/09/07 14:24:51 johu Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""

 DEPEND=">=dev-db/sqlite-3.6
--- a/dev-embedded/libdisasm/metadata.xml
+++ b/dev-embedded/libdisasm/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded@gentoo.org</herd>
+<herd>dev-embedded</herd>
 <maintainer>
 <email>hwoarang@gentoo.org</email>
 <name>Markos Chandras</name>
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.4.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.11.4.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-java/icedtea-bin/icedtea-bin-6.1.11.4.ebuild,v 1.1 2012/09/02 19:13:45 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.4.ebuild,v 1.2 2012/09/07 15:45:07 ago Exp $

 EAPI="4"

@ -28,7 +28,7 @@ SRC_URI="

 LICENSE="GPL-2-with-linking-exception"
 SLOT="6"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"

 IUSE="+X +alsa cjk +cups doc examples nsplugin source"
 REQUIRED_USE="nsplugin? ( X )"
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@ -10,7 +10,7 @@
 <maintainer>
  <email>caster@gentoo.org</email>
  <name>Vlastimil Babka</name>
-  <description>Commiter (CC me)</description>
+  <description>Committer (CC me)</description>
 </maintainer>
 <longdescription>FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.</longdescription>
 <use>
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@ -7,4 +7,5 @@ DIST apache-tomcat-7.0.26-src.tar.gz 4127697 SHA256 864304e76ff6edb284fc56d7297f
 DIST apache-tomcat-7.0.27-src.tar.gz 4189578 SHA256 9e692cfe55168e866094d1dba2653d2bb75462c535f0940f756a0253284b2ca9 SHA512 e2b00777157e0cd66dd1cadcfba4302defd3c45d4233261d56e5e7322260eefb28d3015026322f72809c9ee4403ab83886353bc1618415d3b1115ef2e5657429 WHIRLPOOL 1c523a73c7ee5894ca4eda22f3833fb79a5d9694a164a1a7ac207638a36fd2aa587ca255065c670163850e516cc741598afc5ad32293c701719bfd728584a84d
 DIST apache-tomcat-7.0.28-src.tar.gz 4222498 SHA256 a035eab4aa7372534161314ee09bdb086dc00179345fb002a358e157e8fb2c42 SHA512 b6ef998f79029ff2c71a9f04fb3bd7f8859fefe4762c6af25e431c571a8e9b6cebe12c982cae2ea8cd5c282a15ee7026df6ac5c4f01c5fa1c361ff7e869b823a WHIRLPOOL 2d0a5b38ada6f836960ba730f8d1e00b98dd258f07e7e6decba9c7dc8f46dc252b56c7ca72b7ef218777eddc95d4d60e5f34f01b3aaffa0123bd6ff19fa1c4b7
 DIST apache-tomcat-7.0.29-src.tar.gz 4212630 SHA256 00d42b13044303d735103373a5faf7680786879b304ca231d73844c893f6e0ea SHA512 f17a6e0c2535fdd7cbcce518c918a940ebeebef68fa1c6afb482a2d0f5001b87f973cf86f1fce9026d39cf75f2a3763b8a155fb67538e7e1f7d71472660d50db WHIRLPOOL 3b52c6118f9595b85a96302e6d1a0fe421c12a1f16c30f90380195717126911eec0f785e36ec713e80b6d9abe4d72d1104e9d1330534bc8e7d590cd017948f35
+DIST apache-tomcat-7.0.30-src.tar.gz 4229801 SHA256 c8396fdb6d15326991ed286baef385d62d58d47740565349c16410dc77ebf685 SHA512 0cb0f0a6bd65c403b6871b4891ffa7f58df205dab02faaf5ba37c5cad4d511f571bd00c127d13510f378b02016d04c86f5389073f790b25a3ae9f64edb588a46 WHIRLPOOL e10609defef2c1b85b39337d1317afd0a9048ce2ce543b0e78bc403c2019f916a4e172c92d89db429aaf5b01ec148abc319a5d1478f097e090f75f0c53d02b5c
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.30.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.30.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.30.ebuild,v 1.1 2012/09/06 14:49:29 fordfrog Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@ -1,3 +1,4 @@
 DIST nasm-2.09.10.tar.bz2 803380 SHA256 e3afb011f762144b4d13acb1f2d9363e4a73264dc6f2d3f4dab358c8203dd59e SHA512 bc8648cc1bf4e97de4d27da0dc91ead8ee32aa35c74d13616e0af9691464d70e2e15ca288af195f867e7b6118cc913f98ed7b6955c4e9b0dc4702634ac4debef WHIRLPOOL 9ce1631f29daecf6cab8e8e753586faf391f4930c6aa1dabb723edcec74fdda61e61d3b459290fffe82660bfc08ffd808211a63e52962ce5c002c0c9ed20717d
 DIST nasm-2.10.01.tar.bz2 813979 SHA256 ac9b37d265c35492ab1bc29dd5a4f3da11b42dd9fea7a31d95f6cb4c812bda84 SHA512 f028bde12deb8ddb558a4c37581874011c4083a0b3121581978735f8098a143321a99e0f2013bb6d045810dad51f933632508deea28d8428f7552f822813872e WHIRLPOOL efd048f8242e1ed31bbe476a69b262a5856bab50010dcada31f94df40bf0a2f3fcc8a3bca8811acc33c8c9cc9b18a2772b4a14804e15c235956c52685dc01754
+DIST nasm-2.10.04.tar.bz2 813956 SHA256 6ad90fca575fc87d4b093c3f84f3148ef9f0453471723f4971ccbddaa9882b27 SHA512 a55ab9c09e0ee2ac9a73aadbeafaecb940288a2bb38442cf840b54cc6c61f6a67e42cb63dee67a58b8e05e44cd9a162cdf3af7e7a42dfbdee16496119499329d WHIRLPOOL 996f79484a2edd2bb63dff512f5722cf09a6a0086e51a4e918cbee4d2aa4aa57fd1fdb83f0a0d0c23376b2dc949a02f6218a704446f87278e2a42478576f5f5b
 DIST nasm-2.10.tar.bz2 815091 SHA256 687aa1a69b78801b7d85ca2b7f1c73503eb5925b17f1ac243f61194023a89df1 SHA512 b6e0ef7a932a54562c58133603fe0527d70b56c6bab808282a82359ac2b3d7457e0a53fba57ab0b45559c136a0223eee9c6a996bf5af7d51b5ea1b217c76fa18 WHIRLPOOL 7c9d1af9d01949792bb5bbd9bb271e331e98e90643c2c6a81f18fa5e16fc97b641d350707c149b4c6a6cea2f9274ad0d6ccbf6dc2d4f90fcd3cddabd046452a9
--- a/dev-lang/nasm/nasm-2.10.04.ebuild
+++ b/dev-lang/nasm/nasm-2.10.04.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.10.04.ebuild,v 1.1 2012/09/06 15:24:08 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="http://nasm.sourceforge.net/"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-lang/perl
+	doc? ( app-text/ghostscript-gpl sys-apps/texinfo )"
+RDEPEND=""
+
+S=${WORKDIR}/${P/_}
+
+src_configure() {
+	strip-flags
+	econf
+}
+
+src_compile() {
+	emake nasmlib.o || die
+	emake all || die
+	if use doc ; then
+		emake doc || die
+	fi
+}
+
+src_install() {
+	emake INSTALLROOT="${D}" install install_rdf || die
+	dodoc AUTHORS CHANGES ChangeLog README TODO
+	if use doc ; then
+		doinfo doc/info/*
+		dohtml doc/html/*
+		dodoc doc/nasmdoc.*
+	fi
+}
--- a/dev-lang/php/php-5.4.6.ebuild
+++ b/dev-lang/php/php-5.4.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6.ebuild,v 1.4 2012/08/24 14:19:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.6.ebuild,v 1.5 2012/09/06 01:00:40 blueness Exp $

 EAPI=4

@ -10,7 +10,7 @@ SUHOSIN_VERSION=""
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"

 function php_get_uri ()
 {
--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@ -1,5 +1,5 @@
 DIST v8-3.11.10.20.tar.bz2 10115536 SHA256 69cc90bdf1032d7a8a14ea9353b9b45969699e8adb31bfb919f1aa7f0a981391 SHA512 8532159a2671d7fbe72196f64d7cf5d391f96e4f326b8d490b00051c55df14553b5c2592c68abfab7e5d6510c35a3b2deb44af75a92daf880ef8d7f0cdffef71 WHIRLPOOL 2874fb3698f27634000631afa09600b6c65be2acaf545cbfa3ed8119ddc39a9a8c71d158a8e4167d288c82247d8f2131dfc7a88aaca5e44b72d664eb5f389ccd
-DIST v8-3.12.19.4.tar.bz2 10181859 SHA256 13522f20c82c2d97f01eadfd3c883bcb02f1ae419f845abd3ff1211e0d490f9b SHA512 be082425ce7841c115895b8ff67b076b0adc8d6e8ddd4504b746652097cc4f2de4f75684c1c3f961c18fe43c912c398f63960416a01d37ad7f6f414a0bd793f1 WHIRLPOOL 2f38ed9831651e56408248782702e76f90c6f877145993bce2b1921953e834505797b8b208f56d1b85636916fe8cf3f62917de5ccb2a774008de0cb926bb5dce
 DIST v8-3.12.19.5.tar.bz2 10186134 SHA256 e7152945168fb8c11315e1fa80814973027fe2c69fe44b79d5a1924dde3c3d51 SHA512 7384783b310154bc2b5f0b791c7375917d03db33da01688413fc07e9586d7a84e3a3a8ffa9bf40a7e1f0e8a51e095d5b75fab59937b1e740b58e2acdd23d0ae2 WHIRLPOOL ca84665d8f0500bf217e5e041e508e7728bda3e14126fa204563acd338c38c9525b681c6319593c53768dd35e95745f391947a583df45f926a655bb21c7953c2
+DIST v8-3.12.19.6.tar.bz2 10182842 SHA256 235cb0400e79243677a246c7ff78347807081cc2d68bad8a245482f881f1d390 SHA512 fbbbd85142c5e6dd766acecf5ecf4e81ef8ed64d5e0e71febdcfac886fb974359ae0909efa2a2c85867bb4b6433174c21b71ab953ddfcb425cea354605b8f1fd WHIRLPOOL 170ea47cdf8e342953a824e55c113a46c5707dfbffd19eda77beae5bb9e61bc0fc13694a73c61e46b8b450b0e6968a0018c043888af923861d0b3212e95ddca5
 DIST v8-3.13.1.tar.bz2 10190833 SHA256 3e901348ad1e138495421db4a95359ebd7850ec963d443f2a1bb484d89ddd658 SHA512 3e03f7e4ff8646b38d3b9ecf9f1f0399a935b578cfa29e90130cfc93dbf48736875d674a52a5bd9862384c3de5245adbb740286d545a1113e69a00d161a77ecb WHIRLPOOL 66bfacf53f1937c718c066c16defda8d5849ec4ccf18ccae372f07aefe0a2f24137fb03f21aa6feb35487564a484015095edef54b0831ba5b0f0d4524cee496b
 DIST v8-3.13.3.1.tar.bz2 10186822 SHA256 c46a9f98bf7aa6fc35b8cb1537c40a843f160a412d931e7e7037e7027aedf702 SHA512 216fcdb764dd05579cb36763719f35119bb2ef709f66c15f0d4aab15b477f4dc1e9949959bcdf4ef73a947dbc58d63a6a1c75312a761a0e64b790a37a7f08c39 WHIRLPOOL 052450e4ccb961cd874a49345d2d76ef3ed49dc9947c49e0130f54507aaf60bc61a28a9aaa78197efdcea994372c223b5ab825cdacf1603161371573fbbf9640
--- a/dev-lang/v8/v8-3.12.19.6.ebuild
+++ b/dev-lang/v8/v8-3.12.19.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.4.ebuild,v 1.1 2012/08/21 23:23:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.6.ebuild,v 1.1 2012/09/06 23:46:34 floppym Exp $

 EAPI="4"

--- a/dev-lang/v8/v8-3.13.3.1.ebuild
+++ b/dev-lang/v8/v8-3.13.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.3.1.ebuild,v 1.2 2012/08/29 17:13:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.3.1.ebuild,v 1.3 2012/09/06 07:26:00 phajdan.jr Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"

 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
 IUSE=""

 pkg_setup() {
--- a/dev-libs/bcm2835/Manifest
+++ b/dev-libs/bcm2835/Manifest
@ -1 +1 @@
-DIST bcm2835-1.8.tar.gz 221878 SHA256 64be77b10aaf48ecb2a9022e13057f3b564093916875c0fc56373b4142dd5cae SHA512 35af94abbc3c83c408b6d2c49b860810da3d87925eb444572d61f25cb2b2c829332807f5a8cd5e929605463fd1288a2b37407846dbc247e32c21b66a4711071a WHIRLPOOL 4058fc42291add11efeafa1e59125653304c509cf1f2396437f34ffafb5988223767d8efa7c066739dcb23c454a5c34d7eb46f6f0ed3638b7076cc05e5e6f961
+DIST bcm2835-1.9.tar.gz 223690 SHA256 0dc6ee5a261e76b103a04534c1b8ebc20dce8921dec2452785100812f978c883 SHA512 335d1f05b82410e42ec6ac0702fef5b6b59c3b851f6e8763e03ab8610e0e51d19040fbb711f8acf1ec15d12cf174e7b2c9ac801db46eacea8db00623c73050ad WHIRLPOOL 3923f84718ebf05b06fb458ae119dfd3d9a6dc50bd5b511d01faffa5b32169c9acc9c02441564dfd19d021879af458d3c363098996ffba17ea367dc9041191e0
--- a/dev-libs/bcm2835/bcm2835-1.9.ebuild
+++ b/dev-libs/bcm2835/bcm2835-1.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/bcm2835/bcm2835-1.8.ebuild,v 1.1 2012/08/30 16:51:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bcm2835/bcm2835-1.9.ebuild,v 1.1 2012/09/06 15:31:36 chithanh Exp $

 EAPI=4

--- a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
@ -27,6 +27,75 @@
     ])
   fi
 fi
+--- beecrypt-4.2.1/acinclude.m4
+++ beecrypt-4.2.1/acinclude.m4
+@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[
+     AC_SUBST(OPENMP_LIBS,"-lgomp")
+   fi
+   case $bc_target_arch in
+-  x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona)
+-    CC="$CC -m64"
+-    ;;
+-  i[[3456]]86 | \
+-  pentium* | \
+-  athlon*)
+-    CC="$CC -m32"
+-    CCAS="$CCAS -m32"
+-    ;;
+   ia64)
+     case $target_os in
+     # HP/UX on Itanium needs to be told that a long is 64-bit!
+@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[
+     aix*)
+       CC="$CC -maix64"
+       ;;
+-    linux*)
+-      CC="$CC -m64"
+-      ;;
+     esac
+     ;;
+-  sparc | sparcv8*)
+-    CC="$CC -m32"
+-    ;;
+-  sparc64 | sparcv9*)
+-    CC="$CC -m64"
+-    ;;
+   esac
+   # Certain platforms needs special flags for multi-threaded code
+   if test "$ac_enable_threads" = yes; then
+@@ -646,14 +646,6 @@ dnl  BEE_GNU_CXX
+ AC_DEFUN([BEE_GNU_CXX],[
+   AC_REQUIRE([AC_PROG_CXX])
+   case $bc_target_arch in
+-  x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2)
+-    CXX="$CXX -m64"
+-    ;;
+-  i[[3456]]86 | \
+-  pentium* | \
+-  athlon*)
+-    CXX="$CXX -m32"
+-    ;;
+   ia64)
+     case $target_os in
+     # HP/UX on Itanium needs to be told that a long is 64-bit!
+@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[
+     aix*)
+       CXX="$CXX -maix64"
+       ;;
+-    linux*)
+-      CXX="$CXX -m64"
+-      ;;
+     esac
+     ;;
+-  sparc | sparcv8*)
+-    CXX="$CXX -m32"
+-    ;;
+-  sparc64 | sparcv9*)
+-    CXX="$CXX -m64"
+-    ;;
+   esac
+   # Certain platforms needs special flags for multi-threaded code
+   if test "$ac_enable_threads" = yes; then
 --- beecrypt-4.2.1/java/Makefile.am
 +++ beecrypt-4.2.1/java/Makefile.am
@@ -26,7 +26,7 @@
--- a/dev-libs/boost/boost-1.49.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.49.0-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/dev-libs/boost/boost-1.49.0-r1.ebuild,v 1.4 2012/07/21 17:18:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.49.0-r1.ebuild,v 1.6 2012/09/06 13:37:44 blueness Exp $

 EAPI="4"
 PYTHON_DEPEND="python? *"
@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"

 LICENSE="Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc +eselect icu mpi python static-libs test tools"

 RDEPEND="icu? ( >=dev-libs/icu-3.3 )
--- a/dev-libs/glib/glib-2.32.4.ebuild
+++ b/dev-libs/glib/glib-2.32.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4.ebuild,v 1.1 2012/07/16 04:27:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.4.ebuild,v 1.2 2012/09/06 19:43:26 vapier Exp $

 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@ -63,15 +63,6 @@ pkg_setup() {
 src_prepare() {
 	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die

-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch

--- a/dev-libs/libburn/libburn-1.2.4.ebuild
+++ b/dev-libs/libburn/libburn-1.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.2.4.ebuild,v 1.1 2012/07/26 19:16:49 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.2.4.ebuild,v 1.3 2012/09/07 14:42:23 jer Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~x86"
 IUSE="cdio debug static-libs track-src-odirect"

 RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
--- a/dev-libs/libf2c/libf2c-20110801-r2.ebuild
+++ b/dev-libs/libf2c/libf2c-20110801-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20110801-r2.ebuild,v 1.1 2012/09/04 07:09:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20110801-r2.ebuild,v 1.3 2012/09/07 11:27:11 johu Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/${PN}.zip -> ${P}.zip"

 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 RDEPEND=""
--- a/dev-libs/libisoburn/libisoburn-1.2.4.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.2.4.ebuild,v 1.1 2012/07/26 19:33:27 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.2.4.ebuild,v 1.3 2012/09/07 14:43:18 jer Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"

 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~x86"
 IUSE="acl cdio debug external-filters external-filters-setuid readline static-libs xattr zlib"

 RDEPEND=">=dev-libs/libburn-1.2.4
--- a/dev-libs/libisofs/libisofs-1.2.4.ebuild
+++ b/dev-libs/libisofs/libisofs-1.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.2.4.ebuild,v 1.1 2012/07/26 19:20:21 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.2.4.ebuild,v 1.3 2012/09/07 14:42:50 jer Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"

 RDEPEND="acl? ( virtual/acl )
--- a/dev-libs/opensc/opensc-0.12.2-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.12.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r2.ebuild,v 1.3 2012/08/28 12:20:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r2.ebuild,v 1.4 2012/09/06 16:02:11 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc libtool +pcsc-lite openct readline ssl zlib"

 RDEPEND="libtool? ( sys-devel/libtool )
--- a/dev-libs/qoauth/qoauth-1.0.1.ebuild
+++ b/dev-libs/qoauth/qoauth-1.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.9 2012/05/21 20:14:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.10 2012/09/06 13:28:54 scarabeus Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://files.ayoy.net/qoauth/release/${PV}/src/${P}-src.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="debug doc static-libs test"

 COMMON_DEPEND="app-crypt/qca:2[debug?]"
--- a/dev-ml/findlib/findlib-1.3.3.ebuild
+++ b/dev-ml/findlib/findlib-1.3.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3.ebuild,v 1.1 2012/07/13 22:18:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3.ebuild,v 1.2 2012/09/07 08:46:39 ago Exp $

 EAPI=2

@ -16,7 +16,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"

 DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"
--- a/dev-perl/IO-Pager/IO-Pager-0.300.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-0.300.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IO-Pager/IO-Pager-0.300.0.ebuild,v 1.1 2012/09/07 09:16:19 tove Exp $
+
+EAPI=4
+
+MODULE_A_EXT=tgz
+MODULE_AUTHOR=JPIERCE
+MODULE_VERSION=0.30
+inherit perl-module
+
+DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+SRC_TEST=do
+S=${WORKDIR}/${PN}-0.3
+
+src_prepare() {
+	rm t.pl || die
+	sed -i '/^t.pl/d' MANIFEST || die
+	perl-module_src_prepare
+}
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@ -1 +1,2 @@
 DIST IO-Pager-0.24.tgz 13737 SHA256 a03825add319636bdda5f84617fb84b5366b1ca2079a4cb1ea3d7fc00c51198c SHA512 13ebff6c8f5cf74ab767643fc323f67fd29d8316028c16dea92b284b76a24951fff3d13971e3a6f79017ca95ad9911b884d35c3bd8e0f1e0ac29b0821719f8ec WHIRLPOOL bf65c0b394938ecbeacfe04f34550fa3536326f5eed73ea4ef43d0c8a44027ba2575042db6fa0ac54a465d2172a8fa5bba37e69dfdd893fd6a308256dfe678eb
+DIST IO-Pager-0.30.tgz 14916 SHA256 8730aef33ab0867d1400cd499edbc5b29b9703668805310b2dc15f44ff6eaed7 SHA512 33899c62946921fc3c1bdd9dac76371c3fa131d3ded54c0aebb062cf948bbdb6874f82e6dca347006db3861d206bf76ab81c878140f8772777f3f3058ccfa2b9 WHIRLPOOL f9fafb326f6ad4d5ffdc4a96084798543695b762b59dcb6890f74364910d589608335fecde77334f4ce1e1f1b20e70c0d0950b643810c872ffc9f4b4393360a7
--- a/dev-perl/Net-Jabber/Net-Jabber-2.0.0.ebuild
+++ b/dev-perl/Net-Jabber/Net-Jabber-2.0.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Jabber/Net-Jabber-2.0.0.ebuild,v 1.2 2011/09/03 21:05:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Jabber/Net-Jabber-2.0.0.ebuild,v 1.3 2012/09/06 01:38:42 blueness Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Jabber Perl library"

 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""

 RDEPEND="dev-perl/XML-Stream
--- a/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild,v 1.8 2012/03/25 16:47:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-XMPP/Net-XMPP-1.20.0.ebuild,v 1.9 2012/09/06 01:37:46 blueness Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""

 RDEPEND=">=dev-perl/XML-Stream-1.22
--- a/dev-perl/Test-MockModule/Test-MockModule-0.50.0.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.50.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-MockModule/Test-MockModule-0.50.0.ebuild,v 1.2 2012/08/21 15:48:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-MockModule/Test-MockModule-0.50.0.ebuild,v 1.3 2012/09/07 08:43:52 ago Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Override subroutines in a module for unit testing"

 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="test"

 DEPEND="
--- a/dev-perl/Test-Most/Manifest
+++ b/dev-perl/Test-Most/Manifest
@ -1 +1,2 @@
 DIST Test-Most-0.25.tar.gz 16696 SHA256 abc41e1e15b472df0a87ef2204ddc4736723022c446d83535ffd2b751b47330d SHA512 d7889ffb908f6fa00f9f6161a8f5f524b0e8d93372dc36769b4ffad4ac1baddc41a48ca064891de85f3848214a73610105ebc0bd32517d713234dbaa7f4a5e1f WHIRLPOOL ef28063bbea04224218e6b8137f52cdb983a88f1d24e8da15da5f27825d76635a27416a29d91782a0ac948a3deedcb0a0755825f3f085c4bd25f0e70ede5dac6
+DIST Test-Most-0.31.tar.gz 18272 SHA256 0ddc6034dc7cde3631dde41ecb558ed823fc07804bfd051b8ec9a70131862ab7 SHA512 ced22dad96c14443cd17f35d51cc22847647859e03d80f68159d35f35f34215310587320de13461d7f4724cd8da616620c56433a178c99135f6488b129765765 WHIRLPOOL 88d8977f3b98314ac87e9db7264ab88caf76d544ac6ce812b46fa88a906605004b469e62956eb5d5f84b329bf5ab50c78b95804e45d1b88b3a09073f95d0080b
--- a/dev-perl/Test-Most/Test-Most-0.310.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.310.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Most/Test-Most-0.310.0.ebuild,v 1.1 2012/09/07 09:08:57 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=OVID
+MODULE_VERSION=0.31
+inherit perl-module
+
+DESCRIPTION="Most commonly needed test functions and features"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/Exception-Class-1.140.0
+	>=dev-perl/Test-Warn-0.230.0
+	>=dev-perl/Test-Deep-0.106
+	>=dev-perl/Test-Differences-0.610.0
+	>=dev-perl/Test-Exception-0.310.0
+	>=virtual/perl-Test-Harness-3.210.0
+	>=virtual/perl-Test-Simple-0.88
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.400.0
+"
+
+SRC_TEST=do
--- a/dev-perl/XML-LibXSLT/Manifest
+++ b/dev-perl/XML-LibXSLT/Manifest
@ -1,2 +1,3 @@
 DIST XML-LibXSLT-1.76.tar.gz 85845 SHA256 74b0ed2e7738640f21921110230174180e7f110d8b2ef13b7eabdad268341242 SHA512 7608df2b5d776e98cc573f51112786c03cd8fb2ddcc60307dba322b1f108561930165dc33bc4b4ebff83b69026d62243c50ef1f3085abede826b5010a7b51258 WHIRLPOOL e79c3b97eb77dbcbe3f5d61a3ced837a49e6b7c8106e3f4a15e9e263e5a937976c6937d57158f4ffaa35d3f7061ba97d6354238fee06b5308491503963ec00b3
 DIST XML-LibXSLT-1.77.tar.gz 85981 SHA256 e596388b416871393e8a501bbd5375585aac043cd5bb396a7735f5391a31e89f SHA512 2b12417e580f10af4cfd10aa0940bb195e6b9b2c0b8c046d40e0ee8abacae70562fcf86520df186645f02a3eba26b34498b9201b67fe89e7ac36034c3dacf87c WHIRLPOOL 8f5795e6579831a4e25a08ebb72dd3585ca47c9ad4c46dde3c5a6e2e6b2418988dc3386d9f10bf6bfab13f9dad3fc2e9a7beb237f1b5249b21bc10180e73ae13
+DIST XML-LibXSLT-1.78.tar.gz 86432 SHA256 4a722353ea71a39bf27c813b01be6525ebeb859bd5832be0b7a34b040ed26e80 SHA512 82d2177d26fd232f261282abbf022201a6a93e0430d655c64bb674406aa25b278775bdca8163222dc3e20f866713f9c70ef9ed4655d73acb1f111276abb80d48 WHIRLPOOL 47e39afe6f6a1d3b5eb2aafc0907669c7c641ebbf83c8161aff425566aaea245788b65de3bbe923def029202c1b128adc62d7eccac8331b7bc583d14160b4f92
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-1.780.0.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-1.780.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXSLT/XML-LibXSLT-1.780.0.ebuild,v 1.1 2012/09/07 09:05:21 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=1.78
+inherit perl-module
+
+DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxslt-1.1.8
+	>=dev-perl/XML-LibXML-1.70"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+SRC_TEST="do"
--- a/dev-perl/XML-Stream/XML-Stream-1.230.0.ebuild
+++ b/dev-perl/XML-Stream/XML-Stream-1.230.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Stream/XML-Stream-1.230.0.ebuild,v 1.2 2011/12/01 16:12:06 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Stream/XML-Stream-1.230.0.ebuild,v 1.3 2012/09/06 01:32:36 blueness Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="Creates and XML Stream connection and parses return data"

 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl"

 RDEPEND="dev-perl/Authen-SASL
--- a/dev-perl/net-server/net-server-2.6.0.ebuild
+++ b/dev-perl/net-server/net-server-2.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/net-server/net-server-2.6.0.ebuild,v 1.1 2012/07/24 14:36:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/net-server/net-server-2.6.0.ebuild,v 1.2 2012/09/07 08:44:31 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ inherit perl-module eutils
 DESCRIPTION="Extensible, general Perl server engine"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6"

 RDEPEND="dev-perl/IO-Multiplex
--- a/dev-perl/perl-ldap/Manifest
+++ b/dev-perl/perl-ldap/Manifest
@ -1,2 +1,3 @@
 DIST perl-ldap-0.4001.tar.gz 254232 SHA256 fae2cf183b6b214ee904eea854ea84ba54b13ce28d8ea6d62f70760f4e8bfc6a SHA512 e4fe781f1d4c4a2b6365be4ff7a44ac8e7d96f0f5544281d6baaeaef4dbd173c77424fc105dbf61c6a2fbf9deff34cf08b470773ac34b83aca878a58fe2467de WHIRLPOOL bb1f29e73a4c5247d4896b5070c5f12a687796a9018fbc77aac3309c1c6842c12d751cf67e4eeb85e6318764109e605d7d3097cb6ffc1f46653c2b7e14cc7c1c
 DIST perl-ldap-0.44.tar.gz 262973 SHA256 6c398f32bf598ee139d111b5fd91cda1e77ca0fb3a57e9616909efdec5d4cacb SHA512 7a2bc4f7c4d2957c1e3eb24451687625e2ba5044818c34d2fe59162ea34a5218e3da4a8e01a5024c6dedf393733238a802436f6b9a0d884a59c520c6061d7e81 WHIRLPOOL 5c62e8c9affad750c142133c3cc875b84172d7afa6b1b92151f4bcc178520c143a11e397c7ab9a336e082d8880804d8c246ef3af292fe9635c1ebde5c1821b8b
+DIST perl-ldap-0.46.tar.gz 263688 SHA256 1a89b35515b1ff114ebcef1194be9c7599a3856ad3cfdc43970f38739d432f5c SHA512 40c9466b3d27601a1c0c5918c8b35e23952f630731407de53b2421585e0ab7ad7c0db4fbfdf6e9ddb5ab11e7bf99d91f99af4af8adbc47aab76c0227918bacc1 WHIRLPOOL 4f9f483be025f642101675fa96857ecc7315fe88b5514da1fb04efbef0b8eb73d2f03a6c14940689d77cba2cee8c635faa426bc921757ca9e701e30f0a207295
--- a/dev-perl/perl-ldap/perl-ldap-0.460.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.460.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.460.0.ebuild,v 1.1 2012/09/07 09:00:44 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=MARSCHAP
+MODULE_VERSION=0.46
+inherit perl-module
+
+DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers."
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="sasl xml ssl"
+
+RDEPEND="
+	dev-perl/Convert-ASN1
+	dev-perl/URI
+	sasl? (
+		virtual/perl-Digest-MD5
+		dev-perl/Authen-SASL
+	)
+	xml? (
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-SAX-Writer
+	)
+	ssl? (
+		>=dev-perl/IO-Socket-SSL-1.26
+	)"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@ -1,3 +1,2 @@
 DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a54b9a2e54e18c85abcecb70f SHA512 9d27a9b2c7cf90a7ea420732ac13675c6bc93435d9d9dc4e437e3e2e121d4b2931b995da77d751e2dbcf4c2c5379fda6c4c3c0f6cc222b461d4daa95e9ec2564 WHIRLPOOL 5b4f6ca08695da516f6579399de1decb3a1be6b2520a636812f1b68cb6ee7e05cb546fe7537513deb3f9a3f914808ffeaa956d1daa2c4e0bcf14f22071e9e7c8
-DIST autopep8-0.7.2.tar.gz 26903 SHA256 83d8c43e942fb16a4587608ac161eb4d55b6e9228fe8819624d4379600feadbe SHA512 1cbf915dd5b3dd3e8db37b8b618cfc6a4181db96251e525587302f811f00cc5966c33322014cbc89f31a5c96bdcd171aa68e4cc976f976dd139a7a5894b28703 WHIRLPOOL 5272aae1f273232129fdf38616b3a56cd15b9eaced68167c7e75cefec8d260fcdf3a8130957fdea757201b96b400227711e3c5e0937df95796fa6817a62d5dd9
-DIST autopep8-0.7.3.tar.gz 28754 SHA256 983199ea696f92f3bedaec420ee1afedb7a1e2ae9e272a5895fea701c135132f SHA512 ff49d9ba4028036f446cf94f755245bb2509998803534ba613192bfdca89e73fa461480004fb420b1712f2b0229a3b830ce3dd37a51804ea7417b5b4548138e1 WHIRLPOOL a86afac1b124563077dad7814b19514850a42e427b956d9114fadffbf50677cdbf9c3878cbbcc02ab590268aadd0ccc2aa132850913f78b8a603d85230fbef56
+DIST autopep8-0.8.tar.gz 29999 SHA256 145786841d9028f21f9d38654d58c30fc84ff2b67199a125e81586063ff23d5a SHA512 efd3da07f3ed352bba0429376efdf11f0bdc817ec43ac6257ae1cd6860c8f89a272c1d830ed4edfa26e6231b08d6eed7b2bb708e7fe9ec18195b5cdaca3d9f8f WHIRLPOOL 3beff5f2912f9b236a17cb4f3f8f0f5583b7ca9dcbd5a1307350605f4245525cacd17d17f57662f203da4508b2f1eacca82d177224f115b3d012ed2688f47675
--- a/dev-python/autopep8/autopep8-0.7.3.ebuild
+++ b/dev-python/autopep8/autopep8-0.7.3.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.7.3.ebuild,v 1.1 2012/08/03 08:03:55 xarthisius Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5"
-
-inherit distutils vcs-snapshot
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
-SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-python/pep8-1.3
-	dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME=${PN}.py
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/test_${PN}.py
-	}
-	python_execute_function testing
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
-	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
-	ewarn "(indentation checks inside triple-quotes)."
-	ewarn "If you do not want to be affected by this, then add the"
-	ewarn "following lines to your local package.mask:"
-	ewarn "  >=dev-python/pep8-1.3"
-	ewarn "  >=dev-python/autopep8-0.6"
-}
--- a/dev-python/autopep8/autopep8-0.7.2.ebuild
+++ b/dev-python/autopep8/autopep8-0.7.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-python/autopep8/autopep8-0.7.2.ebuild,v 1.2 2012/07/13 14:22:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.8.ebuild,v 1.1 2012/09/07 09:33:12 xarthisius Exp $

 EAPI=4

--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@ -1 +1,2 @@
+DIST cssutils-0.9.10b1.zip 430740 SHA256 f8ef24bb6c20b5c725291a10f486e8d99b2b0acffd429e1fd5d579e5bbf0ba2f SHA512 118865cba38fe65fd35a5adfe9d80cf3413c528c216c9cdb9a0cc7b74b9c2140b466f76efab80579c8796aff801afd06683839912e197962c6194a02ab410e64 WHIRLPOOL 19a32c08630a233a5680fc91683cd91bb1d868e2a1881c52d686f59986a54abe358494be784225c23cbc181561fa68ce84bc915a3c0ceef30efe742d88c65050
 DIST cssutils-0.9.9.zip 426449 SHA256 f7061a591859c025504c7871ef3b843383a025d570128edf1c63a6ef53753e8d SHA512 aa378dea071c29772d1a67f64f5ddcd898330ef2d9bc24b49248e981d02aa0c9c240e8422069c15b71caf4a3ffe27a7bb00376c7a22387beaac0a073ff30c91c WHIRLPOOL f972d3ed485a8e24904018caf2a5fa9ecbd91d8093f7a31329536464c092c68928b9906e414cfe172dcf679fb1ab689d4f14ff0b4c3d98fdb3993083038390db
--- a/dev-python/cssutils/cssutils-0.9.10_beta1.ebuild
+++ b/dev-python/cssutils/cssutils-0.9.10_beta1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.10_beta1.ebuild,v 1.1 2012/09/07 12:54:58 lordvan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS=""
+DISTUTILS_SRC_TEST="nosetests"
+PYTHON_TESTS_RESTRICTED_ABIS="3.*"
+
+inherit distutils
+
+MY_P="${P/_beta/b}"
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="http://pypi.python.org/pypi/cssutils/ https://bitbucket.org/cthedot/cssutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-python/setuptools"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	test? ( dev-python/mock )"
+
+PYTHON_MODNAME="cssutils encutils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Disable test failing with dev-python/pyxml installed.
+	if has_version dev-python/pyxml; then
+		sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py
+	fi
+
+	# https://bitbucket.org/cthedot/cssutils/issue/8/test-failure
+	sed -e "s/test_cssText2/_&/" -i src/tests/test_cssvariablesdeclaration.py
+}
+
+src_install() {
+	distutils_src_install
+
+	# Don't install tests.
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/tests"
+	}
+	python_execute_function -q delete_tests
+
+	# Don't install py3 stuff on py2. Breaks py25
+	deletion_of_unneeded_files() {
+		[[ "${PYTHON_ABI}" == 3.* ]] && return
+		rm -f "${ED}$(python_get_sitedir)/cssutils/_codec3.py"
+	}
+	python_execute_function -q deletion_of_unneeded_files
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@ -1,3 +1,4 @@
 DIST pip-1.0.2.tar.gz 105820 SHA256 a6ed9b36aac2f121c01a2c9e0307a9e4d9438d100a407db701ac65479a3335d2 SHA512 dd50a3a235ae48d9ad9b9e6507ab6200e3af361d2afb9461ef6c854e492821d8be2a30acc7534954263f52c865c68dde3c0a1ce6465618b848a612e45cadf6e9 WHIRLPOOL 6793865cd99b3db19eaeb9e87805e3f17dcd6cd94b1d86c6b8691fe160c1f0a0dea1be6e20a7ddde72922599d6c89822ed098a7c64adb45a35c666e4905ffdb0
 DIST pip-1.1.tar.gz 95197 SHA256 993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8 SHA512 94f934e3dd42c6b780f0cbab1a2ca506d17174a1117ade816b6f36517e9c8fb70380e0afd132cc8f78c31476a9d7c38ae00974447d96d5749c085e95d26b0dbe WHIRLPOOL 0c4a62f2f082c108e112b5c19da1aff18968d0767ce95752b595664f18cb2f4de9acba6289caf2f6246edb1782b87dea60c8562d658ba0c2ab9c6e1c89cd2e77
+DIST pip-1.2.1.tar.gz 102413 SHA256 12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1 SHA512 f24812adb1550beeee3e46ae27b5bd8fb7047b551ac248d4228324d2e5954faaa242e899af081d19e2702b4775a1f23f1097ea3dbfee6e0a61f6f65f3d1e7ca4 WHIRLPOOL e5471ca4940663b46bec0aa1a9bc0d8bfcb2b98a9c7497ddafde14a4162c33abd737ef1e34e43ab15273c6f18875af620c8fb41ed2bd9a7c623a2a9a77352051
 DIST pip-1.2.tar.gz 94455 SHA256 2b168f1987403f1dc6996a1f22a6f6637b751b7ab6ff27e78380b8d6e70aa314 SHA512 a7cd955e0155d47004d8fca37e7f9d117342aea45be57a4afd155f745fd1cf5da00f80f0fcd7d54badae2ffe79674366da5e765c53fbb092d33fa69edda73e53 WHIRLPOOL 285bab8759407260b33abf8855dc518101ff03d0b2b5966f3d63db46d15001f9874248fdfe76f98a3c53e6390037017d0a4044fd45e65060c03265023692e302
--- a/dev-python/pip/pip-1.2.1.ebuild
+++ b/dev-python/pip/pip-1.2.1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.2.1.ebuild,v 1.1 2012/09/06 19:44:08 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit bash-completion-r1 distutils eutils
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND="dev-python/setuptools"
+DEPEND="${RDEPEND}"
+
+# Tests require a couple libraries not yet in the tree, aren't bundled with
+# the default tarball from pypi, and have a couple failures anyway
+RESTRICT="test"
+
+DOCS="AUTHORS.txt docs/*.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.1-unversioned.patch
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	COMPLETION="${T}/completion.tmp"
+
+	"$(PYTHON -f)" pip/runner.py completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	if use zsh-completion ; then
+		"$(PYTHON -f)" pip/runner.py completion --zsh > "${COMPLETION}" || die
+		insinto /usr/share/zsh/site-functions
+		newins "${COMPLETION}" _pip
+	fi
+}
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@ -1,3 +1,4 @@
 DIST pyalsa-1.0.22.tar.bz2 39453 SHA256 24c0ce813f77fca5e1b1030b51134f0dca1b3c8e090d1120f24a3adae8c019e8 SHA512 a799d31c3e3af9b82a55a267c242b803d8f1c32d880c9531d8974d69e310279c5f08ef4798d097f4fada166fc891d6d337b456e62df0ffac326b1c30c5f11e77 WHIRLPOOL 58c3aa523109d4671cb6827e7de16fbdac2f5a3b00054b5a240d0f964e5cb0bf9fac4d9ed8686d05faedccbd7df1c1a43d0f5f053d12926534d985b5c1e4a608
 DIST pyalsa-1.0.24.tar.bz2 39813 SHA256 d4c85e18881d157d90f9c531333c0c3b3fc2ee70c31e59d8bbc085af9709af44 SHA512 96c1b56f46ca24897b34e46a8ceee51aa2c6fb4e216b7f022697942f6be03ab9c6278c7ee653248845a1c3e01efb747108a0558c2dd996db8b5ec19cddff17a0 WHIRLPOOL bcb101a41e488e5a20610e1e941a4347c3162da2dc689081ce2e34ff42394da3227216760ece2e9114cf635056a900637aa961062a341eef8520f35edead28d7
 DIST pyalsa-1.0.25.tar.bz2 39828 SHA256 e55372b010c3d2f434ba2077a0738a07b37909fc3e589c14a62061a708d6d6a9 SHA512 d7a30af79d075fe40a7ba3dd1ddb81beea55fcd6f1180ba59f0f8ec53a5a23556cce1965a249ed49cf013ee3b32ff9356238769f0345b63bd3362b3eea67df12 WHIRLPOOL 7d996c6ba5de8e29a4871f526ce0f98fc1f98c6149b20abf2500864c49a69914cb3854fe6b35db79a8467a680e8309ed80f5c9ddc00623e30733353c5fa10779
+DIST pyalsa-1.0.26.tar.bz2 39389 SHA256 a6c72868272f9ac7c81fa29be311e17afd47c61e4823d4dc9e16593afd237cad SHA512 3ec3949dc6b2c49fb6f948e6e87485a0fc66d6b2602392e88c15966cf4e0067e91d0eec2c74e5b394ea7498508933177c687ab20cad471bb76d12f090a628231 WHIRLPOOL 82e9f4b56c5431cb47a96334f566c4a740b0f1a95b813745adc7682bc49682d10184a0c127233f3bc3d7d1abf394b066060d14f58c31df4c8d0a0f5ab3f9f7a5
--- a/dev-python/pyalsa/pyalsa-1.0.26.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.0.26.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-python/pyalsa/pyalsa-1.0.26.ebuild,v 1.1 2012/09/07 13:03:02 chainsaw Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="http://alsa-project.org/"
+SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${PN}-1.0.25-no-build-symlinks.patch"
+}
--- a/dev-python/python-mpd/python-mpd-0.4.3.ebuild
+++ b/dev-python/python-mpd/python-mpd-0.4.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.4.3.ebuild,v 1.1 2012/07/21 17:40:36 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.4.3.ebuild,v 1.2 2012/09/07 08:46:02 ago Exp $

 EAPI=4
 PYTHON_COMPAT="python2_6 python2_7 python3_1 python3_2"
@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/Mic92/python-mpd2"
 SRC_URI="https://github.com/Mic92/${PN}2/tarball/v${PV} -> ${P}.tar.gz"

 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""

--- a/dev-ruby/jeweler/jeweler-1.8.4.ebuild
+++ b/dev-ruby/jeweler/jeweler-1.8.4.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-1.8.4.ebuild,v 1.1 2012/07/05 23:35:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-1.8.4.ebuild,v 1.2 2012/09/06 04:38:00 graaff Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"

-RUBY_FAKEGEM_TASK_DOC="yard"
+RUBY_FAKEGEM_TASK_DOC="-Ilib yard"
 RUBY_FAKEGEM_DOCDIR="doc"

 # Tests and features also need the same set of dependencies present.
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST openrc-settingsd-1.0.tar.xz 243464 SHA256 1ab2da6de3fe53adc9138c88c8b5e06cae0ba8451cdb53f70197aa5b0306adf0 SHA512 d3a2ce493dbf0c1f449589bf731d85ee1f024226d439780b9986624cafccaa58032658e28f3f05bf1f4a3400bc19c14fcd0418bdf054777bc7d2f9cdf026135f WHIRLPOOL 6482ad2cecfad54891c1959febd0a334fc0c2b4290294bddb5526eaf606721bf98542e4b4a798283da6aca4d0c7060ff3d3186745e792316c67738f9dae6a4ed`
				`@ -1 +0,0 @@`
				`DIST epdfview-0.1.8.tar.bz2 466270 SHA256 948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0 SHA512 e81ca39158ed77040a00b69cdbbea4726a1bbf4885a096aaa3dfc4c64d0cbcadabdc69c559bb14d23c2bf7fc8244799176d2c2d5689ab670c13237edc10e8e40 WHIRLPOOL b95d399826923f9b10e119071845b0f4873021f64f58b6b369b087043282e9e7de44ccf8d75bc4aaa8b71a57a3b5b050c3f0808a1fdb1f63e10ede981b511e0c`