Sync with portage [Sun May 27 10:53:23 MSK 2012].

app-admin/hardinfo/Manifest

@@ -0,0 +1 @@
+DIST hardinfo-0.5.1.tar.bz2 246924 RMD160 ef0c91fa8c0c032cf74a96e045e4823f7fe3b81e SHA1 983f0445aa60e02156bc5a5eaedeffb30b8e4d64 SHA256 a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a

app-admin/hardinfo/files/hardinfo-0.5.1-makefile.patch

@@ -0,0 +1,64 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat May 26 01:30:39 UTC 2012
+Subject: build system
+
+respect CC and LDFLAGS
+
+--- Makefile.in
++++ Makefile.in
+@@ -1,8 +1,6 @@
+ 
+-CCFLAGS = -fPIC -pipe -Wall -g 
+-CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
+-CC = gcc $(ARCHOPTS) -g
+-CCSLOW = gcc -O0 -g
++CFLAGS+=-fPIC $(GTK_CFLAGS) $(SOUP_CFLAGS) -I.
++CC?=gcc
+ 
+ # ----------------------------------------------------------------------------
+ 
+@@ -14,35 +12,35 @@
+ MODULES = computer.so devices.so benchmark.so network.so
+ 
+ all:	$(OBJECTS) $(MODULES)
+-	$(CC) $(CCFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) -o hardinfo -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) \
+ 		$(SOUP_LIBS)
+ 
+ md5.o:
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c md5.c -o $@
++	$(CC) $(CFLAGS) -c md5.c -o $@
+ 
+ blowfish.o:
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c blowfish.c -o $@
++	$(CC) $(CFLAGS) -c blowfish.c -o $@
+ 
+ sha1.o:
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c sha1.c -o $@
++	$(CC) $(CFLAGS) -c sha1.c -o $@
+ 
+ fbench.o:
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fbench.c -o $@
++	$(CC) $(CFLAGS) -c fbench.c -o $@
+ 
+ fftbench.o:
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c fftbench.c -o $@
++	$(CC) $(CFLAGS) -c fftbench.c -o $@
+ 
+ nqueens.o:
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -c nqueens.c -o $@
++	$(CC) $(CFLAGS) -c nqueens.c -o $@
+ 
+ benchmark.so:	benchmark.c
+ 	make $(BENCHMARK_OBJECTS)
+-	$(CCSLOW) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< $(BENCHMARK_OBJECTS) \
+ 		$(GTK_FLAGS) $(GTK_LIBS)
+ 	ln -sf ../$@ modules
+ 
+ %.so:	%.c
+-	$(CC) $(CCFLAGS) $(CFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -shared $< $(GTK_FLAGS) $(GTK_LIBS)
+ 	ln -sf ../$@ modules
+ 	
+ clean:

app-admin/hardinfo/hardinfo-0.5.1.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/hardinfo-0.5.1.ebuild,v 1.1 2012/05/26 21:46:09 hasufell Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_configure() {
+	filter-flags "-O*"
+	default
+}

app-admin/hardinfo/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>

app-admin/sudo/sudo-1.8.5_p1.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/sudo/sudo-1.8.5_p1.ebuild,v 1.4 2012/05/20 06:58:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.5_p1.ebuild,v 1.6 2012/05/26 17:21:04 armin76 Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 # 3-clause BSD license
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
 IUSE="ldap nls pam offensive selinux skey"
 
 DEPEND="pam? ( virtual/pam )

app-editors/emacs/Manifest

@@ -6,5 +6,6 @@ DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a
 DIST emacs-22.3-patches-8.tar.bz2 5974 RMD160 a17c6e291b6c0d246d30a27baceaa882b12a1250 SHA1 fbb03538973be5f416edbffebc567f6346caef4b SHA256 72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.4-patches-2.tar.bz2 1535 RMD160 7b991a627c60a7b26134ef4bc8b4e4062a045ea3 SHA1 fa2682743653fac475f3c8dd9e9ebf3dafa43edd SHA256 ee12b40d769497b98b609933f9f122f9b45873ac84447832930158822f52f920
+DIST emacs-23.4-patches-3.tar.bz2 2568 RMD160 3f2e7dde13aaf3c60ece5049f9b7d8966fb3ca46 SHA1 492eb31155fab9996985071d9ef3fc7b3423c70d SHA256 ac58a290b01db52edb93173413fc2ee8f42a3ea227161f27f79b0340002ff879
 DIST emacs-23.4.tar.bz2 38646508 RMD160 564d31fabc205b9ee4789827ef50d2b0f0461bf7 SHA1 5effbd2af6bf7a4feb2d80810e49b0ce47b463cb SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b

app-editors/emacs/emacs-23.4-r2.ebuild

@@ -0,0 +1,334 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r2.ebuild,v 1.1 2012/05/26 16:11:19 ulm Exp $
+
+EAPI=4
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common eutils flag-o-matic multilib
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-3.tar.bz2"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+REQUIRED_USE="aqua? ( !X )"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg )
+		png? ( >=media-libs/libpng-1.4:0 )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff )
+		xpm? ( x11-libs/libXpm )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			Xaw3d? ( x11-libs/libXaw3d )
+			!Xaw3d? (
+				athena? ( x11-libs/libXaw )
+				!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( virtual/pkgconfig )
+	dbus? ( virtual/pkgconfig )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? ( sys-apps/paxctl )"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}
+	>=app-emacs/emacs-common-gentoo-1.3[X?]"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	epatch_user
+
+	sed -i \
+		-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf="${myconf} --with-x --without-ns"
+		myconf="${myconf} $(use_with gconf)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
+		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
+		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
+
+		if use xft; then
+			myconf="${myconf} --with-xft"
+			myconf="${myconf} $(use_with m17n-lib libotf)"
+			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+		else
+			myconf="${myconf} --without-xft"
+			myconf="${myconf} --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=gtk"
+			local f
+			for f in athena Xaw3d motif; do
+				use ${f} && ewarn "USE flag \"${f}\" ignored" \
+					"(superseded by \"gtk\")"
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+			use motif && ewarn "USE flag \"motif\" ignored" \
+				"(superseded by \"athena\" or \"Xaw3d\")"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Cocoa support"
+		myconf="${myconf} --with-ns --disable-ns-self-contained"
+		myconf="${myconf} --without-x"
+	else
+		myconf="${myconf} --without-x --without-ns"
+	fi
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser="${GAMES_USER_DED:-games}" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	# set last component of emacs-version to (package revision + 1)
+	touch src/emacs-${FULL_VERSION}.${PR#r}
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	emake install DESTDIR="${D}"
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving Emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	for m in "${ED}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
+	done
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	local c=";;"
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+		c=""
+	fi
+
+	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	X  ${c}(setq find-function-C-source-directory
+	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+		elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
+		elog "You may want to copy or symlink it into /Applications by yourself."
+	fi
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	local f
+	for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
+		[[ -e ${f} ]] || touch "${f}"
+	done
+	chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
+
+	elisp-site-regen
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	else
+		eselect emacs update ifunset
+	fi
+
+	if use X; then
+		elog "You need to install some fonts for Emacs."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+		elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
+		elog "for how to enable anti-aliased fonts."
+		elog
+	fi
+
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module, which also redirects man and info pages."
+	elog "Therefore, several Emacs versions can be installed at the same time."
+	elog "\"man emacs.eselect\" for details."
+	elog
+	elog "If you upgrade from a previous major version of Emacs, then it is"
+	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
+	elog "all byte-compiled elisp files of the installed Emacs packages."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}

app-editors/emacs/metadata.xml

@@ -24,6 +24,8 @@
   <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
   <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
   <flag name='leim'>Add support for Emacs input methods</flag>
+  <flag name='pax_kernel'>Enable building under a PaX enabled kernel
+    (<pkg>sys-apps/paxctl</pkg>)</flag>
   <flag name='sendmail'>Build Emacs with MTA support</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>

app-editors/uemacs-pk/Manifest

@@ -1,2 +1,2 @@
-DIST uemacs-4.0.15_p20101216.tar.bz2 148248 RMD160 a16167fd5f9eb430ced39a67f2da429680842f11 SHA1 bbd3966c9cf441669670b03f8c79ad9bc7de2fd9 SHA256 6f46c6abeb8b6c89322c2df04c7cba0704b36cc7b17fbb3d28a1dc23e54ef3d9
 DIST uemacs-4.0.15_p20110825.tar.bz2 148253 RMD160 1b3fafa37d1d5faa30fa38e2fa858a4830fc10c9 SHA1 b97df288d9befee631573ac3968ea57edc3d1e70 SHA256 01cec81facedf5472a33d8eac1e2cc4584144c2332647caeee04f5e97e7b5451
+DIST uemacs-4.0.15_p20120526.tar.bz2 148189 RMD160 9cc6d2fc7f796542ee62c580c212605d47d5044b SHA1 bac60853bc30b8d38e76692ef6d1e06180685cef SHA256 595cc89a146bcc846656d99e6d2186d1777a767b423390c3273ad652fddc9762

app-editors/uemacs-pk/files/uemacs-pk-4.0.15_p20101216-gentoo.patch

@@ -1,26 +0,0 @@
---- uemacs-orig/Makefile
-+++ uemacs/Makefile
-@@ -56,7 +56,7 @@
- 
- $(PROGRAM): $(OBJ)
- 	$(E) "  LINK    " $@
--	$(Q) $(CC) $(DEFINES) -o $@ $(OBJ) $(LIBS)
-+	$(Q) $(CC) $(LDFLAGS) $(DEFINES) -o $@ $(OBJ) $(LIBS)
- 
- SPARSE=sparse
- SPARSE_FLAGS=-D__LITTLE_ENDIAN__ -D__x86_64__ -D__linux__ -D__unix__
---- uemacs-orig/epath.h
-+++ uemacs/epath.h
-@@ -25,10 +25,8 @@
- #if	V7 | BSD | USG
- {
- 	".emacsrc", "emacs.hlp",
--#if	PKCODE
--	    "/usr/global/lib/", "/usr/local/bin/", "/usr/local/lib/",
--#endif
--"/usr/local/", "/usr/lib/", ""};
-+	"/etc/uemacs-pk/", "/usr/share/uemacs-pk/", ""
-+};
- #endif
- 
- #if	VMS

app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.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-editors/uemacs-pk/uemacs-pk-4.0.15_p20101216.ebuild,v 1.7 2011/09/11 09:25:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild,v 1.1 2012/05/26 21:14:09 ulm Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/uemacs-${PV}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/uemacs"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch
 }
 
 src_compile() {

app-i18n/ibus-hangul/Manifest

@@ -1 +1,2 @@
 DIST ibus-hangul-1.4.0.tar.gz 439462 RMD160 07ac966ba9f878ead7e17d31a653bd5514098305 SHA1 421d7164a27eeedfea49d54b61e2a5edd4f7d3a7 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a
+DIST ibus-hangul-1.4.1.tar.gz 484065 RMD160 35af54e324f9a0b22992f3ccda104d76815f434d SHA1 659899cf942a983fbd2ffbb4bd4f5ecd883f5c0a SHA256 8b7cbc124850df9fb78cdcb38b138f10c648b5519d36a92107616606678b662d

app-i18n/ibus-hangul/ibus-hangul-1.4.1.ebuild

@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.1.ebuild,v 1.1 2012/05/26 12:23:14 naota Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+
+inherit python
+
+DESCRIPTION="The Hangul engine for IBus input platform"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=app-i18n/ibus-1.4
+	=dev-python/pygobject-2*
+	=dev-python/pygtk-2*
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		>=sys-devel/gettext-0.17
+		)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	>py-compile
+	python_convert_shebangs 2 setup/ibus-setup-hangul.in
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}

app-misc/gpsdrive/files/gpsdrive-2.11-mapnik-2.0api.patch

@@ -0,0 +1,77 @@
+--- trunk/src/mapnik.cpp	2010/07/28 13:39:38	2586
++++ trunk/src/mapnik.cpp	2012/05/19 10:04:16	2605
+@@ -22,6 +22,7 @@
+ #include <mapnik/font_engine_freetype.hpp>
+ #include <mapnik/config_error.hpp>
+ #include <mapnik/image_util.hpp>
++#include <mapnik/version.hpp>
+ #include <fstream>
+ #include <sys/stat.h>
+ 
+@@ -29,10 +30,17 @@
+ #include "config.h"
+ #include "gpsdrive_config.h"
+ 
++
++#if MAPNIK_VERSION < 200000
+ using mapnik::Image32;
+-using mapnik::Map;
+ using mapnik::Layer;
+ using mapnik::Envelope;
++#else
++using mapnik::image_32;
++using mapnik::layer;
++using mapnik::box2d;
++#endif
++using mapnik::Map;
+ using mapnik::coord2d;
+ using mapnik::feature_ptr;
+ using mapnik::geometry_ptr;
+@@ -491,7 +499,7 @@
+             double res = scale_denom * 0.00028;
+ 		
+             /* render image */
+-	
++#if MAPNIK_VERSION < 200000
+             Envelope<double> box = Envelope<double>(MapnikMap.NewCenterPt.x - 0.5 * MapnikMap.WidthInt * res,
+                                                     MapnikMap.NewCenterPt.y - 0.5 * MapnikMap.HeightInt * res,
+                                                     MapnikMap.NewCenterPt.x + 0.5 * MapnikMap.WidthInt * res,
+@@ -504,16 +512,36 @@
+             ren.apply();
+ 
+             if (mydebug > 0) std::cout << MapnikMap.MapPtr->getCurrentExtent() << "\n";
++#else
++	    box2d<double> box = box2d<double>(MapnikMap.NewCenterPt.x - 0.5 * MapnikMap.WidthInt * res,
++                                              MapnikMap.NewCenterPt.y - 0.5 * MapnikMap.HeightInt * res,
++                                              MapnikMap.NewCenterPt.x + 0.5 * MapnikMap.WidthInt * res,
++                                              MapnikMap.NewCenterPt.y + 0.5 * MapnikMap.HeightInt * res);
+ 
++            MapnikMap.MapPtr->zoom_to_box(box);
++
++            image_32 buf(MapnikMap.WidthInt, MapnikMap.HeightInt);
++            mapnik::agg_renderer<image_32> ren(*MapnikMap.MapPtr,buf);
++            ren.apply();
++
++            if (mydebug > 0) std::cout << MapnikMap.MapPtr->get_current_extent() << "\n";
++#endif
+             /* get raw data for gpsdrives pixbuf */
+             convert_argb32_to_gdkpixbuf_data(buf.raw_data(), MapnikMap.ImageRawDataPtr);
+ 
+             /* create pixbuf data before check to unref */
+-            if (MapnikMap.GdkPixbufPtr) gdk_pixbuf_unref(MapnikMap.GdkPixbufPtr);
+-            MapnikMap.GdkPixbufPtr = gdk_pixbuf_new_from_data(MapnikMap.ImageRawDataPtr, GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
++            if (MapnikMap.GdkPixbufPtr)
++		gdk_pixbuf_unref(MapnikMap.GdkPixbufPtr);
++
++            MapnikMap.GdkPixbufPtr = gdk_pixbuf_new_from_data(MapnikMap.ImageRawDataPtr,
++				GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+ 
+             /* ok we have a map set default values */
++#if MAPNIK_VERSION < 200000
+             mapnik::Envelope<double> ext = MapnikMap.MapPtr->getCurrentExtent();
++#else
++            mapnik::box2d<double> ext = MapnikMap.MapPtr->get_current_extent();
++#endif
+             mapnik::coord2d pt = ext.center();
+             MapnikMap.CenterPt.x = pt.x;
+             MapnikMap.CenterPt.y = pt.y;

app-misc/gpsdrive/gpsdrive-2.11-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/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild,v 1.3 2012/05/03 19:41:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild,v 1.4 2012/05/26 08:37:45 scarabeus Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="dbus -debug -kismet gdal mapnik scripts -speech"
+IUSE="dbus debug kismet gdal mapnik scripts -speech"
 
 COMMON_DEP="
 	dev-db/sqlite:3
@@ -75,7 +75,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}_DefineOptions_gpsd.patch \
 		"${FILESDIR}"/${P}-add-gdk-pixbuf2.patch \
-		"${FILESDIR}"/${P}-gpsd-2.96.patch
+		"${FILESDIR}"/${P}-gpsd-2.96.patch \
+		"${FILESDIR}"/${P}-mapnik-2.0api.patch
 }
 
 src_configure() {

app-office/texmaker/Manifest

@@ -1,7 +1,5 @@
 DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78
-DIST texmaker-3.2.1.tar.bz2 6712701 RMD160 c5f7d0c9c2341880b6bbcb1976ab63c4468518cb SHA1 73d520c945ac1bb8e79c40dc423ae20f16dd02eb SHA256 48d0ce105e5ec4dc2e58edf18c5d9c53e592d1c396bce30366e3a103f01497f6
-DIST texmaker-3.2.2.tar.bz2 6721777 RMD160 931e30ff53ca92edd13ff3f367fd0e786d8a2496 SHA1 d8d0fd35c699c543a52c875e4c9e15551917a966 SHA256 7d6bb234c6b7df42d672970fceec44e8f662ac265ca9a3bb8e61cdcb323c145a
-DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675
 DIST texmaker-3.3.1.tar.bz2 7689820 RMD160 77584dd5d0ede71fc05e6b1c69d1bc7e439b8b2b SHA1 dc6b86321b9d66015036463175c3246184f08637 SHA256 fad20df029c00bcf627eefecdde95720d9bf1611f4168b2a977ddd1f8c7a7c38
 DIST texmaker-3.3.2.tar.bz2 7781249 RMD160 8ebecba262b802e9c6619eb72d0a72fd7e728d3b SHA1 73cd62a8377e7c68c0e521fd2805a012178a3c35 SHA256 a3e16c820ef16782a7331c1550f97cab7b29111f77664340239fc448540a05fb
 DIST texmaker-3.3.3.tar.bz2 8023823 RMD160 355b5953d6e714c09df4afc5bd7f53a95d48460b SHA1 d3602897a47f2e3ccd0a395bb04b1d189241d2ea SHA256 5bb4c6e74e70d5d8f231f67a3d6895fa482f602720491d75d4b8813ecd49e92d
+DIST texmaker-3.3.4.tar.bz2 13028203 RMD160 e6ed999e1b9cea0a9907539d9522c94bf852865c SHA1 eb18d9d6c5421c373c926b07ba1b7df1fe64984c SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5

app-office/texmaker/files/texmaker-1.91-hunspell.patch

@@ -1,72 +0,0 @@
-Index: texmaker-1.9/spellerdialog.h
-===================================================================
---- texmaker-1.9.orig/spellerdialog.h
-+++ texmaker-1.9/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-Index: texmaker-1.9/texmaker.pro
-===================================================================
---- texmaker-1.9.orig/texmaker.pro
-+++ texmaker-1.9/texmaker.pro
-@@ -3,7 +3,8 @@ TEMPLATE	= app
- TARGET	 = texmaker
- QT += network \
-       xml
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- ###############################
- HEADERS	+= texmaker.h \
- 	texmakerapp.h \
-@@ -39,25 +40,6 @@ HEADERS	+= texmaker.h \
- 	manhattanstyle.h \
- 	stylehelper.h \
- 	styleanimator.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -96,18 +78,6 @@ SOURCES	+= main.cpp \
- 	manhattanstyle.cpp \
- 	stylehelper.cpp \
- 	styleanimator.cpp \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \

app-office/texmaker/files/texmaker-2.30-hunspell.patch

@@ -1,124 +0,0 @@
-diff --git a/latexeditor.h b/latexeditor.h
-index ce36a27..d768977 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5635464..8fb37cb 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -18,7 +18,7 @@
- #include "latexeditor.h"
- #include "linenumberwidget.h"
- #include "findwidget.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 83ca79c..a1e437a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index d07d1fb..74ba873 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -44,7 +44,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewer.h"
- #include "encodingprober/qencodingprober.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 3b3f666..ddd91b3 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=2.3
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -53,25 +54,6 @@ HEADERS	+= texmaker.h \
- 	encodingdialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -144,18 +126,6 @@ SOURCES	+= main.cpp \
- 	encodingdialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \

app-office/texmaker/files/texmaker-3.00-hunspell.patch

@@ -1,155 +0,0 @@
- configdialog.cpp   |    2 +-
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   36 +++---------------------------------
- 7 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index ef30bd4..1acc9d1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index b79df23..b482a9a 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 0471d6f..f663fdf 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -19,7 +19,7 @@
- #include "linenumberwidget.h"
- #include "findwidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 83ca79c..a1e437a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 66d7967..f8e4b57 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 9078988..fb42191 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.0
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
- 	usercompletiondialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
- 	usercompletiondialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 

app-office/texmaker/files/texmaker-3.01-hunspell.patch

@@ -1,155 +0,0 @@
- configdialog.cpp   |    2 +-
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   36 +++---------------------------------
- 7 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index ef30bd4..1acc9d1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index b18ff9b..4fe11a0 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 0471d6f..f663fdf 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -19,7 +19,7 @@
- #include "linenumberwidget.h"
- #include "findwidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 83ca79c..a1e437a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 8c98526..f9bbb1a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5647c49..08eeaf5 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.0.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
- 	usercompletiondialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
- 	usercompletiondialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 

app-office/texmaker/files/texmaker-3.02-hunspell.patch

@@ -1,155 +0,0 @@
- configdialog.cpp   |    2 +-
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   36 +++---------------------------------
- 7 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index ef30bd4..1acc9d1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index b18ff9b..4fe11a0 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 0471d6f..f663fdf 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -19,7 +19,7 @@
- #include "linenumberwidget.h"
- #include "findwidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 83ca79c..a1e437a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 8c98526..f9bbb1a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 86e46ac..9938814 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.0.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
- 	usercompletiondialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
- 	usercompletiondialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 

app-office/texmaker/files/texmaker-3.2-hunspell.patch

@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
-	latexeditor.h
-	texmaker.pro
----
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
-diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,7 @@
- 
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
- 	scandialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
- 	encodingprober/nsSJISProber.h \
- 	encodingprober/nsUniversalDetector.h \
- 	encodingprober/qencodingprober.h \
--	encodingprober/UnicodeGroupProber.h
-+	encodingprober/UnicodeGroupProber.h 
- SOURCES	+= main.cpp \
- 	texmakerapp.cpp \
- 	texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
- 	scandialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target
--- 
-1.7.8.1
-

app-office/texmaker/files/texmaker-3.2.2-hunspell.patch

@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
-	latexeditor.h
-	texmaker.pro
----
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
-diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,7 @@
- 
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
- 	scandialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
- 	encodingprober/nsSJISProber.h \
- 	encodingprober/nsUniversalDetector.h \
- 	encodingprober/qencodingprober.h \
--	encodingprober/UnicodeGroupProber.h
-+	encodingprober/UnicodeGroupProber.h 
- SOURCES	+= main.cpp \
- 	texmakerapp.cpp \
- 	texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
- 	scandialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target
--- 
-1.7.8.1
-

app-office/texmaker/files/texmaker-3.3.4-hunspell.patch

@@ -1,28 +1,17 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
-	latexeditor.h
-	texmaker.pro
----
  configdialog.cpp   |    4 ++--
  latexeditor.h      |    2 +-
  latexeditorview.h  |    2 +-
  latexhighlighter.h |    2 +-
  spellerdialog.h    |    2 +-
  texmaker.h         |    2 +-
- texmaker.pro       |   44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
+ texmaker.pro       |   42 ++++++------------------------------------
+ 7 files changed, 13 insertions(+), 43 deletions(-)
 
 diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
+index 3b91fd0..338b166 100644
 --- a/configdialog.cpp
 +++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
+@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
  QDir spelldir(QCoreApplication::applicationDirPath());
  #else
  #ifdef DEBIAN_SPELLDIR
@@ -35,10 +24,10 @@ index 144bddc..89e4059 100644
  #endif
  
 diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
+index e053390..0e82f08 100644
 --- a/latexeditor.h
 +++ b/latexeditor.h
-@@ -28,7 +28,7 @@
+@@ -33,7 +33,7 @@
  
  #include "latexhighlighter.h"
  #include "textblockselection.h"
@@ -48,7 +37,7 @@ index 40cc2f6..d46150f 100644
  typedef  int UserBookmarkList[3];
  
 diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
+index fb8d7d4..716b466 100644
 --- a/latexeditorview.h
 +++ b/latexeditorview.h
 @@ -22,7 +22,7 @@
@@ -61,7 +50,7 @@ index 283fd8a..1ba39cc 100644
  class LatexEditorView : public QWidget  {
     Q_OBJECT
 diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
+index e0b91b1..74ec42a 100644
 --- a/latexhighlighter.h
 +++ b/latexhighlighter.h
 @@ -20,7 +20,7 @@
@@ -87,11 +76,11 @@ index 83248ae..cd16dad 100644
  #include <QTextCursor>
  
 diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
+index 584be7f..b0069a4 100644
 --- a/texmaker.h
 +++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
+@@ -48,7 +48,7 @@
+ #include "usertagslistwidget.h"
  #include "xmltagslistwidget.h"
  #include "logeditor.h"
 -#include "hunspell/hunspell.hxx"
@@ -100,7 +89,7 @@ index b1a2c65..0806731 100644
  #include "pdfviewerwidget.h"
  #include "pdfviewer.h"
 diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
+index 17d0a24..28ad193 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
@@ -110,13 +99,13 @@ index 5d017ad..87fac99 100644
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
 +PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.1
+ TEXMAKERVERSION=3.3.4
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
- 	scandialog.h \
- 	synctex_parser.h \
+@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
  	synctex_parser_utils.h \
+ 	usertagslistwidget.h \
+ 	addtagdialog.h \
 -	hunspell/affentry.hxx \
 -	hunspell/affixmgr.hxx \
 -	hunspell/atypes.hxx \
@@ -139,19 +128,10 @@ index 5d017ad..87fac99 100644
  	singleapp/qtlocalpeer.h \
  	singleapp/qtlockedfile.h \
  	singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
- 	encodingprober/nsSJISProber.h \
- 	encodingprober/nsUniversalDetector.h \
- 	encodingprober/qencodingprober.h \
--	encodingprober/UnicodeGroupProber.h
-+	encodingprober/UnicodeGroupProber.h 
- SOURCES	+= main.cpp \
- 	texmakerapp.cpp \
- 	texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
- 	scandialog.cpp \
- 	synctex_parser.c \
+@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
  	synctex_parser_utils.c \
+ 	usertagslistwidget.cpp \
+ 	addtagdialog.cpp \
 -	hunspell/affentry.cxx \
 -	hunspell/affixmgr.cxx \
 -	hunspell/csutil.cxx \
@@ -167,7 +147,7 @@ index 5d017ad..87fac99 100644
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
+@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
      ICONDIR=/usr/share/pixmaps
  }
  
@@ -185,6 +165,3 @@ index 5d017ad..87fac99 100644
  
  
  INSTALLS = target
--- 
-1.7.8.1
-

app-office/texmaker/texmaker-3.2.1.ebuild

@@ -1,70 +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/texmaker/texmaker-3.2.1.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1:4
-	>=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}

app-office/texmaker/texmaker-3.2.2.ebuild

@@ -1,70 +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/texmaker/texmaker-3.2.2.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1:4
-	>=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}

app-office/texmaker/texmaker-3.3.4.ebuild

@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.2.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.4.ebuild,v 1.1 2012/05/26 11:58:53 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit base prefix qt4-r2 versionator
 
@@ -35,10 +35,10 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1:4
-	>=app-text/hunspell-1.2.4"
+	x11-libs/qt-gui:4
+	x11-libs/qt-core:4
+	x11-libs/qt-webkit:4
+	app-text/hunspell"
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	app-text/psutils
@@ -47,7 +47,10 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
+	)
 
 src_prepare() {
 	qt4-r2_src_prepare
@@ -55,13 +58,13 @@ src_prepare() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${ED}" install || die "make install failed"
+	emake INSTALL_ROOT="${ED}" install
 
 	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
+	doins utilities/texmaker*.png
+	doins utilities/texmaker.svg
 
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
 }
 
 pkg_postinst() {

app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild,v 1.1 2012/05/26 10:11:21 mgorny Exp $
+
+EAPI=4
+PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+
+inherit base python-distutils-ng
+
+DESCRIPTION="A common interface to Gentoo package managers"
+HOMEPAGE="https://github.com/mgorny/gentoopm/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="|| ( >=sys-apps/portage-2.1.10.3
+		sys-apps/pkgcore
+		>=sys-apps/paludis-0.64.2[python-bindings] )"
+DEPEND="doc? ( dev-python/epydoc )"
+PDEPEND="app-admin/eselect-package-manager"
+
+python_prepare_all() {
+	base_src_prepare
+}
+
+src_compile() {
+	python-distutils-ng_src_compile
+
+	if use doc; then
+		"${PYTHON}" setup.py doc || die
+	fi
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r doc/*
+	fi
+}

app-portage/smart-live-rebuild/metadata.xml

@@ -16,6 +16,6 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/smart-live-rebuild/issues/</bugs-to>
+		<bugs-to>https://bitbucket.org/mgorny/smart-live-rebuild/issues/</bugs-to>
 	</upstream>
 </pkgmetadata>

app-portage/smart-live-rebuild/smart-live-rebuild-1.2.3-r1.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/smart-live-rebuild/smart-live-rebuild-1.2.3-r1.ebuild,v 1.1 2012/05/26 10:15:09 mgorny Exp $
+
+EAPI=4
+
+PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
+
+inherit base python-distutils-ng
+
+DESCRIPTION="Check live packages for updates and emerge them as necessary"
+HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-portage/gentoopm-0.2.1[python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?]"
+
+python_prepare_all() {
+	base_src_prepare
+}
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
+
+python_install_all() {
+	dodoc README
+
+	insinto /etc/portage
+	newins smart-live-rebuild.conf{.example,}
+	insinto /usr/share/portage/config/sets
+	newins sets.conf.example ${PN}.conf
+}

app-text/texlive/texlive-2011-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/texlive/texlive-2011-r1.ebuild,v 1.6 2012/05/22 10:20:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive/texlive-2011-r1.ebuild,v 1.7 2012/05/26 19:44:09 aballier Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ RDEPEND="${DEPEND}
 	>=${TEXLIVE_CAT}/texlive-texinfo-${PV}
 	app-text/t1utils
 	>=app-text/lcdf-typetools-2.69[kpathsea]
-	truetype? ( media-libs/freetype:1[kpathsea] )
+	truetype? ( || ( app-text/ttf2pk2 media-libs/freetype:1[kpathsea] ) )
 	detex? ( dev-tex/detex )
 	app-text/ps2eps
 	dvipdfm? ( >=app-text/dvipdfm-0.13.2d )

app-text/ttf2pk2/Manifest

@@ -0,0 +1 @@
+DIST texlive-20120525-source.tar.xz 133165648 RMD160 4070ce73ff63095043364d29163638fb2ceccf81 SHA1 aeeaf04c1d05f9ddb0ac42e7f7b9a875b5afc3bd SHA256 50eaa3b7e935a167b826e449ab2bf58c323aae23b9b220efc8ce9c18cf5b4319

app-text/ttf2pk2/metadata.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+</pkgmetadata>

app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild,v 1.1 2012/05/26 19:40:42 aballier Exp $
+
+EAPI=4
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.0.1_p20110627
+		media-libs/freetype:2
+		sys-libs/zlib
+		!media-libs/freetype:1
+		!=dev-texlive/texlive-langcjk-2011*[source]"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS README TODO ChangeLog
+}

app-text/xdvik/xdvik-22.85-r1.ebuild

@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild,v 1.4 2012/05/17 23:12:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.85-r1.ebuild,v 1.5 2012/05/27 03:03:22 naota Exp $
 
 EAPI=4
-inherit eutils flag-o-matic elisp-common toolchain-funcs
+inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
 
 DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
@@ -64,7 +64,9 @@ src_configure() {
 		--with-system-t1lib \
 		--with-system-kpathsea \
 		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
-		--with-xdvi-x-toolkit="${toolkit}"
+		--with-xdvi-x-toolkit="${toolkit}" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_compile() {

dev-cpp/gstreamermm/gstreamermm-0.10.10.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-cpp/gstreamermm/gstreamermm-0.10.10.1.ebuild,v 1.3 2012/05/25 11:36:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.10.1.ebuild,v 1.4 2012/05/26 19:26:51 jdhore Exp $
 
 EAPI=4
 GNOME2_LA_PUNT="yes"
@@ -12,7 +12,7 @@ HOMEPAGE="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND="

dev-cpp/libassa/Manifest

@@ -1 +1,2 @@
 DIST libassa-3.5.0.tar.gz 586237 RMD160 4919157cdf3fd75c42aed571328c0033867aa5eb SHA1 b3813fa952dec3ece621606a919035f308798a7a SHA256 72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314
+DIST libassa-3.5.1.tar.gz 641255 RMD160 00b361167625ae679a5d999e13fc34a49f402443 SHA1 796202eacd3087312c4458b246160529cbc42c49 SHA256 c1245a98373f37c0e286b327e2d750fd20278c71f47f2018053b4d799d33172c

dev-cpp/libassa/libassa-3.5.1.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-cpp/libassa/libassa-3.5.1.ebuild,v 1.2 2012/05/26 20:32:44 angelos Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A networking library based on Adaptive Communication Patterns"
+HOMEPAGE="http://libassa.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="net-libs/libtirpc"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.5.0-fix-tests.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
+}

dev-db/mydumper/mydumper-0.5.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-db/mydumper/mydumper-0.5.1.ebuild,v 1.2 2012/05/03 02:33:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mydumper/mydumper-0.5.1.ebuild,v 1.3 2012/05/26 14:14:11 idl0r Exp $
 
 EAPI=2
 inherit cmake-utils versionator
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.mydumper.org/"
 SRC_URI="http://launchpad.net/mydumper/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/libpcre

dev-db/mysql/mysql-5.1.62-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-db/mysql/mysql-5.1.62-r1.ebuild,v 1.7 2012/05/14 19:30:40 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.62-r1.ebuild,v 1.8 2012/05/26 17:06:45 armin76 Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 # This is often broken still

dev-games/cegui/cegui-0.7.6-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-games/cegui/cegui-0.7.6-r1.ebuild,v 1.4 2012/05/20 18:33:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.5 2012/05/26 15:30:49 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 -ppc ~x86"
+KEYWORDS="amd64 -ppc ~x86"
 IUSE="bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip"
 REQUIRED_USE="|| ( expat tinyxml xerces-c xml )" # bug 362223
 

dev-games/ogre/ogre-1.7.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-games/ogre/ogre-1.7.4.ebuild,v 1.2 2012/05/03 06:35:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.7.4.ebuild,v 1.3 2012/05/26 15:31:19 ago Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip"
 REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
 RESTRICT="test" #139905

dev-haskell/network/Manifest

@@ -1,4 +1,5 @@
 DIST network-2.2.1.7.tar.gz 112028 RMD160 f58c6aeee437e6e3296babc495892e74a5de0625 SHA1 69f284a1c618504e30d4118b47f51324cc68e575 SHA256 0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58
 DIST network-2.3.0.11.tar.gz 133563 RMD160 ab08b9ed1777423bffeb72bbaa6541e19f77052b SHA1 dac5db8b40207ce46a0d2e6c9a5ca264a1d01956 SHA256 b3f50ae3f1554c4df5f4e4439a6b5d08fa9464aabfae66ed0da78f0a784615be
+DIST network-2.3.0.13.tar.gz 133948 RMD160 0868efbc6fa8096a5979bd551a30c9f36c45e275 SHA1 a06d34501ab0640568014c2522d6bd9e9a9b6e8e SHA256 0747e9091dd5ba220c31f77116c9edfe9ac6726090d58e55221371b63f1b8577
 DIST network-2.3.0.2.tar.gz 133335 RMD160 c48bbe4338bc3c1588b3ed31e5751db0f723e387 SHA1 f528933004f1f5474413671c8af12e20b1be5f99 SHA256 033cb59ac467af94a028bf4836568d81673ec55905029a598ec7344d23a890e8
 DIST network-2.3.0.7.tar.gz 133965 RMD160 57c3c5c070dd697829c98fbfdad04260da602e46 SHA1 6a702b434b062f5a40ca664fbbf8095f6d057790 SHA256 dba7c77ae023032efba8d6139f5c558af07c089f597fc617d81661f5986a9fe6

dev-haskell/network/network-2.3.0.13.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.13.ebuild,v 1.1 2012/05/26 07:35:20 gienah Exp $
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal autotools
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="http://github.com/haskell/network"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-haskell/parsec[profile?]
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( <dev-haskell/hunit-1.3[profile?]
+			<dev-haskell/test-framework-0.7[profile?]
+			<dev-haskell/test-framework-hunit-0.3[profile?]
+		)"
+
+src_prepare() {
+	epatch "${FILESDIR}/network-2.2.0.0-eat-configure-opts.patch"
+	eautoreconf
+	sed -e 's@test-framework < 0.6@test-framework < 0.7@' \
+		-e 's@bytestring < 0.10@bytestring < 1.0@' \
+		-i "${S}/${PN}.cabal" || die "Could not loosen dependencies"
+}
+
+src_configure() {
+	cabal_src_configure $(use test && use_enable test tests) #395351
+}

dev-haskell/test-framework-quickcheck2/Manifest

@@ -1,4 +1,5 @@
 DIST test-framework-quickcheck2-0.2.10.tar.gz 4798 RMD160 1d5c48f3e0050687255295f6b438ba83fc173ab1 SHA1 8f76648417ebc842db36a1f56a7743daa6d9ff0e SHA256 839b6cab143ce8969550791e6288df378b18d38a49d707756f5eb6484e3d8389
 DIST test-framework-quickcheck2-0.2.12.1.tar.gz 5296 RMD160 d080a3caf6980f862bdf4e74f052894794ea42b6 SHA1 6f0709b3a5885aadbf641d9735afb5c151ad2de1 SHA256 9cd5ba6cfb715bf1f7efeb5fa0ee4a2318fd5c8d183befaaff3645488d9ba60e
+DIST test-framework-quickcheck2-0.2.12.2.tar.gz 5342 RMD160 f6bf2b535d3b57753789617b6bb51e20d90f87a9 SHA1 1b8027406f6f0ee933cc10e76946adac818d0f35 SHA256 371a2cb52a4ff3779e79488295710cc9b5eef5511437ec39ab71088fd1f1a822
 DIST test-framework-quickcheck2-0.2.12.tar.gz 5324 RMD160 e53c9c92d01b63aefbe1caa95d06586ef0f4bdd0 SHA1 411386a2633ff731374b1624a698d621ef1a77c1 SHA256 3e227f3c44c4f44c4d4f5adaa2cbde90a4a753f13accde552b5e4e1520151923
 DIST test-framework-quickcheck2-0.2.5.tar.gz 4566 RMD160 7fd64f47f71169de939ed19fa50bd7ef06ab2030 SHA1 ebe57ca37e2d5ffe3dece890dd455e2cfd7f549d SHA256 d9262fbf69428638c26b1ecc4ca4a56e9eaa0bf25ad4665156b7bf10e8277d67

dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12.2.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-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12.2.ebuild,v 1.1 2012/05/26 07:16:07 gienah Exp $
+
+# ebuild generated by hackport 0.2.17
+
+EAPI=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck2 support for the test-framework package."
+HOMEPAGE="http://batterseapower.github.com/test-framework/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="=dev-haskell/quickcheck-2.4*[profile?]
+		>=dev-haskell/test-framework-0.6[profile?]
+		>=dev-lang/ghc-6.10.4"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.3"

dev-haskell/text/Manifest

@@ -2,3 +2,4 @@ DIST text-0.11.1.1.tar.gz 119505 RMD160 304746b8e3c0298babcc0099186d7a242e401b12
 DIST text-0.11.1.12.tar.gz 120261 RMD160 fdfc9b080b8653918b15f6c8ef62ad82102e5da0 SHA1 d2f4e55c52e813087068fd259d508299d8c4ce13 SHA256 b4ce2d05ad1c2f4c2fa75a7e1c10b1aaf15b055bb2bd8a7b9dac0f0939214048
 DIST text-0.11.1.13.tar.gz 120181 RMD160 d08a657737b3eaba49c33adffc0a93359fd41178 SHA1 9139887ac1cee7ec1d59b76a80a938b2e9d1a05e SHA256 4e6cf947f2ab474d4bdbc5057b78a2faa00badad5ee2d032d0b7f98b9d276c51
 DIST text-0.11.2.0.tar.gz 121020 RMD160 dc6719e9301183f8a4b08047580682d1eb2ebd01 SHA1 a5ecd653afab9b194a8475b6e3c683f11f4509f0 SHA256 178d12eb0dad50f3ef5135c443b31993e91ed91b1d04a2ebfa5c05520518a5bb
+DIST text-0.11.2.1.tar.gz 121169 RMD160 e114ed27853084cbccc2c3b24734106cd65becbf SHA1 56dbc6b56d96cc1ffa44405a66a773a76932339e SHA256 69c9b5df8743cb5e5444f1730a8f7aed087e347bb26546e22e104ee46017502a

dev-haskell/text/text-0.11.2.1.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-haskell/text/text-0.11.2.1.ebuild,v 1.1 2012/05/26 07:49:42 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type."
+HOMEPAGE="https://github.com/bos/text"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/deepseq-1.1.0.0[profile?]
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( >=dev-haskell/quickcheck-2.4.0.1[profile?]
+			>=dev-haskell/test-framework-0.4[profile?] <dev-haskell/test-framework-0.7[profile?]
+			<dev-haskell/test-framework-hunit-0.3[profile?]
+			<dev-haskell/test-framework-quickcheck2-0.3[profile?]
+		)"
+
+src_configure() {
+	# the tests need a utf-8 locale
+	cabal_src_configure $(use test && use_enable test tests) #395351
+}

dev-java/xerces/Manifest

@@ -1,2 +1,3 @@
 DIST Xerces-J-src.1.3.1.tar.gz 900263 RMD160 31512c5331f00599ae117c4f5e61767844e556fc SHA1 3a856e2b5ca45cf1fff32aaace6749030bb1e6b0 SHA256 d59f57ef4ec540f75b4b79aeef20e85ccb4f2c3b516dc995f1fc88f526f5f1e1
+DIST Xerces-J-src.2.11.0.tar.gz 1792762 RMD160 5ae4b52c2907e560aed36cdb146140fd4db05875 SHA1 c57f0251ce9246c6026aa9f92241f37108f7141f SHA256 f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680
 DIST Xerces-J-src.2.9.1.tar.gz 1711507 RMD160 20bc600ce07fdcf82483e1992dada5ba40c80ff8 SHA1 78786a120c10b3d7079384cecbd2860260e47445 SHA256 13af0062a72a4a0d541ca5336391eafa4d580258cacf4a5e062ea584ca950592

dev-java/xerces/files/xerces-2.11.0-build.xml.patch

@@ -0,0 +1,46 @@
+Author: Ralph Sennhauser <sera@gentoo.org>
+
+Don't reference non existing jar in taskdef. #351394
+Don't let user properties leak into build env.
+Don't bundle stuff from xml-commons-external.
+
+--- a/build.xml
++++ b/build.xml
+@@ -39,18 +39,13 @@ Authors:
+   <property name="tools.dir" value="./tools"/>
+ 
+   <!-- enable compilation under JDK 1.4 and above -->
+-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
+-    <classpath>
+-      <pathelement location="${tools.dir}/bin/xjavac.jar"/>
+-    </classpath>
+-  </taskdef>
++  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
+ 
+   <!-- Allow properties following these statements to be overridden -->
+   <!-- Note that all of these don't have to exist.  They've just been defined
+        incase they are used. -->
+   <property file="build.properties"/>
+   <property file=".ant.properties"/>
+-  <property file="${user.home}/.ant.properties"/>
+   <property file="default.properties"/>  
+  
+   <target name="init">
+@@ -247,7 +242,7 @@ Authors:
+     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
+       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
+ 
+-    <!-- now deal with API's:  -->
++    <!-- now deal with API's:
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -269,7 +264,7 @@ Authors:
+                 org/w3c/dom/views/**
+                 org/w3c/dom/xpath/**"
+         />
+-    </unzip>
++    </unzip>  -->
+     
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

dev-java/xerces/xerces-2.11.0.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/dev-java/xerces/xerces-2.11.0.ebuild,v 1.1 2012/05/26 11:19:58 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils versionator java-pkg-2 java-ant-2
+
+DIST_PN="Xerces-J"
+SRC_PV="$(replace_all_version_separators _ )"
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
+SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# they are missing from the upstream tarball"
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/xml-commons-external:1.4
+	>=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	dev-java/xjavac:1"
+
+S="${WORKDIR}/${PN}-${SRC_PV}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_ANT_TASKS="xjavac-1"
+EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
+EANT_DOC_TARGET="javadocs"
+# known small bug - javadocs use custom taglets, which come as bundled jar in
+# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
+EANT_EXTRA_ARGS="-Dadditional.param="
+
+src_install() {
+	java-pkg_dojar build/xercesImpl.jar
+
+	dodoc README NOTICE
+	dohtml Readme.html
+
+	use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/org
+}

dev-lang/python/python-2.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/dev-lang/python/python-2.6.8.ebuild,v 1.13 2012/05/17 08:39:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.8.ebuild,v 1.15 2012/05/26 17:27:12 armin76 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 LICENSE="PSF-2"
 SLOT="2.6"
 PYTHON_ABI="${SLOT}"
-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="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 RDEPEND="app-arch/bzip2

dev-lang/python/python-2.7.3-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-lang/python/python-2.7.3-r1.ebuild,v 1.13 2012/05/17 08:39:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r1.ebuild,v 1.15 2012/05/26 17:27:12 armin76 Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="none"
@@ -19,7 +19,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 LICENSE="PSF-2"
 SLOT="2.7"
 PYTHON_ABI="${SLOT}"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 RDEPEND="app-arch/bzip2

dev-lang/swi-prolog/Manifest

@@ -8,7 +8,7 @@ DIST pl-6.1.3.tar.gz 13839415 RMD160 0952af4fb54bb1d6b3dcbad5d1d27c6630799d76 SH
 DIST pl-6.1.4.tar.gz 13984106 RMD160 ce33579523e8fccc0ac3fb2d63a9cc97c06fb976 SHA1 b215531cc7ef620d936881dfc071ddeb2ca59648 SHA256 d822c08756b1df967cd17cf6f2b8e89a4388b8e2776314324c047237c9ca8468
 DIST swi-prolog-5.10.5-gentoo-patchset-5.tar.gz 10284 RMD160 42b868f886c639fd612e4c03cbabceb4a70b603a SHA1 26275151c36fb0322f60ec4eadfe0852e02f0b71 SHA256 7f7817602dd844cbd587a665164c85a9d0d8a00b09cfce50f9784119563c11ef
 DIST swi-prolog-6.0.0-gentoo-patchset-0.tar.gz 4092 RMD160 73ea1a7f5dffff2c411983abc48e6e028d6366ad SHA1 8adb49c195d9f2250721f16bfb849f45c42e040e SHA256 7e64c64db768e0ad5fd682b3d5b6a3b92bb0d4d8663af26dbd5ab717d712564c
-DIST swi-prolog-6.0.1-gentoo-patchset-2.tar.gz 5076 RMD160 d22170ad340e00156bd92f53da33eeee03fc3164 SHA1 b98aafd9b0bb7169859621c16333022cc8c697bd SHA256 84a299ab8f196669eab51d9bfe3d4ec770a4ce726374f91a3553b1303e6b4510
+DIST swi-prolog-6.0.1-gentoo-patchset-2.tar.gz 5328 RMD160 9a10120f80739027542a7f7e96b0b0f81f7e2fa8 SHA1 311876be4eb30784f89bdc04d8868d74de5b47cf SHA256 3822c85351b47364c121ed4583e9801d0fec74f9cff8c8886800f5503700e0a6
 DIST swi-prolog-6.1.0-gentoo-patchset-0.tar.gz 4091 RMD160 69420dd1d071b306fe55f79e4b0def6b13736939 SHA1 e78560a8bf29072afed536ba1946b46d52c9e3c8 SHA256 0a01c451999207d326cad29847a94d95621e71b83a62b33cedf23b4be214063b
 DIST swi-prolog-6.1.1-gentoo-patchset-0.tar.gz 3859 RMD160 0bb3cbfeb9e621c51bbcebcdb60301648fbd764b SHA1 01dcc3ace9be32995d2641accadd4c521dd22c34 SHA256 9cd70eaa1029d4fb7ab22abeefba3e7e3efe49ec52733556ed2b35de5b0f5358
 DIST swi-prolog-6.1.2-gentoo-patchset-0.tar.gz 3866 RMD160 7e09c16ecfaa9b0a34c77a403b8a57ca3d65e593 SHA1 9ab931f43a5459ae6c013906470506a311f2677a SHA256 496e87171518d730c2feebd09c9ce96e7226e0d9a5a2e3bd6aa015774a450c8a

dev-lang/v8/Manifest

@@ -1,5 +1,4 @@
 DIST v8-3.10.8.10.tar.bz2 10063797 RMD160 4e35009c04fc2cd510b60d9af122caa61a943c1a SHA1 565174c7cffbfd02e7c0b9e6b91f12b02bcf36fa SHA256 412b90e52b2ba3373b3ca59b63857ff6371c216e0a763ffc49c60e7c190b1b3b
 DIST v8-3.10.8.7.tar.bz2 10063959 RMD160 b20ef13e5dfcd93d5d2d5d85138064338250ccb4 SHA1 7225a2d3bf8a27180d743a240785275b9d2948a0 SHA256 f411248f95de06297310eaf0d1195d913bb3dee92a0fbb8bc62193f00ff4ff08
 DIST v8-3.11.3.tar.bz2 10069593 RMD160 dbf6ab21bafdc5a62751f16988615a33a9f74997 SHA1 d676bd5eb3785069d8d18842cca932143d54ed74 SHA256 52864dcceb50188331b6b6d472bda9988a0c4f3e7365f027b671cc54e78eb96e
-DIST v8-3.9.24.21.tar.bz2 9976966 RMD160 17cc6f24c69ffec464d2a7b6fab8ba051821fa1c SHA1 048800284803bd355215b5446b819810f0003958 SHA256 9eb48fed13f5d230044b5a38d44455d1212aa28da797721fb9ba1bba870c64c8
 DIST v8-3.9.24.28.tar.bz2 9975177 RMD160 444565b92e7cce55f0792f2a643f425413e994ea SHA1 6dc38d96ede2a84c9bb9982e99674df1a5254374 SHA256 054f4fc90fc0e1960520058321925272812164b9e9dfd661636d7a4d74d127cd

dev-lang/v8/files/v8-3.10.8.10-darwin-arch.patch

@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/show_bug.cgi?id=417401
+
+The Prefix toolchain on OSX doesn't support -arch, even though using
+gcc-apple.  This is not really a problem (FSF GCC doesn't understand
+this flag either), because we never build FAT objects.  It is however a
+problem when people forcibly add -arch to CFLAGS and LDFLAGS.  Leave it
+to the toolchain such that we can also build 64-bits.  (Pro!)
+
+Request for removing this when unnecessary:
+http://code.google.com/p/gyp/issues/detail?id=260
+
+--- build/gyp/pylib/gyp/xcode_emulation.py
++++ build/gyp/pylib/gyp/xcode_emulation.py
+@@ -317,7 +317,6 @@
+       # TODO: Supporting fat binaries will be annoying.
+       self._WarnUnimplemented('ARCHS')
+       archs = ['i386']
+-    cflags.append('-arch ' + archs[0])
+ 
+     if archs[0] in ('i386', 'x86_64'):
+       if self._Test('GCC_ENABLE_SSE3_EXTENSIONS', 'YES', default='NO'):
+@@ -435,7 +434,6 @@
+       # TODO: Supporting fat binaries will be annoying.
+       self._WarnUnimplemented('ARCHS')
+       archs = ['i386']
+-    ldflags.append('-arch ' + archs[0])
+ 
+     # Xcode adds the product directory by default.
+     ldflags.append('-L' + product_dir)

dev-lang/v8/v8-3.10.8.10.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.10.8.10.ebuild,v 1.1 2012/05/25 02:08:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.10.8.10.ebuild,v 1.2 2012/05/26 10:10:50 grobian Exp $
 
 EAPI="4"
 
@@ -22,6 +22,14 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# strip unsupported -arch (in Prefix) for OSX, e.g. bug #417401
+	epatch "${FILESDIR}"/${P}-darwin-arch.patch
+	# make sure we don't target an anchient version of OSX
+	# issue http://code.google.com/p/v8/issues/detail?id=2151
+	#sed -i -e "/MACOSX_DEPLOYMENT_TARGET/d" build/standalone.gypi || die
+}
+
 src_compile() {
 	tc-export AR CC CXX RANLIB
 
@@ -77,14 +85,24 @@ src_install() {
 	insinto /usr
 	doins -r include || die
 
-	dobin out/${mytarget}/d8 || die
-
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# buildsystem is too horrific to get this built correctly
-		mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
+		mkdir -p out/${mytarget}/lib.target
+		mv out/${mytarget}/libv8.so.${soname_version} \
 			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
+			|| die
+		install_name_tool \
+			-change \
+			"${S}"/out/${mytarget}/libv8.so.${soname_version} \
+			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/${mytarget}/d8 || die
 	fi
 
+	dobin out/${mytarget}/d8 || die
+
 	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
 	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
 

dev-lang/v8/v8-3.10.8.7.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.10.8.7.ebuild,v 1.1 2012/05/21 14:27:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.10.8.7.ebuild,v 1.2 2012/05/26 10:10:50 grobian Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 pkg_setup() {

dev-lang/v8/v8-3.11.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-lang/v8/v8-3.11.3.ebuild,v 1.1 2012/05/22 20:05:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.11.3.ebuild,v 1.2 2012/05/26 10:10:50 grobian Exp $
 
 EAPI="4"
 
@@ -22,6 +22,14 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_prepare() {
+	# strip unsupported -arch (in Prefix) for OSX, e.g. bug #417401
+	epatch "${FILESDIR}"/${PN}-3.10.8.10-darwin-arch.patch
+	# make sure we don't target an anchient version of OSX
+	# issue http://code.google.com/p/v8/issues/detail?id=2151
+	#sed -i -e "/MACOSX_DEPLOYMENT_TARGET/d" build/standalone.gypi || die
+}
+
 src_compile() {
 	tc-export AR CC CXX RANLIB
 
@@ -77,14 +85,24 @@ src_install() {
 	insinto /usr
 	doins -r include || die
 
-	dobin out/${mytarget}/d8 || die
-
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# buildsystem is too horrific to get this built correctly
-		mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
+		mkdir -p out/${mytarget}/lib.target
+		mv out/${mytarget}/libv8.so.${soname_version} \
 			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
+			|| die
+		install_name_tool \
+			-change \
+			"${S}"/out/${mytarget}/libv8.so.${soname_version} \
+			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/${mytarget}/d8 || die
 	fi
 
+	dobin out/${mytarget}/d8 || die
+
 	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
 	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
 

dev-lang/v8/v8-3.9.24.21.ebuild

@@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.9.24.21.ebuild,v 1.3 2012/05/19 13:47:51 ago Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils multilib pax-utils python toolchain-funcs versionator
-
-DESCRIPTION="Google's open source JavaScript engine"
-HOMEPAGE="http://code.google.com/p/v8"
-SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos ~x86-macos"
-IUSE=""
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# don't force 32-bits mode on Darwin
-	# http://code.google.com/p/v8/issues/detail?id=2085
-	sed -i -e '/-arch i386/d' build/gyp/pylib/gyp/generator/make.py || die
-	# don't refuse to build shared_libs because we build somewhere else
-	# make sure our v8.dylib doesn't end up being empty and give it a proper
-	# install_name (soname)
-	# http://code.google.com/p/v8/issues/detail?id=2086
-	sed -i \
-		-e '/params\.get.*mac.*darwin.*linux/s/mac/darwin/' \
-		-e "/if GetFlavor(params) == 'mac':/s/mac/darwin/" \
-		-e "/^  if flavor == 'mac':/s/mac/darwin/" \
-		-e '/^LINK_COMMANDS_MAC =/,/^SHARED_HEADER =/s#-shared#-dynamiclib -all_load -install_name '"${EPREFIX}/usr/$(get_libdir)/libv8$(get_libname $(get_version_component_range 1-3))"'#' \
-		build/gyp/pylib/gyp/generator/make.py || die
-}
-
-src_compile() {
-	tc-export AR CC CXX RANLIB
-	export LINK="${CXX}"
-
-	# Use target arch detection logic from bug #354601.
-	case ${CHOST} in
-		i?86-*) myarch=ia32 ;;
-		x86_64-*)
-			if [[ $ABI = x86 ]] ; then
-				myarch=ia32
-			else
-				myarch=x64
-			fi ;;
-		arm*-*) myarch=arm ;;
-		*) die "Unrecognized CHOST: ${CHOST}"
-	esac
-	mytarget=${myarch}.release
-
-	soname_version="$(get_version_component_range 1-3)"
-
-	local snapshot=on
-	host-is-pax && snapshot=off
-
-	# TODO: Add console=readline option once implemented upstream
-	# http://code.google.com/p/v8/issues/detail?id=1781
-
-	# force using Makefiles, instead of Xcode project file on Darwin
-	emake V=1 GYP_GENERATORS=make \
-		library=shared \
-		werror=no \
-		soname_version=${soname_version} \
-		snapshot=${snapshot} \
-		${mytarget} || die
-
-	pax-mark m out/${mytarget}/{cctest,d8,shell} || die
-}
-
-src_test() {
-	local arg testjobs
-	for arg in ${MAKEOPTS}; do
-		case ${arg} in
-			-j*) testjobs=${arg#-j} ;;
-			--jobs=*) testjobs=${arg#--jobs=} ;;
-		esac
-	done
-
-	tools/test-wrapper-gypbuild.py \
-		-j${testjobs:-1} \
-		--arch-and-mode=${mytarget} \
-		--no-presubmit \
-		--progress=dots || die
-}
-
-src_install() {
-	insinto /usr
-	doins -r include || die
-
-	dobin out/${mytarget}/d8 || die
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# buildsystem is too horrific to get this built correctly
-		mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
-			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
-	fi
-
-	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
-	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
-
-	dodoc AUTHORS ChangeLog || die
-}
-
-pkg_preinst() {
-	preserved_libs=()
-	local baselib candidate
-
-	eshopts_push -s nullglob
-
-	for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do
-		baselib=${candidate##*/}
-		if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then
-			preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" )
-		fi
-	done
-
-	eshopts_pop
-
-	if [[ ${#preserved_libs[@]} -gt 0 ]]; then
-		preserve_old_lib "${preserved_libs[@]}"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${#preserved_libs[@]} -gt 0 ]]; then
-		preserve_old_lib_notify "${preserved_libs[@]}"
-	fi
-}

dev-lang/v8/v8-3.9.24.28.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.9.24.28.ebuild,v 1.2 2012/05/24 02:07:34 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.9.24.28.ebuild,v 1.3 2012/05/26 16:44:01 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 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~x64-macos ~x86-macos"
 IUSE=""
 
 pkg_setup() {

dev-lang/v8/v8-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/dev-lang/v8/v8-9999.ebuild,v 1.27 2012/04/12 12:36:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-9999.ebuild,v 1.28 2012/05/26 10:10:50 grobian Exp $
 
 EAPI="4"
 
@@ -28,6 +28,14 @@ src_unpack() {
 	make dependencies || die
 }
 
+src_prepare() {
+	# strip unsupported -arch (in Prefix) for OSX, e.g. bug #417401
+	epatch "${FILESDIR}"/${PN}-3.10.8.10-darwin-arch.patch
+	# make sure we don't target an anchient version of OSX
+	# issue http://code.google.com/p/v8/issues/detail?id=2151
+	#sed -i -e "/MACOSX_DEPLOYMENT_TARGET/d" build/standalone.gypi || die
+}
+
 src_compile() {
 	tc-export AR CC CXX RANLIB
 
@@ -84,14 +92,24 @@ src_install() {
 	insinto /usr
 	doins -r include || die
 
-	dobin out/${mytarget}/d8 || die
-
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# buildsystem is too horrific to get this built correctly
-		mv out/${mytarget}/lib.target/libv8.so.${soname_version} \
+		mkdir -p out/${mytarget}/lib.target
+		mv out/${mytarget}/libv8.so.${soname_version} \
 			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
+			|| die
+		install_name_tool \
+			-change \
+			"${S}"/out/${mytarget}/libv8.so.${soname_version} \
+			"${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+			out/${mytarget}/d8 || die
 	fi
 
+	dobin out/${mytarget}/d8 || die
+
 	dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
 	dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
 

dev-libs/fcgi/fcgi-2.4.1_pre0910052249.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/fcgi/fcgi-2.4.1_pre0910052249.ebuild,v 1.4 2012/05/21 09:30:02 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fcgi/fcgi-2.4.1_pre0910052249.ebuild,v 1.5 2012/05/26 09:50:44 maekke Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="html"
 
 DEPEND=""

dev-libs/icu/icu-49.1.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/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.7 2012/05/19 06:52:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.1-r1.ebuild,v 1.8 2012/05/26 09:54:28 maekke Exp $
 
 EAPI="4"
 
@@ -25,7 +25,7 @@ SRC_URI="${BASE_URI}/${SRC_ARCHIVE}
 
 LICENSE="BSD"
 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="debug doc examples static-libs"
 
 DEPEND="doc? ( app-arch/unzip )"

dev-libs/libgusb/libgusb-0.1.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-libs/libgusb/libgusb-0.1.3.ebuild,v 1.12 2012/05/24 13:41:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgusb/libgusb-0.1.3.ebuild,v 1.13 2012/05/27 03:20:01 mattst88 Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 x86"
 IUSE="static-libs"
 
 # udev is effectively a required dependency: configuring with --disable-gudev

dev-libs/libpcre/libpcre-8.30-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/libpcre/libpcre-8.30-r2.ebuild,v 1.5 2012/05/25 16:39:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.30-r2.ebuild,v 1.6 2012/05/26 13:45:19 ago Exp $
 
 EAPI="4"
 
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit pcre16 +readline +recursion-limit static-libs unicode zlib"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )

dev-libs/libxml2/libxml2-2.8.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/libxml2/libxml2-2.8.0.ebuild,v 1.1 2012/05/25 07:13:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.2 2012/05/26 16:10:23 aballier Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
@@ -36,6 +36,7 @@ RDEPEND="sys-libs/zlib
 	readline? ( sys-libs/readline )"
 
 DEPEND="${RDEPEND}
+	python? ( dev-util/fix-la-relink-command )
 	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
 
 S="${WORKDIR}/${PN}-${PV%_rc*}"
@@ -152,6 +153,8 @@ src_install() {
 
 	if use python; then
 		installation() {
+			# bug #417539
+			fix-la-relink-command . || die "fix-la-relink-command failed"
 			emake DESTDIR="${D}" \
 				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
 				docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \

dev-libs/libxml2/libxml2-2.8.0_rc1.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/libxml2/libxml2-2.8.0_rc1.ebuild,v 1.7 2012/05/25 07:13:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0_rc1.ebuild,v 1.9 2012/05/26 17:22:43 armin76 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"

dev-libs/nspr/nspr-4.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/nspr/nspr-4.9.ebuild,v 1.6 2012/05/07 17:46:22 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.8 2012/05/26 17:22:08 armin76 Exp $
 
 EAPI=3
 WANT_AUTOCONF="2.1"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_prepare() {

dev-libs/nss/nss-3.13.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/nss/nss-3.13.4.ebuild,v 1.4 2012/05/08 13:13:34 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.4.ebuild,v 1.6 2012/05/26 17:08:14 armin76 Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="virtual/pkgconfig"

dev-libs/poco/poco-1.4.3_p1.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/poco/poco-1.4.3_p1.ebuild,v 1.3 2012/04/13 16:56:07 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.4.3_p1.ebuild,v 1.4 2012/05/26 13:47:16 ago Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/poco/${MY_P}-all.tar.bz2
 	doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples iodbc mysql odbc sqlite ssl test"
 
 DEPEND=">=dev-libs/libpcre-8.13

dev-libs/pslib/pslib-0.4.1-r2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pslib/pslib-0.4.1-r2.ebuild,v 1.4 2011/02/25 20:00:34 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pslib/pslib-0.4.1-r2.ebuild,v 1.5 2012/05/26 18:59:49 dilfridge Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
-IUSE="debug jpeg png tiff"
+IUSE="debug jpeg linguas_de png tiff"
 
 RDEPEND="png? ( >=media-libs/libpng-1.2.43-r2:0 )
 	jpeg? ( virtual/jpeg )
@@ -46,4 +46,5 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS README
+	use linguas_de || rm -r "${D}/usr/share/locale/de"
 }

dev-perl/Config-IniFiles/Config-IniFiles-2.750.0.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-IniFiles/Config-IniFiles-2.750.0.ebuild,v 1.1 2012/05/26 12:54:17 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=2.75
+inherit perl-module
+
+DESCRIPTION="A module for reading .ini-style configuration files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/IO-stringy
+	dev-perl/List-MoreUtils
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-Module-Build-0.36
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do"

dev-perl/Config-IniFiles/Manifest

@@ -5,3 +5,4 @@ DIST Config-IniFiles-2.70.tar.gz 59706 RMD160 495ae466883141dcb02b824e7c2b6cf0e2
 DIST Config-IniFiles-2.71.tar.gz 60175 RMD160 14cded2ce91786e5383bd355fdce0b57c8db4bdb SHA1 37cbca2241178b1343b1bc13bfb959080986d450 SHA256 853b97d6e33f4a63c121408d9aed1a85597de95d0769ec249e1739dfe51c42c4
 DIST Config-IniFiles-2.72.tar.gz 61256 RMD160 f53fe6fc42cadf0b2c7418d92cc106b5aa76d33f SHA1 5cd0ecb4f5993c3044080049fca7559733b69c8c SHA256 6ec0a7fee53d47ca03f6f52c05dbe4c0f2788b6fe7b1f765c40a34cd81e80b91
 DIST Config-IniFiles-2.73.tar.gz 61598 RMD160 c87b5796562b853340ad7f3a56ad2b1c112e1fcd SHA1 6d2c86d02b5959dc56872cfae2c1b7373b9ca833 SHA256 542515be2ff719d7ea56cf6842a59dbf8d1e45351c5fa6079e9c14571f989113
+DIST Config-IniFiles-2.75.tar.gz 62973 RMD160 198cda76cb9867f3328b1b2d2ad3e611927e4237 SHA1 76b0cc9fe110d1f828967652c0dca6511730f94d SHA256 503bd5923dbed3940a77d59868ce6fdf956f6aa6faf9105e4feeec0101ef9626

dev-perl/GraphViz/GraphViz-2.100.0.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-perl/GraphViz/GraphViz-2.100.0.ebuild,v 1.1 2012/05/26 13:05:43 tove Exp $
+
+EAPI=4
+
+MODULE_A_EXT=tgz
+MODULE_AUTHOR=RSAVAGE
+MODULE_VERSION=2.10
+inherit perl-module
+
+DESCRIPTION="GraphViz - Interface to the GraphViz graphing tool"
+
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="media-gfx/graphviz
+	dev-perl/IPC-Run"
+	#dev-perl/XML-Twig #used in GraphViz::XML
+DEPEND="${RDEPEND}
+	virtual/perl-Module-Build
+	test? (
+		virtual/perl-Test-Simple
+		>=dev-perl/Test-Pod-1.440.0
+	)
+"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+
+	insinto /usr/share/doc/${PF}/examples
+	doins "${S}"/examples/* || die
+}

dev-perl/GraphViz/Manifest

@@ -1,3 +1,4 @@
 DIST GraphViz-2.02.tar.gz 84348 RMD160 cd0cad4cd687198a9a8c1cd02e10320c1f07b268 SHA1 02d5771ef4c24d30c20083e8f86d52606e5706a2 SHA256 44b6b7c2866c417c78d6448a77f8aa68acb5edbaadf813dd87b859e70b969345
 DIST GraphViz-2.04.tar.gz 84690 RMD160 abf855ea910b25e8d8aed40b8477d838bf330da3 SHA1 4ddaead304bf0eba715398a2e6ff573bc4a753e4 SHA256 ad0b63af14224968a6cd2abeecebb856235fcf2105dba366e269dd449a54b7bf
 DIST GraphViz-2.09.tgz 116001 RMD160 d30fd756690c382b737e597f040ba1e2e4dfa210 SHA1 cd9069041c1f5c98e371d81e2b707fccfbe8b13a SHA256 0361ef8f9c16dc039ea45b85e5b979754d648e1ae4a62d556fe04ebef31e5d35
+DIST GraphViz-2.10.tgz 116688 RMD160 d0185e807f9d2cff42711b1698d69c0b6ee3d45a SHA1 2a8706ef6fb7e20bcbce983648bbd31983e73405 SHA256 8bf168280e7139e5b0d0964ed1f17bc458611ed027ae79b8e9659c6abe0cf841

dev-perl/ImageSize/ImageSize-3.231.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageSize/ImageSize-3.231.0.ebuild,v 1.1 2012/05/26 12:37:05 tove Exp $
+
+EAPI=4
+
+MY_PN=Image-Size
+MODULE_AUTHOR=RJRAY
+MODULE_VERSION=3.231
+inherit perl-module
+
+DESCRIPTION="A library to extract height/width from images"
+
+LICENSE="|| ( Artistic-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/perl-IO-Compress
+	virtual/perl-File-Spec
+"
+DEPEND="${RDEPEND}"
+
+SRC_TEST="do"
+mydoc="ToDo"

dev-perl/ImageSize/Manifest

@@ -1 +1,2 @@
 DIST Image-Size-3.230.tar.gz 206205 RMD160 a20ace5601564f6cc59005e82c02a2bb7969068b SHA1 8f1ff3662d8020c0e4daee4a7cb2312d06b86686 SHA256 b2cf429c306fc865c551843bb2db42c24e28286964219758f315fce7d2aa76ae
+DIST Image-Size-3.231.tar.gz 222441 RMD160 19d91da82029e632d463502c0d04e1b3b9dce59a SHA1 2f128d96cacf662d28c5def72675f56e40893607 SHA256 681321cbb445adc62530327df111011203d60f0ae466fc4c473afb0468debf6f

dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.300.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/Mail-IMAPClient/Mail-IMAPClient-3.300.0.ebuild,v 1.5 2012/04/16 21:28:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-IMAPClient/Mail-IMAPClient-3.300.0.ebuild,v 1.6 2012/05/26 18:56:27 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="IMAP client module for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 s390 sh sparc x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Parse-RecDescent-1.94"

dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild,v 1.6 2010/06/27 18:30:46 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Refresh/Module-Refresh-0.13.ebuild,v 1.7 2012/05/26 18:58:48 armin76 Exp $
 
 MODULE_AUTHOR=JESSE
 inherit perl-module
@@ -9,7 +9,7 @@ DESCRIPTION="Refresh %INC files when updated on disk"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 SRC_TEST="do"

dev-perl/Module-Refresh/Module-Refresh-0.160.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/Module-Refresh/Module-Refresh-0.160.0.ebuild,v 1.1 2011/04/15 10:16:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Refresh/Module-Refresh-0.160.0.ebuild,v 1.2 2012/05/26 18:58:48 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Refresh %INC files when updated on disk"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=""

dev-perl/Module-Refresh/Module-Refresh-0.170.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/Module-Refresh/Module-Refresh-0.170.0.ebuild,v 1.4 2012/04/16 21:29:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Refresh/Module-Refresh-0.170.0.ebuild,v 1.5 2012/05/26 18:58:48 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Refresh %INC files when updated on disk"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 
 RDEPEND=""

dev-perl/Test-Tester/Test-Tester-0.108.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-Tester/Test-Tester-0.108.0.ebuild,v 1.6 2012/04/16 21:31:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Tester/Test-Tester-0.108.0.ebuild,v 1.7 2012/05/26 19:00:11 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Ease testing test modules built with Test::Builder"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST="do"

dev-perl/gtk2-perl/Manifest

@@ -2,3 +2,4 @@ DIST Gtk2-1.222.tar.gz 713908 RMD160 f135139d2ef12878539f4fb147cf1bad5e6970db SH
 DIST Gtk2-1.224.tar.gz 717132 RMD160 941ab80759831bc27eea3dc3ada46bb94a90fef3 SHA1 fb25550933f45330dc705d14b3e0637b1570e0fd SHA256 958ee7c96aa9960eed2ee81f3df432d0a02694fd6db6d92bc4f554691a56e4ae
 DIST Gtk2-1.240.tar.gz 758338 RMD160 73693ff1233413f5a59960635f116b6f2097dd43 SHA1 ab1485914f71237e182d79c8a2cf71ba273a3626 SHA256 677e09fecb461d5d5475ab7a445ca6ae1c457e2807a543697771e6544c2274e5
 DIST Gtk2-1.242.tar.gz 740140 RMD160 4f5ec154fe0e397acd33cc7ac709ed55a1758ec2 SHA1 309af86fc6db5ab7bb0cddfc83c46e1b8fdf24a5 SHA256 8c3ebd2d0bce82f421166fe2c2345b048214f6a83791a0e5cdd90eac0d756281
+DIST Gtk2-1.244.tar.gz 740037 RMD160 5b15e23846a11d86c081ffa639c778e9c7914213 SHA1 d5c39af1511fe896aa4189d480dc698677c375d1 SHA256 a53a541c885ee44fc71c6ef8538cc29206e0605225b9e36d2678ee2026a9977a

dev-perl/gtk2-perl/gtk2-perl-1.244.0.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-perl/gtk2-perl-1.244.0.ebuild,v 1.1 2012/05/26 12:51:40 tove Exp $
+
+EAPI=4
+
+MY_PN=Gtk2
+MODULE_AUTHOR=XAOC
+MODULE_VERSION=1.244
+inherit perl-module
+#inherit virtualx
+
+DESCRIPTION="Perl bindings for GTK2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-perl/Cairo
+	>=dev-perl/glib-perl-1.240.0
+	>=dev-perl/Pango-1.220.0"
+DEPEND="${RDEPEND}
+	>=dev-perl/extutils-depends-0.300.0
+	>=dev-perl/extutils-pkgconfig-1.030.0"
+
+#RDEPEND+=" || ( <x11-libs/gtk+-2.22.1-r1[jpeg] x11-libs/gdk-pixbuf[jpeg] )"
+#SRC_TEST=do
+#src_test(){
+#	Xemake -j1 test || die
+#}

dev-perl/log-dispatch/Manifest

@@ -1,2 +1,3 @@
 DIST Log-Dispatch-2.29.tar.gz 32128 RMD160 3245f3c2f984a6f415a7c9c055918d8c50fc059d SHA1 d54a1b253964dd7166ba2727495e8fbd33d892d6 SHA256 bb2312625d45bf4a0516caa4944842ad5d085386acbe900aacdbc08b2a1cfcf5
 DIST Log-Dispatch-2.31.tar.gz 31790 RMD160 46ec1f0acf7eb7cd002809dc687b682d4b624a3a SHA1 1798740bd140178e6b8587d49d6575fc06098a64 SHA256 9408500bba21a3c69a10b46e052220f94e278465f21e2aa36d6120006a9072b4
+DIST Log-Dispatch-2.32.tar.gz 31910 RMD160 973561b48dd5d66ceb75b8ed1533157465d50f59 SHA1 47669738ccb827fb44ab328ee0eae09c3a765f9a SHA256 10b2ec37dbd036c552918e3110b3e601e8b3bd003476854c07f25c1991463ef1

dev-perl/log-dispatch/log-dispatch-2.320.0.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/log-dispatch/log-dispatch-2.320.0.ebuild,v 1.1 2012/05/26 12:27:30 tove Exp $
+
+EAPI=4
+
+MY_PN=Log-Dispatch
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=2.32
+inherit perl-module
+
+DESCRIPTION="Dispatches messages to multiple Log::Dispatch::* objects"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/Params-Validate
+	dev-perl/Class-Load
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.31"
+
+SRC_TEST="do"

dev-perl/regexp-common/regexp-common-2011121001.0.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/regexp-common/regexp-common-2011121001.0.0.ebuild,v 1.5 2012/04/16 21:34:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/regexp-common/regexp-common-2011121001.0.0.ebuild,v 1.6 2012/05/26 19:02:22 armin76 Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"

dev-perl/text-wrapper/Manifest

@@ -1,2 +1,3 @@
 DIST Text-Wrapper-1.02.tar.gz 8229 RMD160 e4a627b5d566160a9b5c079dcb4dc40ebeb06cf1 SHA1 d6dc32314765a8e8c144734846e07bd896aebff1 SHA256 6c00d5dbc5adae26bc7fa9c36ac9982ddc065d2247f3aa3acc802d2e865034a7
 DIST Text-Wrapper-1.03.tar.gz 18052 RMD160 adf00b9e94af52cfeb70dd4dfcfc1fa6aa275ea2 SHA1 46b4d62ffd2b3fe7a5c12f44ee683639560eee92 SHA256 8274dcc448a3c9b3dd4b9abfef706ba79b3b0c2d2d06fa5dd47c721166c1492f
+DIST Text-Wrapper-1.04.tar.gz 18239 RMD160 0e5027d04340cecc457f52138e0ab74394205641 SHA1 49027e4757ede5b895df7fc185e58b0ec166ba10 SHA256 084d08e48fa37c8e75c9a724e55f7415e54ffa8ec63918ef7aec3494352d571b

dev-perl/text-wrapper/text-wrapper-1.40.0.ebuild

@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/text-wrapper/text-wrapper-1.40.0.ebuild,v 1.1 2012/05/26 12:18:38 tove Exp $
+
+EAPI=4
+
+MY_PN=Text-Wrapper
+MODULE_AUTHOR=CJM
+MODULE_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="Word wrap text by breaking long lines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+SRC_TEST=do

dev-python/cssselect/cssselect-0.6.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-python/cssselect/cssselect-0.6.1.ebuild,v 1.3 2012/05/16 16:39:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.6.1.ebuild,v 1.4 2012/05/27 03:10:06 naota Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools

dev-python/cvxopt/Manifest

@@ -1,2 +1 @@
-DIST cvxopt-1.1.4.tar.gz 2949975 RMD160 7e5ed85b27fd6298cd2919c7b914669baea3df98 SHA1 ee063b8d127a2e744f663ef1a9a37e1acdc55970 SHA256 1ac01ae510038f23751624301ec8d67bfda18a8a444b4f516c52d885a3c41792
 DIST cvxopt-1.1.5.tar.gz 3436288 RMD160 3d00f8bed86daeeebf243ab39fe12b2c0126e0e5 SHA1 6b02c9c022f391de4afb0bc1f6fb297aa0dc9efa SHA256 f1c0bd46321db941a46bb3544f4a23c6b15a90cbe5a485d735659abf110993d8

dev-python/cvxopt/cvxopt-1.1.5-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-python/cvxopt/cvxopt-1.1.4-r1.ebuild,v 1.4 2012/05/04 15:12:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5-r1.ebuild,v 1.1 2012/05/26 14:56:34 bicatali Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P}/src"
 
 src_prepare(){
-	epatch "${FILESDIR}"/${PN}-setup.patch
+	epatch "${FILESDIR}"/${P}-setup.patch
 	rm -rf src/C/SuiteSparse*/
 	rm -rf ../doc/build # 413905
 
@@ -44,7 +44,7 @@ src_prepare(){
 			-e "s/ -l/\',\'/g" \
 			-e 's/.,.pthread//g' \
 			-e "s:  ::")\'
-		sed -i -e "s:\(libraries.*\)'${1}'\(.*\):\1${pylib}\2:g" setup.py
+		sed -i -e "/_LIB = /s:\(.*\)'${1}'\(.*\):\1${pylib}\2:" setup.py
 	}
 
 	use_cvx() {
@@ -57,8 +57,8 @@ src_prepare(){
 
 	pkg_lib blas
 	pkg_lib lapack
-	use_cvx gsl && pkg_lib gsl
-	use_cvx fftw && pkg_lib fftw3
+	use_cvx gsl
+	use_cvx fftw
 	use_cvx glpk
 	use_cvx dsdp
 	distutils_src_prepare

dev-python/cvxopt/files/cvxopt-1.1.5-setup.patch

@@ -150,7 +150,7 @@
 -        glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
 -        ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
 -        glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-+     libraries = ['cholmod'] + BLAS_LIBS,
++     libraries = ['cholmod'] + BLAS_LIB,
 +     define_macros = MACROS + [('NPARTITION', '1')],
 +     sources = [ 'C/cholmod.c' ])
 +

dev-python/cvxopt/files/cvxopt-setup.patch

@@ -1,153 +0,0 @@
---- setup.py.orig	2011-12-22 10:53:49.000000000 +1300
-+++ setup.py	2012-01-16 11:17:04.207596266 +1300
-@@ -2,73 +2,57 @@
- from glob import glob
- 
- # directory containing libblas and liblapack
--ATLAS_LIB_DIR = '/usr/lib'
-+ATLAS_LIB_DIR = ''
- 
- # Set to 1 if you are using the random number generators in the GNU
- # Scientific Library.
- BUILD_GSL = 0
- 
- # Directory containing libgsl (used only when BUILD_GSL = 1).
--GSL_LIB_DIR = '/usr/lib'       
--
--# Directory containing the GSL header files (used only when BUILD_GSL = 1).
--GSL_INC_DIR = '/usr/include/gsl'  
-+GSL_LIB_DIR = ''       
- 
- # Set to 1 if you are installing the fftw module.
- BUILD_FFTW = 0
- 
- # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
--FFTW_LIB_DIR = '/usr/lib'       
--
--# Directory containing fftw.h (used only when BUILD_FFTW = 1).
--FFTW_INC_DIR = '/usr/include'  
-+FFTW_LIB_DIR = ''       
- 
- # Set to 1 if you are installing the glpk module.
- BUILD_GLPK = 0
- 
- # Directory containing libglpk (used only when BUILD_GLPK = 1).
--GLPK_LIB_DIR = '/usr/lib'       
--
--# Directory containing glpk.h (used only when BUILD_GLPK = 1).
--GLPK_INC_DIR = '/usr/include'  
-+GLPK_LIB_DIR = ''       
- 
- # Set to 1 if you are installing the DSDP module.
- BUILD_DSDP = 0
- 
- # Directory containing libdsdp (used only when BUILD_DSDP = 1).
--DSDP_LIB_DIR = '/usr/lib'
-+DSDP_LIB_DIR = ''
-  
--# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
--DSDP_INC_DIR = '/usr/include'
--
- extmods = []
- 
- # optional modules
- 
- if BUILD_GSL:
--    gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
--        include_dirs = [ GSL_INC_DIR ],
-+    gsl = Extension('gsl', libraries = ['gsl'],
-         library_dirs = [ GSL_LIB_DIR ],
-         sources = ['C/gsl.c'] )
-     extmods += [gsl];
- 
- if BUILD_FFTW:
--    fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
--        include_dirs = [ FFTW_INC_DIR ],
-+    fftw = Extension('fftw', libraries = ['fftw3'],
-         library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
-         sources = ['C/fftw.c'] )
-     extmods += [fftw];
- 
- if BUILD_GLPK:
-     glpk = Extension('glpk', libraries = ['glpk'],
--        include_dirs = [ GLPK_INC_DIR ],
-         library_dirs = [ GLPK_LIB_DIR ],
-         sources = ['C/glpk.c'] )
-     extmods += [glpk];
- 
- if BUILD_DSDP:
--    dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
--        include_dirs = [ DSDP_INC_DIR ],
-+    dsdp = Extension('dsdp', libraries = ['dsdp'],
-         library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
-         sources = ['C/dsdp.c'] )
-     extmods += [dsdp];
-@@ -85,7 +69,7 @@
- else:    
-     MACROS = []
- 
--base = Extension('base', libraries = ['m','lapack','blas'],
-+base = Extension('base', libraries = ['lapack'],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
-     sources = ['C/base.c','C/dense.c','C/sparse.c']) 
-@@ -95,22 +79,16 @@
-     define_macros = MACROS,
-     sources = ['C/blas.c'] )
- 
--lapack = Extension('lapack', libraries = ['lapack','blas'],
-+lapack = Extension('lapack', libraries = ['lapack'],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
-     sources = ['C/lapack.c'] )
- 
- umfpack = Extension('umfpack', 
--    include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
--        'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source', 
--        'C/SuiteSparse/UFconfig' ],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
--    libraries = [ 'blas', 'lapack'],
--    sources = [ 'C/umfpack.c',
--        'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
--        'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
--        glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
-+    libraries = [ 'umfpack' ],
-+    sources = [ 'C/umfpack.c' ])
- 
- # Build for int or long? 
- import sys
-@@ -118,28 +96,16 @@
- 
- cholmod = Extension('cholmod',
-     library_dirs = [ ATLAS_LIB_DIR ],
--    libraries = ['lapack', 'blas'],
--    include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include', 
--        'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include', 
--        'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
-+    libraries = ['cholmod','blas'],
-     define_macros = MACROS + [('NPARTITION', '1')],
--    sources = [ 'C/cholmod.c' ] + 
--        ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
--            'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
--        ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
--            'colamd_global.c']] +
--        glob('C/SuiteSparse/CHOLMOD/Core/c*.c') +
--        glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
--        ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
--        glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-+    sources = [ 'C/cholmod.c' ])
- 
- amd = Extension('amd', 
--    include_dirs = [ 'C/SuiteSparse/AMD/Include', 
--        'C/SuiteSparse/UFconfig' ],
-     define_macros = MACROS,
--    sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
-+    libraries = [ 'amd' ],
-+    sources = [ 'C/amd.c' ])
- 
--misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
-+misc_solvers = Extension('misc_solvers', libraries = ['lapack'],
-     library_dirs = [ ATLAS_LIB_DIR ],
-     define_macros = MACROS,
-     sources = ['C/misc_solvers.c'] )

dev-python/feedparser/feedparser-5.1.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.2.ebuild,v 1.2 2012/05/25 08:57:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.2.ebuild,v 1.4 2012/05/26 17:16:18 armin76 Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools"

dev-python/pycrypto/Manifest

@@ -1,3 +1,4 @@
 DIST pycrypto-2.3.tar.gz 331476 RMD160 5b7b15aab3f5e33113ba197a2edd629c72595374 SHA1 96b33b77e729893bd0837a09a6aa7a12b5070037 SHA256 4f11e85fbcf13960373650fc2dae8f088f9b001f07fb6d3efb2fcb5334987182
 DIST pycrypto-2.4.1.tar.gz 383032 RMD160 7dbf3b0ca10e8f728772f0b282667e4ba94661c5 SHA1 da028359986c9125b880b5b62b7c8ba06b733282 SHA256 4ff5f7008869c8509d16a31f285b9f6340c4a9ff703c85298832a2869210b154
 DIST pycrypto-2.5.tar.gz 426802 RMD160 12f814b7c5e8842aa61bf28c5e877bba4433fdbe SHA1 1fe50712e0776b45900f8032357201239223ab7e SHA256 e950a78184e2a7defccf5d45e0c29c1e9edeb29984433f0d110a21e9631e38de
+DIST pycrypto-2.6.tar.gz 443445 RMD160 5782b529d59f2a62951607fdafaa434aea13ee0a SHA1 c17e41a80b3fbf2ee4e8f2d8bb9e28c5d08bbb84 SHA256 7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8

dev-python/pycrypto/pycrypto-2.6.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.4 2012/05/26 19:42:39 jdhore Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils
+
+DESCRIPTION="Python Cryptography Toolkit"
+HOMEPAGE="http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto"
+SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
+
+LICENSE="PSF-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp"
+
+RDEPEND="gmp? ( dev-libs/gmp )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils >=dev-python/epydoc-3 )"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DOCS="ACKS ChangeLog README TODO"
+PYTHON_MODNAME="Crypto"
+
+src_configure() {
+	econf \
+		$(use_with gmp) \
+		--without-mpir
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		rst2html.py Doc/pycrypt.rst > Doc/index.html
+		PYTHONPATH="$(ls -d build-$(PYTHON --ABI -f)/lib.*)" epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die "Generation of documentation failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml Doc/apidoc/* Doc/index.html
+	fi
+}

dev-python/pyquery/pyquery-1.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/dev-python/pyquery/pyquery-1.2.1.ebuild,v 1.2 2012/05/16 16:39:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.1.ebuild,v 1.3 2012/05/27 03:11:42 naota Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=">=dev-python/lxml-2.1

dev-ruby/hoe/hoe-2.12.5.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.12.5.ebuild,v 1.2 2012/05/20 21:03:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.12.5.ebuild,v 1.3 2012/05/26 09:40:24 graaff Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -28,7 +28,7 @@ ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
 #   test-time, at least for us;
 # - rubyforge is loaded at runtime when needed, so we don't strictly
 #   depend on it at runtime, but we need it for tests (for now);
-ruby_add_bdepend "test? ( dev-ruby/minitest >=dev-ruby/rubyforge-2.0.4 )"
+ruby_add_bdepend "test? ( dev-ruby/rdoc dev-ruby/minitest >=dev-ruby/rubyforge-2.0.4 )"
 
 ruby_add_rdepend ">=dev-ruby/rake-0.8.7"