Sync with portage [Wed Nov 30 22:18:14 MSK 2011].

2011-11-30 22:18:14 +04:00 · 2011-11-30 22:18:14 +04:00 · 626f40739b
commit 626f40739b
parent 7ebf31e7dc
91 changed files with 1319 additions and 614 deletions
--- a/app-admin/eselect-php/eselect-php-0.6.6.ebuild
+++ b/app-admin/eselect-php/eselect-php-0.6.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/eselect-php-0.6.6.ebuild,v 1.2 2011/11/08 09:31:58 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/eselect-php-0.6.6.ebuild,v 1.3 2011/11/30 14:54:30 grobian Exp $

 EAPI=3

@ -10,7 +10,7 @@ SRC_URI="http://olemarkus.org/~olemarkus/gentoo/eselect-php-${PV}.bz2"

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

 DEPEND=">=app-admin/eselect-1.2.4
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.6 2011/10/26 15:47:59 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.8 2011/11/30 10:17:57 scarabeus Exp $

 EAPI=4

@ -72,7 +72,6 @@ COMMON_DEPEND="
 	dev-libs/redland[ssl]
 	media-libs/freetype:2
 	>=media-libs/fontconfig-2.8.0
-	>=media-libs/vigra-1.7
 	>=media-libs/libpng-1.5
 	net-print/cups
 	sci-mathematics/lpsolve
@ -111,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 "

 PDEPEND="
-	>=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
 "

 DEPEND="${COMMON_DEPEND}"
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0.ebuild
@ -0,0 +1,160 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.0.ebuild,v 1.1 2011/11/30 10:15:28 scarabeus Exp $
+
+EAPI=4
+
+[[ ${PV} == 9999 ]] && MY_PV="3.4.4" || MY_PV="3.4.4"
+
+RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
+BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm/"
+
+OO_EXTENSIONS=(
+	"472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
+	"53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
+	"4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
+	"a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
+	"09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
+	"b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
+)
+inherit rpm eutils versionator office-ext
+
+DESCRIPTION="Translations for the Libreoffice suite."
+HOMEPAGE="http://www.libreoffice.org"
+
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp templates"
+
+LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
+fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si
+sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
+LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
+ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
+st sw_TZ ta te th tn ts uz ve xh zu"
+
+for lang in ${LANGUAGES}; do
+	helppack=""
+	langpack=""
+	if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
+		[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+		helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
+	fi
+	[[ ${lang} == en ]] \
+		|| langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
+	SRC_URI+=" linguas_${lang}? (
+		${langpack}
+		${helppack}
+	)"
+	IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+# dictionaries
+SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
+nb nl nn pl pt ru sk sl sv tn zu"
+for X in ${SPELL_DICTS} ; do
+	SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+RDEPEND="${SPELL_DICTS_DEPEND}"
+unset X SPELL_DICTS SPELL_DICTS_DEPEND
+
+# no need for iuse here as this needs to be written out and is subset
+# of lignuas anyway
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+TDEPEND=""
+for i in ${OO_EXTENSIONS[@]}; do
+	lingua=${i/_*.oxt/}
+	lingua=${lingua/*Pack-/}
+	if [[ ${lingua} == en-US ]]; then
+		TDEPEND+=" ${EXT_URI}/${i}"
+	else
+		TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
+	fi
+done
+SRC_URI+=" templates? ( ${TDEPEND} )"
+unset i lingua TDEPEND EXT_URI
+
+# blockers for old libreoffice with bundled linguas
+RDEPEND+="
+	!=app-office/libreoffice-3.4.9999-r1
+	!=app-office/libreoffice-9999-r1
+	|| (
+		>=app-office/libreoffice-3.4.4.2-r1
+		>=app-office/libreoffice-bin-3.4.4.2-r1
+	)
+"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	local lang dir rpmdir i
+	local ooextused=()
+
+	for lang in ${LANGUAGES}; do
+		# break away if not enabled; paludis support
+		use_if_iuse linguas_${lang} || continue
+
+		dir=${lang/_/-}
+
+		# for english we provide just helppack, as translation is always there
+		if [[ ${lang} != en ]]; then
+			rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+			# First remove dictionaries, we want to use system ones.
+			rm -rf "${S}/${rpmdir}/"*dict*.rpm
+			rpm_unpack "./${rpmdir}/"*.rpm
+		fi
+		if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
+			[[ ${lang} == en ]] && dir="en-US"
+			rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+			rpm_unpack ./"${rpmdir}/"*.rpm
+		fi
+		if use templates; then
+			for i in ${OO_EXTENSIONS[@]}; do
+				lingua=${i/_*.oxt/}
+				lingua=${lingua/*Pack-/}
+				if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
+					if [[ ! -f "${S}/${i}" ]]; then
+						cp -v "${DISTDIR}/${i}" "${S}"
+						ooextused+=( "${i}" )
+					fi
+				fi
+			done
+		fi
+	done
+	OO_EXTENSIONS=()
+	for i in ${ooextused[@]}; do
+		OO_EXTENSIONS+=( ${i} )
+	done
+}
+
+src_prepare() { :; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
+	# Condition required for people that do not install anything eg no linguas
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
+		doins -r "${dir}"/*
+	fi
+
+	echo "${OO_EXTENSIONS[@]}"
+	office-ext_src_install
+}
+
+pkg_postinst() {
+	office-ext_pkg_postinst
+}
+pkg_prerm() {
+	office-ext_pkg_prerm
+}
--- a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild,v 1.2 2011/11/12 21:41:37 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild,v 1.3 2011/11/30 10:15:28 scarabeus Exp $

 EAPI=4

@ -144,12 +144,7 @@ src_install() {
 	# Condition required for people that do not install anything eg no linguas
 	# or just english with no offlinehelp.
 	if [[ -d "${dir}" ]] ; then
-		if [[ ${PV} == 9999 ]]; then
-			# starting with 3.5 this is in common dir
-			insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		else
-			insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
-		fi
+		insinto /usr/$(get_libdir)/${PN/-l10n/}/
 		doins -r "${dir}"/*
 	fi

--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -67,6 +67,7 @@ DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051d
 DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 RMD160 d5b50ff1bcb09efd7c1f4167f2d0d38065ba0166 SHA1 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 SHA256 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
 DIST dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip 89510 RMD160 a7dfb272393ba1698146cc7b170c256be11b6f25 SHA1 36ef214f64bab59ce7300f9af8ecff88a218874c SHA256 0f4cc8f5a1fb233f8101c86d5b118ef1c910c623e759da108cb729743deb1ff8
 DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175 RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8c46e02fadd5a01e6272f
+DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea SHA1 43a7ff11dd15370d456b20a093e1ee81279163a0 SHA256 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
 DIST extras-3.1.tar.bz2 130647 RMD160 dc9022051a589dbd810afa9b871472d27c9e80aa SHA1 c4e9c3ed2502c584f1b6e4b7d650afc8c33fccb6 SHA256 6691d40911bf1b1ef7832a5b320e2ab383a79e463ef0dad9b13eb7a5e74c8b1d
 DIST f3e2febd267c8e4b13df00dac211dd6d-flute.zip 83503 RMD160 c73b7919ee73d248d11d433f036b3232e1d151f8 SHA1 76830de4f64998e68c0d03a4c02177c6dfebbfb1 SHA256 13968a9ade310ee464be04380fecbeb2f591a3a462e4048ad1ebc4dae65538f5
@ -81,6 +82,7 @@ DIST libreoffice-artwork-3.4.4.2.tar.bz2 13539032 RMD160 e16be6bca3824198cbc6636
 DIST libreoffice-base-3.3.4.1.tar.bz2 2083238 RMD160 a0ea708e67d47d010c7e390b373c78d93eda6e9f SHA1 d5b0d91a6a9fe17930b587c5e42309f52d09095f SHA256 029c2cde055ff2b8e3432f292c565dba6fd1e023cdd39fc9478635cedf006d1e
 DIST libreoffice-base-3.4.3.2.tar.bz2 2068714 RMD160 c689762bd2a5a6bc46efe701c85b798bd01ef248 SHA1 88f1531b11ac49f8bd9c0e70e08b38a7b0aae411 SHA256 93fc103b376a2575efe8b35d64861236e63025b9d3415cee35d845ada7589dfa
 DIST libreoffice-base-3.4.4.2.tar.bz2 2069793 RMD160 83ea70980d99e1d706bd2f37ad6cccfd9f5e2453 SHA1 00d6f941b379925814266ffa1d4b015ccf1d8292 SHA256 92dab1cb9efe2c023a3f9648e0a5eb52c00bb75376a5341c10fc52a4184cdc2c
+DIST libreoffice-binfilter-3.5.0.0.tar.bz2 6479587 RMD160 e291aa88cd5638d0c61f66b5dca26d46261aed55 SHA1 c2968f97efbd88f9d718d0ff5c9176d21b95f641 SHA256 19f4854e27282ab79d5fbe831e193c5f3d947670db005b8f24e922146aabec94
 DIST libreoffice-bootstrap-3.3.4.1.tar.bz2 2753537 RMD160 6348b4b121159aa74a1b4e9c03f34cc5533a3d72 SHA1 4c7b5b105c29eb5e9dafc8ee59b4f306187f664d SHA256 a83cc7be2211c1dd03f49e1e9c54895852e732e291022c8022470cd057b9b2c6
 DIST libreoffice-bootstrap-3.4.3.2.tar.bz2 2711992 RMD160 5ded24c90e34306a0ae0d5d97578638098879351 SHA1 527db77912dd3c5f41916ad0db8405325f37c621 SHA256 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45
 DIST libreoffice-bootstrap-3.4.4.2.tar.bz2 2715038 RMD160 78955bd82577d2b1a5342b7f30d0541a9d22b4c8 SHA1 3062bb92ae60db0ea333805b3592b2da45329680 SHA256 7e4477795b535656b1f8853a439e74d91a035ff8958d307cbb42c38f209fb548
@ -92,6 +94,7 @@ DIST libreoffice-calc-3.4.4.2.tar.bz2 9513923 RMD160 697ed0b1020eb2c63603bf19d56
 DIST libreoffice-components-3.3.4.1.tar.bz2 5124325 RMD160 bbd98b77d4b9db5d948526d65f54e3479a9b33a3 SHA1 9ca1d2ad9211cf7df0834f764af28c8e88060f0f SHA256 bb9651370ee239a6fe0f4b52d5b6d3b84aafad64dcf1ccfcb655efb782599fb6
 DIST libreoffice-components-3.4.3.2.tar.bz2 5094591 RMD160 ab3a2cd16340931a124e3d0e783c938a5357f5f9 SHA1 492a0b25128a34c4d75df5ef7b3b5e997c24cf31 SHA256 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7
 DIST libreoffice-components-3.4.4.2.tar.bz2 5095697 RMD160 00b8b3ef13d1c81d60368a7d428a53cb635b4e44 SHA1 36db0c37bb32a52ecc727abbc348b719fe40cdf7 SHA256 d06141b0e078b609406b82db64599618bb7b93efa7841034f4a6cf441a0b442b
+DIST libreoffice-core-3.5.0.0.tar.bz2 211983688 RMD160 12db29b2d771ca2310f702a09c011c1833efcff4 SHA1 6dae76bcac7601c77c9988664772b0be807c8cbd SHA256 0585388cd1f5491d6f154b6fba08d2a0e18197b3d37d1c28a905f0f8bb361e03
 DIST libreoffice-extensions-3.3.4.1.tar.bz2 4202033 RMD160 1db3d06fcfd6354345e394ddf78f2cae6e0e5573 SHA1 8fbac20fa87e348ad07dc245f48f09ee539d7d80 SHA256 65c4540bd958a5f4dbf5875659d83e40a3d5542aa0cfde7f0f03e5000d16f241
 DIST libreoffice-extensions-3.4.3.2.tar.bz2 4216448 RMD160 07932f5fa49cf32a0efda440cdb074c6ade97f35 SHA1 ca3257362b8b861e7358afe11bc0831739c83f41 SHA256 91ab0d29057c09026ddb380d530ef0656e48b7c558eb2be7a0c4c4f1b793029d
 DIST libreoffice-extensions-3.4.4.2.tar.bz2 4219139 RMD160 43833d5d01d85b7ea0f3039e327fde8a4b7f76d4 SHA1 8eb5895ba78ed13bed144fcef5933f36d38d3fcd SHA256 ff07833ecb59a15cd3aa1e0c74e59fb985e5aae9d7285679e25ed96bbc3fefed
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.15 2011/11/02 12:58:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.16 2011/11/30 10:21:52 scarabeus Exp $

 EAPI=3

@ -181,7 +181,7 @@ RDEPEND="${COMMON_DEPEND}
 "

 PDEPEND="
-	>=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
 "

 DEPEND="${COMMON_DEPEND}
--- a/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.3 2011/11/13 10:21:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2-r1.ebuild,v 1.4 2011/11/30 10:21:52 scarabeus Exp $

 EAPI=4

@ -158,7 +158,7 @@ RDEPEND="${COMMON_DEPEND}
 "

 PDEPEND="
-	>=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
 "

 DEPEND="${COMMON_DEPEND}
--- a/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild,v 1.3 2011/11/19 13:53:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r2.ebuild,v 1.4 2011/11/30 10:21:52 scarabeus Exp $

 EAPI=4

@ -141,7 +141,7 @@ RDEPEND="${COMMON_DEPEND}
 "

 PDEPEND="
-	>=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*
 "

 DEPEND="${COMMON_DEPEND}
--- a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
@ -0,0 +1,500 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.2 2011/11/30 10:29:23 scarabeus Exp $
+
+EAPI=4
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+	http://dev-builds.libreoffice.org/pre-releases/src
+	http://download.documentfoundation.org/libreoffice/src
+	http://download.documentfoundation.org/libreoffice/old/src
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+MODULES="core binfilter"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]]; then
+				SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.bz2 )"
+			else
+				SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
+			fi
+		done
+		unset mod
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
+ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
+jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
+webdav +xmlsec"
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+NSS_DEPEND="
+	>=dev-libs/nspr-4.8.8
+	>=dev-libs/nss-3.12.9
+"
+
+COMMON_DEPEND="
+	app-arch/zip
+	app-arch/unzip
+	>=app-text/hunspell-1.3.2-r3
+	app-text/mythes
+	>=app-text/libexttextcat-3.2
+	app-text/libwpd:0.9[tools]
+	app-text/libwpg:0.2
+	>=app-text/libwps-0.2.2
+	dev-cpp/libcmis
+	dev-db/unixODBC
+	dev-libs/expat
+	>=dev-libs/glib-2.28
+	>=dev-libs/hyphen-2.7.1
+	>=dev-libs/icu-4.8.1-r1
+	>=dev-lang/perl-5.0
+	>=dev-libs/openssl-1.0.0d
+	>=dev-libs/redland-1.0.14[ssl]
+	>=media-libs/fontconfig-2.8.0
+	media-libs/freetype:2
+	>=media-libs/libpng-1.4
+	media-libs/libvisio
+	net-print/cups
+	sci-mathematics/lpsolve
+	>=sys-libs/db-4.8
+	virtual/jpeg
+	>=x11-libs/cairo-1.10.0
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	dbus? ( >=dev-libs/dbus-glib-0.92 )
+	eds? ( gnome-extra/evolution-data-server )
+	gnome? (
+		gnome-base/gconf:2
+		gnome-base/orbit
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/gtk+-3.2:3
+	)
+	graphite? ( media-gfx/graphite2 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10
+	)
+	java? (
+		>=dev-java/bsh-2.0_beta4
+		dev-java/lucene:2.9
+		dev-java/lucene-analyzers:2.3
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+	opengl? ( virtual/opengl )
+	pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] )
+	postgres? ( >=dev-db/postgresql-base-8.4.0 )
+	svg? ( gnome-base/librsvg )
+	webdav? ( net-libs/neon )
+	xmlsec? ( ${NSS_DEPEND} )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/openoffice-bin
+	!app-office/openoffice
+	media-fonts/libertine-ttf
+	media-fonts/liberation-fonts
+	java? ( >=virtual/jre-1.6 )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
+"
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.46
+	>=dev-libs/libxml2-2.7.8
+	dev-libs/libxslt
+	dev-perl/Archive-Zip
+	dev-util/cppunit
+	>=dev-util/gperf-3
+	dev-util/intltool
+	dev-util/mdds
+	>=dev-util/pkgconfig-0.26
+	media-libs/sampleicc
+	>=net-misc/curl-7.21.4
+	net-misc/npapi-sdk
+	>=sys-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	sys-devel/flex
+	sys-devel/gettext
+	>=sys-devel/make-3.82
+	sys-libs/zlib
+	x11-libs/libXtst
+	x11-proto/randrproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	java? (
+		=virtual/jdk-1.6*
+		>=dev-java/ant-core-1.7
+		test? ( dev-java/junit:4 )
+	)
+"
+
+PATCHES=(
+)
+
+REQUIRED_USE="
+	nsplugin? ( gtk )
+	gnome? ( gtk )
+	eds? ( gnome )
+"
+
+S="${WORKDIR}/${PN}-core-${PV}"
+
+pkg_pretend() {
+	local pgslot
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		CHECKREQS_MEMORY="1G"
+		use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+		check-reqs_pkg_pretend
+
+		if [[ $(gcc-major-version) -lt 4 ]]; then
+			eerror "Compilation with gcc older than 4.0 is not supported"
+			die "Too old gcc found."
+		fi
+	fi
+
+	# ensure pg version
+	if use postgres; then
+		 pgslot=$(postgresql-config show)
+		 if [[ ${pgslot//.} < 84 ]] ; then
+		 	eerror "PostgreSQL slot must be set to 8.4 or higher."
+			eerror "    postgresql-config set 8.4"
+			die "PostgreSQL slot is not set to 8.4 or higher."
+		 fi
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	kde4-base_pkg_setup
+
+	python_set_active_version 2
+	python_pkg_setup
+
+	if ! use gtk; then
+		ewarn "If you want the LibreOffice systray quickstarter to work"
+		ewarn "activate the 'gtk' use flag."
+		ewarn
+	fi
+}
+
+src_unpack() {
+	local mod dest tmplfile tmplname mypv
+
+	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+	if use branding; then
+		unpack "${BRANDING}"
+	fi
+
+	if [[ ${PV} != *9999* ]]; then
+		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]] && ! use binfilter; then
+				continue
+			fi
+			unpack "${PN}-${mod}-${PV}.tar.bz2"
+			if [[ ${mod} != core ]]; then
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+	else
+		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]] && ! use binfilter; then
+				continue
+			fi
+			mypv=${PV/.9999}
+			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+			EGIT_PROJECT="${PN}/${mod}"
+			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+			EGIT_NOUNPACK="true"
+			git-2_src_unpack
+			if [[ ${mod} != core ]]; then
+				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
+				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+			fi
+		done
+		unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
+	fi
+}
+
+src_prepare() {
+	# optimization flags
+	export ARCH_FLAGS="${CXXFLAGS}"
+	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
+
+	# patchset
+	if [[ -n ${PATCHSET} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	base_src_prepare
+	eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+}
+
+src_configure() {
+	local java_opts
+	local internal_libs
+	local themes="default"
+	local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
+
+	# recheck that there is some value in jobs
+	[[ -z ${jbs} ]] && jbs="1"
+
+	# expand themes we are going to build based on DE useflags
+	use gnome && themes+=" tango"
+	use kde && themes+=" oxygen"
+
+	# sane: just sane.h header that is used for scan in writer, not
+	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
+	internal_libs+="
+		--without-system-sane
+		--without-system-vigra
+	"
+
+	if use java; then
+		# hsqldb: system one is too new
+		# saxon: system one does not work properly
+		java_opts="
+			--without-system-hsqldb
+			--without-system-saxon
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-java-target-version=$(java-pkg_get-target)
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
+			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+		"
+		if use test; then
+			java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
+		else
+			java_opts+=" --without-junit"
+		fi
+	fi
+
+	if use branding; then
+		internal_libs+="
+			--with-about-bitmap="${WORKDIR}/branding-about.png"
+			--with-intro-bitmap="${WORKDIR}/branding-intro.png"
+		"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --disable-gnome-vfs: old gnome virtual fs support
+	# --disable-kdeab: kde3 adressbook
+	# --disable-kde: kde3 support
+	# --disable-ldap: ldap requires internal mozilla stuff, same like mozab
+	# --disable-mozilla: disable mozilla build that is used for adresbook, not
+	#   affecting the nsplugin that is always ON
+	# --disable-pch: precompiled headers cause build crashes
+	# --disable-rpath: relative runtime path is not desired
+	# --disable-static-gtk: ensure that gtk is linked dynamically
+	# --disable-ugly: disable ugly pieces of code
+	# --disable-zenity: disable build icon
+	# --enable-extension-integration: enable any extension integration support
+	# --with-{max-jobs,num-cpus}: ensuring parallel building
+	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --without-stlport: disable deprecated extensions framework
+	# --disable-ext-report-builder: too much java packages pulled in
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-headers \
+		--with-system-libs \
+		--with-system-jars \
+		--with-system-dicts \
+		--enable-cairo-canvas \
+		--enable-largefile \
+		--enable-python=system \
+		--enable-randr \
+		--enable-randr-link \
+		--enable-release-build \
+		--enable-unix-qstart-libpng \
+		--disable-crashdump \
+		--disable-dependency-tracking \
+		--disable-epm \
+		--disable-fetch-external \
+		--disable-gnome-vfs \
+		--disable-ext-report-builder \
+		--disable-kdeab \
+		--disable-kde \
+		--disable-ldap \
+		--disable-mozilla \
+		--disable-online-update \
+		--disable-pch \
+		--disable-rpath \
+		--disable-static-gtk \
+		--disable-strip-solver \
+		--disable-ugly \
+		--disable-zenity \
+		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+		--with-build-version="Gentoo official package" \
+		--enable-extension-integration \
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+		--with-external-tar="${DISTDIR}" \
+		--with-lang="" \
+		--with-max-jobs=${jbs} \
+		--with-num-cpus=${jbs} \
+		--with-theme="${themes}" \
+		--with-unix-wrapper=libreoffice \
+		--with-vendor="Gentoo Foundation" \
+		--with-x \
+		--without-afms \
+		--without-fonts \
+		--without-myspell-dicts \
+		--without-ppds \
+		--without-stlport \
+		--without-system-mozilla \
+		--without-help \
+		--without-helppack-integration \
+		--without-sun-templates \
+		$(use_enable binfilter) \
+		$(use_enable dbus) \
+		$(use_enable debug crashdump) \
+		$(use_enable eds evolution2) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome gio) \
+		$(use_enable gnome lockdown) \
+		$(use_enable graphite) \
+		$(use_enable gstreamer) \
+		$(use_enable gtk) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk systray) \
+		$(use_enable java ext-scripting-beanshell) \
+		$(use_enable kde kde4) \
+		$(use_enable mysql ext-mysql-connector) \
+		$(use_enable nsplugin) \
+		$(use_enable odk) \
+		$(use_enable opengl) \
+		$(use_enable pdfimport ext-pdfimport) \
+		$(use_enable postgres ext-postgresql-sdbc) \
+		$(use_enable svg librsvg system) \
+		$(use_enable test linkoo) \
+		$(use_enable vba) \
+		$(use_enable vba activex-component) \
+		$(use_enable webdav neon) \
+		$(use_enable xmlsec) \
+		$(use_with java) \
+		$(use_with mysql system-mysql-cppconn) \
+		${internal_libs} \
+		${java_opts}
+}
+
+src_compile() {
+	# this is not a proper make script and the jobs are passed during configure
+	make build || die
+}
+
+src_test() {
+	make check || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# Fix bash completion placement
+	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	rm -rf "${ED}"/etc/
+
+	# symlink the nsplugin to system location
+	if use nsplugin; then
+		inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
+	fi
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+	fi
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.8 2011/11/23 16:16:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.10 2011/11/30 10:29:23 scarabeus Exp $

 EAPI=4

@ -56,6 +56,7 @@ unset DEV_URI
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
 ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
@ -150,7 +151,7 @@ RDEPEND="${COMMON_DEPEND}
 "

 PDEPEND="
-	>=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+	=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
 "

 # FIXME: cppunit should be moved to test conditional
@ -167,7 +168,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/mdds
 	>=dev-util/pkgconfig-0.26
 	media-libs/sampleicc
-	>=media-libs/vigra-1.7
 	>=net-misc/curl-7.21.4
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
@ -249,6 +249,9 @@ src_unpack() {

 	if [[ ${PV} != *9999* ]]; then
 		for mod in ${MODULES}; do
+			if [[ ${mod} == binfilter ]] && ! use binfilter; then
+				continue
+			fi
 			unpack "${PN}-${mod}-${PV}.tar.bz2"
 			if [[ ${mod} != core ]]; then
 				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
@ -310,8 +313,12 @@ src_configure() {

 	# sane: just sane.h header that is used for scan in writer, not
 	#       linked or anything else, worthless to depend on
+	# vigra: just uses templates from there
+	#        it is serious pain in the ass for packaging
+	#        should be replaced by boost::gil if someone interested
 	internal_libs+="
 		--without-system-sane
+		--without-system-vigra
 	"

 	if use java; then
@ -343,8 +350,6 @@ src_configure() {
 	fi

 	# system headers/libs/...: enforce using system packages
-	#   only expections are mozilla and odbc/sane/xrender-header(s).
-	#   for jars the exception is db.jar controlled by --with-system-db
 	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required
 	# --enable-*-link: link to the library rather than just dlopen on runtime
--- a/dev-cpp/libcmis/libcmis-0.1.0.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.1.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.1.0.ebuild,v 1.2 2011/10/03 13:33:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libcmis/libcmis-0.1.0.ebuild,v 1.3 2011/11/30 12:34:43 xarthisius Exp $

 EAPI=4

@ -15,7 +15,7 @@ HOMEPAGE="http://gitorious.org/libcmis"

 LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"

 RDEPEND="
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@ -1,6 +1,3 @@
-DIST redis-2.2.11.tar.gz 450839 RMD160 b5c1802395a0c375e5e9c0702e7086b83989d0ed SHA1 ba4b513c5bf7a28b2e50bbd1ca51bb7962e5685c SHA256 a94c1dd2573e19f1abd335507d5ea280753b092ddf16d014dcd3212f5a5bc0eb
 DIST redis-2.2.12.tar.gz 455240 RMD160 8bf1275fd1d2ad1536ce7081bdf3522d5e92a8d3 SHA1 66d44756e0f3371d9e37b521f5cc17e12e1efba3 SHA256 9e2a4133b920fc4eed731c9cd3a9d0b60e701179ea98b2944ab434e7b1d0db03
-DIST redis-2.2.2.tar.gz 446269 RMD160 a7a21ab6aa07f79e5cdeb991a26dd1d55446e38e SHA1 75b953e4a3067570555c5f3f5e8f481c40489904 SHA256 4c5ff589ec80bf019ebebcf5fb5187939d7e50c34fa9f8a0511e40825a3ec235
-DIST redis-2.2.6.tar.gz 447913 RMD160 76ddcd22ba31a7a9dd8a2fb7b465330c933a15c7 SHA1 dd5a5a443327da09483701c48b7ea87e5d160c69 SHA256 64ab9ec01792c50344b030e19dfc2453ff76822cf5845eb6da5654bc1ea09477
-DIST redis-2.2.8.tar.gz 448877 RMD160 91c95512ecd2b83834bbe4ebd562ae7fc4699599 SHA1 30fb67ed71c179a7294d06d2c83c9b074a98fb79 SHA256 d438fde47fd8a34d8b135744a4264214274e57bc7f132d0cf4ee4e98a6551bb3
 DIST redis-2.4.3.tar.gz 603463 RMD160 1da0661f5d22f046547f2aa9f93d921bd2a50852 SHA1 d917e721a11e38969d92070e9c6476598c6e4621 SHA256 4e0f39968776819a942d1502626ac6072a28e1b148a25f662d80bbcb54d5ba4c
+DIST redis-2.4.4.tar.gz 607718 RMD160 5b9e1e48216c11b3eca76ad0eafee3d7a0df0c68 SHA1 bc1e383c0216fe5bd5dc47eab39b43bbb9d5f8a5 SHA256 8cb779758315b89969adb588c813bf980e32a760d4204209d90d605dcbc5f708
--- a/dev-db/redis/files/redis-2.4.4-tcmalloc.patch
+++ b/dev-db/redis/files/redis-2.4.4-tcmalloc.patch
@ -0,0 +1,21 @@
+https://github.com/antirez/redis/pull/218
+
+diff --git a/src/Makefile b/src/Makefile
+index 72edcad..3e43990 100644
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -35,12 +35,14 @@ else
+ endif
+ 
+ ifeq ($(USE_TCMALLOC),yes)
+  USE_JEMALLOC=no
+   ALLOC_DEP=
+   ALLOC_LINK=-ltcmalloc
+   ALLOC_FLAGS=-DUSE_TCMALLOC
+ endif
+ 
+ ifeq ($(USE_TCMALLOC_MINIMAL),yes)
+  USE_JEMALLOC=no
+   ALLOC_DEP=
+   ALLOC_LINK=-ltcmalloc_minimal
+   ALLOC_FLAGS=-DUSE_TCMALLOC
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@ -15,5 +15,8 @@
      Use the <pkg>dev-util/google-perftools</pkg> libraries to
      replace the malloc() implementation with a possibly faster one.
    </flag>
+    <flag name="jemalloc">
+      Use <pkg>dev-libs/jemalloc</pkg> for allocations.
+    </flag>
  </use>
 </pkgmetadata>
--- a/dev-db/redis/redis-2.2.2.ebuild
+++ b/dev-db/redis/redis-2.2.2.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.2.2.ebuild,v 1.5 2011/11/02 21:40:35 vapier Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A persistent caching system, key-value and data structures database."
-HOMEPAGE="http://code.google.com/p/redis/"
-SRC_URI="http://redis.googlecode.com/files/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~x86-macos ~x86-solaris"
-IUSE="tcmalloc test"
-SLOT="0"
-
-RDEPEND=""
-DEPEND=">=sys-devel/autoconf-2.63
-	tcmalloc? ( dev-util/google-perftools )
-	test? ( dev-lang/tcl )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-REDIS_PIDDIR=/var/run/redis/
-REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
-REDIS_DATAPATH=/var/lib/redis
-REDIS_LOGPATH=/var/log/redis
-REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 ${REDIS_DATAPATH} redis
-	# set tcmalloc-variable for the build as specified in
-	# https://github.com/antirez/redis/blob/2.2/README. If build system gets
-	# better integrated into autotools, replace with append-flags and
-	# append-ldflags in src_configure()
-	use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
-}
-
-src_prepare() {
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
-	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoconf
-}
-
-src_install() {
-	# configuration file rewrites
-	insinto /etc/
-	sed -r \
-		-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \
-		-e '/^daemonize\>/s,no,yes,' \
-		-e '/^# bind/s,^# ,,' \
-		-e '/^# maxmemory\>/s,^# ,,' \
-		-e '/^maxmemory\>/s,<bytes>,67108864,' \
-		-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \
-		-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \
-		-e '/^loglevel\>/s:debug:notice:' \
-		-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
-		<redis.conf \
-		>redis.conf.gentoo
-	newins redis.conf.gentoo redis.conf
-	use prefix || fowners redis:redis /etc/redis.conf
-	fperms 0644 /etc/redis.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd" redis
-
-	dodoc 00-RELEASENOTES BUGS Changelog CONTRIBUTING README TODO
-	dodoc design-documents/*
-	newdoc client-libraries/README README.client-libraries
-	docinto html
-	dodoc doc/*
-
-	dobin src/redis-cli || die "redis-cli could not be found"
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump \
-	|| die "some redis executables could not be found"
-	fperms 0750 /usr/sbin/redis-benchmark
-
-	if use prefix; then
-	        diropts -m0750
-	else
-	        diropts -m0750 -o redis -g redis
-	fi
-	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
-}
-
-pkg_postinst() {
-	einfo "New features of Redis you want to consider enabling in redis.conf:"
-	einfo " * unix sockets (using this is highly recommended)"
-	einfo " * logging to syslog"
-	einfo " * VM aka redis' own swap mechanism"
-}
--- a/dev-db/redis/redis-2.2.6.ebuild
+++ b/dev-db/redis/redis-2.2.6.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.2.6.ebuild,v 1.4 2011/11/02 21:40:35 vapier Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A persistent caching system, key-value and data structures database."
-HOMEPAGE="http://code.google.com/p/redis/"
-SRC_URI="http://redis.googlecode.com/files/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~x86-macos ~x86-solaris"
-IUSE="tcmalloc test"
-SLOT="0"
-
-RDEPEND=""
-DEPEND=">=sys-devel/autoconf-2.63
-	tcmalloc? ( dev-util/google-perftools )
-	test? ( dev-lang/tcl )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-REDIS_PIDDIR=/var/run/redis/
-REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
-REDIS_DATAPATH=/var/lib/redis
-REDIS_LOGPATH=/var/log/redis
-REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 ${REDIS_DATAPATH} redis
-	# set tcmalloc-variable for the build as specified in
-	# https://github.com/antirez/redis/blob/2.2/README. If build system gets
-	# better integrated into autotools, replace with append-flags and
-	# append-ldflags in src_configure()
-	use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
-}
-
-src_prepare() {
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
-	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoconf
-}
-
-src_install() {
-	# configuration file rewrites
-	insinto /etc/
-	sed -r \
-		-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \
-		-e '/^daemonize\>/s,no,yes,' \
-		-e '/^# bind/s,^# ,,' \
-		-e '/^# maxmemory\>/s,^# ,,' \
-		-e '/^maxmemory\>/s,<bytes>,67108864,' \
-		-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \
-		-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \
-		-e '/^loglevel\>/s:debug:notice:' \
-		-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
-		<redis.conf \
-		>redis.conf.gentoo
-	newins redis.conf.gentoo redis.conf
-	use prefix || fowners redis:redis /etc/redis.conf
-	fperms 0644 /etc/redis.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd" redis
-
-	dodoc 00-RELEASENOTES BUGS Changelog CONTRIBUTING README TODO
-	dodoc design-documents/*
-	newdoc client-libraries/README README.client-libraries
-	docinto html
-	dodoc doc/*
-
-	dobin src/redis-cli || die "redis-cli could not be found"
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump \
-	|| die "some redis executables could not be found"
-	fperms 0750 /usr/sbin/redis-benchmark
-
-	if use prefix; then
-	        diropts -m0750
-	else
-	        diropts -m0750 -o redis -g redis
-	fi
-	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
-}
-
-pkg_postinst() {
-	einfo "New features of Redis you want to consider enabling in redis.conf:"
-	einfo " * unix sockets (using this is highly recommended)"
-	einfo " * logging to syslog"
-	einfo " * VM aka redis' own swap mechanism"
-}
--- a/dev-db/redis/redis-2.2.8.ebuild
+++ b/dev-db/redis/redis-2.2.8.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.2.8.ebuild,v 1.2 2011/11/02 21:40:35 vapier Exp $
-
-EAPI="2"
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A persistent caching system, key-value and data structures database."
-HOMEPAGE="http://code.google.com/p/redis/"
-SRC_URI="http://redis.googlecode.com/files/${PN}-${PV/_/-}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
-IUSE="tcmalloc test"
-SLOT="0"
-
-RDEPEND=""
-DEPEND=">=sys-devel/autoconf-2.63
-	tcmalloc? ( dev-util/google-perftools )
-	test? ( dev-lang/tcl )
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${PV/_/-}"
-
-REDIS_PIDDIR=/var/run/redis/
-REDIS_PIDFILE=${REDIS_PIDDIR}/redis.pid
-REDIS_DATAPATH=/var/lib/redis
-REDIS_LOGPATH=/var/log/redis
-REDIS_LOGFILE=${REDIS_LOGPATH}/redis.log
-
-pkg_setup() {
-	enewgroup redis 75
-	enewuser redis 75 -1 ${REDIS_DATAPATH} redis
-	# set tcmalloc-variable for the build as specified in
-	# https://github.com/antirez/redis/blob/2.2/README. If build system gets
-	# better integrated into autotools, replace with append-flags and
-	# append-ldflags in src_configure()
-	use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
-}
-
-src_prepare() {
-	# now we will rewrite present Makefiles
-	local makefiles=""
-	for MKF in $(find -name 'Makefile' | cut -b 3-); do
-		mv "${MKF}" "${MKF}.in"
-		sed -i	-e 's:$(CC):@CC@:g' \
-			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-			-e 's: $(DEBUG)::g' \
-			-e 's:$(OBJARCH)::g' \
-			-e 's:ARCH:TARCH:g' \
-			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
-			"${MKF}.in" \
-		|| die "Sed failed for ${MKF}"
-		makefiles+=" ${MKF}"
-	done
-	# autodetection of compiler and settings; generates the modified Makefiles
-	cp "${FILESDIR}"/configure.ac-2.2 configure.ac
-	sed -i	-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-		configure.ac || die "Sed failed for configure.ac"
-	eautoconf
-}
-
-src_install() {
-	# configuration file rewrites
-	insinto /etc/
-	sed -r \
-		-e "/^pidfile\>/s,/var.*,${REDIS_PIDFILE}," \
-		-e '/^daemonize\>/s,no,yes,' \
-		-e '/^# bind/s,^# ,,' \
-		-e '/^# maxmemory\>/s,^# ,,' \
-		-e '/^maxmemory\>/s,<bytes>,67108864,' \
-		-e "/^dbfilename\>/s,dump.rdb,${REDIS_DATAPATH}/dump.rdb," \
-		-e "/^dir\>/s, .*, ${REDIS_DATAPATH}/," \
-		-e '/^loglevel\>/s:debug:notice:' \
-		-e "/^logfile\>/s:stdout:${REDIS_LOGFILE}:" \
-		<redis.conf \
-		>redis.conf.gentoo
-	newins redis.conf.gentoo redis.conf
-	use prefix || fowners redis:redis /etc/redis.conf
-	fperms 0644 /etc/redis.conf
-
-	newconfd "${FILESDIR}/redis.confd" redis
-	newinitd "${FILESDIR}/redis.initd" redis
-
-	dodoc 00-RELEASENOTES BUGS Changelog CONTRIBUTING README TODO
-	dodoc design-documents/*
-	newdoc client-libraries/README README.client-libraries
-	docinto html
-	dodoc doc/*
-
-	dobin src/redis-cli || die "redis-cli could not be found"
-	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump \
-	|| die "some redis executables could not be found"
-	fperms 0750 /usr/sbin/redis-benchmark
-
-	if use prefix; then
-	        diropts -m0750
-	else
-	        diropts -m0750 -o redis -g redis
-	fi
-	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
-}
-
-pkg_postinst() {
-	einfo "New features of Redis you want to consider enabling in redis.conf:"
-	einfo " * unix sockets (using this is highly recommended)"
-	einfo " * logging to syslog"
-	einfo " * VM aka redis' own swap mechanism"
-}
--- a/dev-db/redis/redis-2.2.11.ebuild
+++ b/dev-db/redis/redis-2.2.11.ebuild
@ -1,25 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.2.11.ebuild,v 1.2 2011/11/02 21:40:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.4.4.ebuild,v 1.1 2011/11/30 12:09:36 djc Exp $

-EAPI="2"
+EAPI="4"

 inherit autotools eutils flag-o-matic

 DESCRIPTION="A persistent caching system, key-value and data structures database."
-HOMEPAGE="http://code.google.com/p/redis/"
-SRC_URI="http://redis.googlecode.com/files/${PN}-${PV/_/-}.tar.gz"
+HOMEPAGE="http://redis.io/"
+SRC_URI="http://redis.googlecode.com/files/${P}.tar.gz"

 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~x86-macos ~x86-solaris"
-IUSE="doc tcmalloc test"
+IUSE="+jemalloc tcmalloc test"
 SLOT="0"

 RDEPEND=""
 DEPEND=">=sys-devel/autoconf-2.63
 	tcmalloc? ( dev-util/google-perftools )
+	jemalloc? ( dev-libs/jemalloc )
 	test? ( dev-lang/tcl )
 	${RDEPEND}"
+REQUIRED_USE="tcmalloc? ( !jemalloc )
+	jemalloc? ( !tcmalloc )"

 S="${WORKDIR}/${PN}-${PV/_/-}"

@ -36,10 +39,21 @@ pkg_setup() {
 	# https://github.com/antirez/redis/blob/2.2/README. If build system gets
 	# better integrated into autotools, replace with append-flags and
 	# append-ldflags in src_configure()
-	use tcmalloc && export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
+	if use tcmalloc ; then
+		export EXTRA_EMAKE="${EXTRA_EMAKE} USE_TCMALLOC=yes"
+	elif use jemalloc ; then
+		export EXTRA_EMAKE="${EXTRA_EMAKE} JEMALLOC_SHARED=yes"
+	else
+		export EXTRA_EMAKE="${EXTRA_EMAKE} FORCE_LIBC_MALLOC=yes"
+	fi
 }

 src_prepare() {
+	epatch "${FILESDIR}/redis-2.4.3-shared.patch"
+	epatch "${FILESDIR}/${P}-tcmalloc.patch"
+	if use jemalloc ; then
+		sed -i -e "s/je_/j/" src/zmalloc.c
+	fi
 	# now we will rewrite present Makefiles
 	local makefiles=""
 	for MKF in $(find -name 'Makefile' | cut -b 3-); do
@ -83,13 +97,7 @@ src_install() {
 	newconfd "${FILESDIR}/redis.confd" redis
 	newinitd "${FILESDIR}/redis.initd" redis

-	dodoc 00-RELEASENOTES BUGS Changelog CONTRIBUTING README TODO
-	if use doc; then
-		dodoc design-documents/*
-		newdoc client-libraries/README README.client-libraries
-		docinto html
-		dodoc doc/*
-	fi
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING README TODO

 	dobin src/redis-cli || die "redis-cli could not be found"
 	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-dump \
@ -103,10 +111,3 @@ src_install() {
 	fi
 	keepdir ${REDIS_DATAPATH} ${REDIS_LOGPATH} ${REDIS_PIDDIR}
 }
-
-pkg_postinst() {
-	einfo "New features of Redis you want to consider enabling in redis.conf:"
-	einfo " * unix sockets (using this is highly recommended)"
-	einfo " * logging to syslog"
-	einfo " * VM aka redis' own swap mechanism"
-}
--- a/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild,v 1.1 2011/01/26 14:35:39 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.8.3.ebuild,v 1.2 2011/11/30 12:10:59 grobian Exp $

 EAPI="4"
 JAVA_PKG_IUSE="doc source test"
@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 COMMON_DEP="
--- a/dev-java/commons-cli/commons-cli-1.2.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.2.ebuild,v 1.7 2010/01/15 20:23:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.2.ebuild,v 1.8 2011/11/30 12:12:03 grobian Exp $

 # Upstream switched to Maven as a build system. Current build.xml file was generated by running mvn ant:ant
 # A bit of tweaking was required unfortunately
@ -17,7 +17,7 @@ SRC_URI="mirror://apache/commons/cli/source/${MY_P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""

 RESTRICT=""
--- a/dev-java/commons-collections/commons-collections-3.2.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.2.1.ebuild,v 1.9 2010/03/20 13:07:46 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.2.1.ebuild,v 1.10 2011/11/30 12:09:47 grobian Exp $

 JAVA_PKG_IUSE="doc source test"

@ -12,7 +12,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test-framework"

 COMMON_DEP="test-framework? ( =dev-java/junit-3.8* )"
--- a/dev-java/guava/guava-07.ebuild
+++ b/dev-java/guava/guava-07.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-07.ebuild,v 1.2 2011/11/15 20:01:07 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guava/guava-07.ebuild,v 1.3 2011/11/30 12:00:35 grobian Exp $

 EAPI="4"

@ -15,7 +15,7 @@ SRC_URI="http://guava-libraries.googlecode.com/files/${MY_P}.zip"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 COMMON_DEP="
--- a/dev-java/jsr305/jsr305-1.0-r1.ebuild
+++ b/dev-java/jsr305/jsr305-1.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr305/jsr305-1.0-r1.ebuild,v 1.3 2011/01/25 05:01:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr305/jsr305-1.0-r1.ebuild,v 1.4 2011/11/30 11:59:31 grobian Exp $

 EAPI=2

@ -14,7 +14,7 @@ HOMEPAGE="http://code.google.com/p/jsr-305/"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 DEPEND=">=virtual/jdk-1.5
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@ -1,2 +1,3 @@
 DIST camlp5-5.14.tgz 685253 RMD160 0643a1fcf78d4848fd7090d105911dc43990eb66 SHA1 cae1cb1dfa506f640393c28d9b510a03f947ef9d SHA256 1b45413a3477ef6143ace5185122c162b765d86c6d963ab8bd2b771feda3baa5
+DIST camlp5-6.02.3-patch-1.patch 38948 RMD160 e795fe6ddcc1e47e1ae71737c0ecd6039bd21c67 SHA1 4f9f0c50535248f41b8ff9ca4fd31712f0ae292e SHA256 fb709455672dbdab4e8cfa2a760e5d46c3c3ab6144748ebd38d6d603f2be3895
 DIST camlp5-6.02.3.tgz 653958 RMD160 519d8d79c6de63c374ff43f8348b7791de9e9fa5 SHA1 eb0f4f9ade52c2c1e972d61b334bcf01fea76dfc SHA256 329f8e577a6f9ac749a0d6fd22acb8385ae17dda3942ba415e27846304e42bfd
--- a/dev-ml/camlp5/camlp5-6.02.3_p1.ebuild
+++ b/dev-ml/camlp5/camlp5-6.02.3_p1.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/camlp5-6.02.3_p1.ebuild,v 1.1 2011/11/30 12:50:25 aballier Exp $
+
+EAPI="2"
+
+inherit multilib findlib eutils
+
+MY_P=${P%_p*}
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="http://pauillac.inria.fr/~ddr/camlp5/"
+SRC_URI="http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+PATCHLEVEL=${PV#*_p}
+PATCHLIST=""
+
+if [ "${PATCHLEVEL}" != "${PV}" ] ; then
+	for i in $(seq 1 ${PATCHLEVEL}) ; do
+		SRC_URI="${SRC_URI}
+			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
+		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
+	done
+fi
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	for i in ${PATCHLIST} ; do
+		epatch "${DISTDIR}/${i}"
+	done
+}
+
+src_configure() {
+	./configure \
+		-prefix /usr \
+	    -bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+	emake || die "emake failed"
+	if use ocamlopt; then
+		emake  opt || die "Compiling native code programs failed"
+		emake  opt.opt || die "Compiling native code programs failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META || die "failed to install META file for findlib support"
+
+	use doc && dohtml -r doc/*
+
+	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild,v 1.1 2011/11/02 12:32:44 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.4.ebuild,v 1.2 2011/11/30 14:30:27 grobian Exp $

 EAPI="4"

@ -8,7 +8,7 @@ inherit depend.php

 PEAR="${PV}"

-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"

 DESCRIPTION="PEAR Base System"
 HOMEPAGE="http://pear.php.net/package/PEAR"
--- a/dev-python/pypy/pypy-1.7.ebuild
+++ b/dev-python/pypy/pypy-1.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.1 2011/11/30 08:49:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.2 2011/11/30 11:42:55 djc Exp $

 EAPI="3"

@ -52,7 +52,7 @@ src_compile() {
 		conf+=" --stackless"
 	fi

-	conf+=" ./pypy-pypy-release-${PV}/pypy/translator/goal/targetpypystandalone.py"
+	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
 	# Avoid linking against libraries disabled by use flags
 	optional_use=("bzip2" "ncurses" "xml" "ssl")
 	optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl")
@ -64,7 +64,7 @@ src_compile() {
 		fi
 	done

-	translate_cmd="$(PYTHON -2) ./pypy-pypy-release-${PV}/pypy/translator/goal/translate.py $conf"
+	translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
 	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
 	${translate_cmd} || die "compile error"
 }
--- a/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
+++ b/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
@ -1,16 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.1 2011/02/28 16:45:17 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.2 2011/11/30 14:51:15 grobian Exp $

 EAPI="3"

+inherit flag-o-matic multilib
+
 DESCRIPTION="Lightweight scheme interpreter"
 HOMEPAGE="http://tinyscheme.sourceforge.net"
 SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz"

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

 DEPEND=""
@ -29,12 +31,28 @@ src_prepare() {
 	sed 's/DEBUG=-g -Wno-char-subscripts -O/DEBUG=/' -i makefile
 	sed "s/LD)/& -Wl,-soname,lib${PN}.so.${PV}/" -i makefile

+	if [[ ${CHOST} == *-darwin* ]] ; then
+		append-flags -DOSX
+		sed -i \
+			-e 's/SOsuf=so/SOsuf=dylib/' \
+			-e "s|\(\$(LD)\)[^\$]\+\(\$(\)|\1 -Wl,-install_name,${EPREFIX}/usr/lib/lib${PN}.${PV}.dylib \2|" \
+			makefile || die
+	fi
+
 #	diff -u makefile.old makefile
 }

 src_install() {
 	newbin scheme ${PN} || die "newbin failed"
-	dolib libtinyscheme.a libtinyscheme.so || die "dolib failed"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this should be done for ELF (all other systems) as well, but only
+		# Darwin/MachO is strict in the install_name (soname) actually pointing
+		# somewhere, so we won't change the ELF scheme here (up to maintainer)
+		mv libtinyscheme$(get_libname) libtinyscheme$(get_libname ${PV}) || die
+		ln -s libtinyscheme$(get_libname ${PV}) libtinyscheme$(get_libname) || die
+		dolib libtinyscheme$(get_libname ${PV}) || die "dolib failed"
+	fi
+	dolib libtinyscheme.a libtinyscheme$(get_libname) || die "dolib failed"
 	dodoc Manual.txt || die "dodoc failed"

 	# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file
@ -44,5 +62,5 @@ src_install() {
 	local INIT_DIR=/usr/share/${PN}/
 	insinto ${INIT_DIR}
 	doins init.scm || die "doins failed"
-	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${INIT_DIR}init.scm\"" > "${D}"/etc/env.d/50tinyscheme
+	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme
 }
--- a/dev-texlive/texlive-latexextra/Manifest
+++ b/dev-texlive/texlive-latexextra/Manifest
@ -3343,6 +3343,7 @@ DIST texlive-module-thmtools.doc-2010.tar.xz 229272 RMD160 236ec72bc00b1353bf93c
 DIST texlive-module-thmtools.doc-2011.tar.xz 229272 RMD160 236ec72bc00b1353bf93cb4f7b911d3316bd43e1 SHA1 3ddd03546bd5a0873ff46573be6299790e25a831 SHA256 2489036cc389aef5c54770912bda526f4e893d77385c9bc5fdf07924e69d8c36
 DIST texlive-module-thmtools.source-2010.tar.xz 18700 RMD160 3ad1ef67b9b0a0c4ba958f046917a996eecde33c SHA1 9679f932b526afe199f13606a13c8717bcf933a0 SHA256 f6326dac1b865a51063eeaf4389a31e436675733a555fc7e9d4a619049a8cac7
 DIST texlive-module-thmtools.source-2011.tar.xz 18700 RMD160 3ad1ef67b9b0a0c4ba958f046917a996eecde33c SHA1 9679f932b526afe199f13606a13c8717bcf933a0 SHA256 f6326dac1b865a51063eeaf4389a31e436675733a555fc7e9d4a619049a8cac7
+DIST texlive-module-thmtools_v59-2011.tar.xz 12176 RMD160 9068639012ed2c0df5c8db9c049ca4668d745c70 SHA1 3f083934461f5db512a49f052b9dbdb905046fc8 SHA256 eb7caa782dee738f51be95c62b85d9d1e276c01b8121edb1827be1fd564afe6f
 DIST texlive-module-threeparttable-2010.tar.xz 5440 RMD160 e2dff6687f5d0ead4d282baad8d79d7d64d4a0d7 SHA1 3e31c609f7557d148cd4b3a1c07663f5958347a7 SHA256 33ed88bd955e930b82a1d51d276163c160f37db582d0f6b75f2242664bd793f1
 DIST texlive-module-threeparttable-2011.tar.xz 5440 RMD160 e2dff6687f5d0ead4d282baad8d79d7d64d4a0d7 SHA1 3e31c609f7557d148cd4b3a1c07663f5958347a7 SHA256 33ed88bd955e930b82a1d51d276163c160f37db582d0f6b75f2242664bd793f1
 DIST texlive-module-threeparttable.doc-2010.tar.xz 280028 RMD160 18b5db00aceb2e53a57fb24c4fe467a3db4c5ae7 SHA1 15fd9b6ce5f9341fa5f768a3e0fcbc33ab34c2af SHA256 cb47118070b90645b2f436e3745f7d589f3b0b4cc84bdc6d4a82c27ebc5e595c
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r1.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2011-r1.ebuild
--- a/dev-util/checkstyle/checkstyle-5.5.ebuild
+++ b/dev-util/checkstyle/checkstyle-5.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-5.5.ebuild,v 1.1 2011/11/20 14:13:58 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/checkstyle/checkstyle-5.5.ebuild,v 1.2 2011/11/30 12:13:34 grobian Exp $

 EAPI="4"

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/checkstyle/${P}-src.tar.gz

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 COMMON_DEP="
--- a/dev-vcs/subversion/subversion-1.7.1.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.1 2011/10/26 14:31:06 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.2 2011/11/30 14:28:49 grobian Exp $

 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@ -297,7 +297,7 @@ src_install() {

 	if use java; then
 		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
-		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
 		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
 		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
 	fi
@ -363,8 +363,8 @@ EOF
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
 	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
 		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
 			CHANGED_BDB_VERSION="1"
 		fi
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@ -1,2 +1,2 @@
-DIST audiofile-0.2.7.tar.gz 502448 RMD160 70327d38c6a9057045f5c59f67f45e2f6f9bf677 SHA1 1d8a5bb0ca63c7047436f136fb1fb98ea886e920 SHA256 a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2
 DIST audiofile-0.3.1.tar.gz 722557 RMD160 26126ae4e095bc9d37b5184853fa545283684d03 SHA1 39de137a691a7c12ea5dc468566eb7a146880ac3 SHA256 6353dba997d480161e96a92dae3c58fb94666e35ef4ef00e8cc65950c1ae054a
+DIST audiofile-0.3.2.tar.xz 469944 RMD160 1a2deaab3ed8b9f2b3abf287a23e611b62db2347 SHA1 7195201a7ec524e6e5ee7cf4b823753e8ffcf502 SHA256 fac1706a8f87ad89206cdb76f886715d7bcff68d4492b50c347783656432b2a0
--- a/media-libs/audiofile/audiofile-0.3.2.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.2.ebuild
@ -1,28 +1,24 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.7.ebuild,v 1.11 2011/04/26 20:14:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.2.ebuild,v 1.1 2011/11/30 15:24:04 pacho Exp $

-EAPI=4
+EAPI="4"

-inherit autotools eutils
+inherit autotools gnome.org

 DESCRIPTION="An elegant API for accessing audio files"
 HOMEPAGE="http://www.68k.org/~michael/audiofile/"
-SRC_URI="http://www.68k.org/~michael/${PN}/${P}.tar.gz"

 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"

 DOCS=( ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS NOTES README TODO )

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-largefile.patch
-
-	sed -i \
-		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
-		test/Makefile.am || die
+	# Don't build examples
+	sed -i -e "/^SRC_SUBDIRS/s: examples::" Makefile.am || die

 	eautoreconf
 }
@ -30,9 +26,14 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
+		--disable-werror \
 		--enable-largefile
 }

+src_test() {
+	emake -C test check
+}
+
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete
--- a/media-libs/audiofile/files/audiofile-largefile.patch
+++ b/media-libs/audiofile/files/audiofile-largefile.patch
@ -1,24 +0,0 @@
-http://bugs.gentoo.org/118600
-http://bugs.gentoo.org/237600
-
--- libaudiofile/audiofile.h
-+++ libaudiofile/audiofile.h
-@@ -29,6 +29,7 @@
- 
- #include <sys/types.h>
- #include <aupvlist.h>
-+#include <stdint.h>
- 
- #define LIBAUDIOFILE_MAJOR_VERSION 0
- #define LIBAUDIOFILE_MINOR_VERSION 2
-@@ -45,8 +45,8 @@ typedef struct _AFfilesetup *AFfilesetup
- typedef struct _AFfilehandle *AFfilehandle;
- typedef void (*AFerrfunc)(long, const char *);
- 
-typedef off_t AFframecount;
-typedef off_t AFfileoffset;
-+typedef int64_t AFframecount;
-+typedef int64_t AFfileoffset;
- 
- #define AF_NULL_FILESETUP	((struct _AFfilesetup *) 0)
- #define AF_NULL_FILEHANDLE	((struct _AFfilehandle *) 0)
--- a/media-libs/libvisio/libvisio-0.0.11.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.11.ebuild,v 1.1 2011/11/29 12:01:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.11.ebuild,v 1.2 2011/11/30 12:38:36 xarthisius Exp $

 EAPI=4

@ -15,7 +15,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio"

 LICENSE="LGPL-2.1"
 SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc static-libs"

 RDEPEND="
--- a/media-libs/sampleicc/sampleicc-1.6.4.ebuild
+++ b/media-libs/sampleicc/sampleicc-1.6.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sampleicc/sampleicc-1.6.4.ebuild,v 1.1 2011/09/24 14:09:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sampleicc/sampleicc-1.6.4.ebuild,v 1.2 2011/11/30 12:39:50 xarthisius Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/SampleICC-${PV}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"

 DEPEND="media-libs/tiff"
--- a/media-sound/twolame/twolame-0.3.13.ebuild
+++ b/media-sound/twolame/twolame-0.3.13.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/twolame/twolame-0.3.13.ebuild,v 1.1 2011/04/07 12:12:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/twolame/twolame-0.3.13.ebuild,v 1.2 2011/11/30 14:10:04 grobian Exp $

 EAPI=3
 inherit libtool
@ -24,6 +24,9 @@ src_prepare() {
 	if [[ ${CHOST} == *solaris* ]]; then
 		# libsndfile doesn't like -std=c99 on Solaris
 		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
+		# configure isn't really bourne shell (comment 0) or dash (comment 6)
+		# compatible, bug #388885
+		export CONFIG_SHELL=${BASH}
 	fi

 	elibtoolize
--- a/metadata/cache/app-admin/eselect-php-0.6.6
+++ b/metadata/cache/app-admin/eselect-php-0.6.6
@ -6,7 +6,7 @@ http://olemarkus.org/~olemarkus/gentoo/eselect-php-0.6.6.bz2
 http://www.gentoo.org
 GPL-2
 PHP eselect module
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos ~x86-macos



--- a/metadata/cache/app-doc/gnucash-docs-2.4.1
+++ b/metadata/cache/app-doc/gnucash-docs-2.4.1
@ -0,0 +1,22 @@
+gnome-extra/yelp !<=app-office/gnucash-2.2.1 >=dev-libs/libxml2-2.5.10:2 dev-libs/libxslt >=app-text/scrollkeeper-0.3.4 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 app-arch/xz-utils >=sys-apps/sed-4
+gnome-extra/yelp !<=app-office/gnucash-2.2.1
+0
+mirror://sourceforge/gnucash/gnucash-docs-2.4.1.tar.gz
+
+http://www.gnucash.org/
+GPL-2 FDL-1.1
+Documentation package for GnuCash
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare unpack
+
+
+
+
+
--- a/metadata/cache/app-office/gnucash-2.4.8
+++ b/metadata/cache/app-office/gnucash-2.4.8
@ -0,0 +1,22 @@
+>=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 dev-util/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* =dev-lang/python-2.4* ) )
+0
+mirror://sourceforge/gnucash/gnucash-2.4.8.tar.bz2
+
+http://www.gnucash.org/
+GPL-2
+A personal finance manager
+~amd64 ~ppc ~ppc64 ~x86
+autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability python toolchain-funcs user versionator
+chipcard cxx debug +doc hbci mysql ofx postgres python quotes sqlite webkit
+
+doc? ( >=app-doc/gnucash-docs-2.2.0 )
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/app-office/libreoffice-3.4.3.2-r1
+++ b/metadata/cache/app-office/libreoffice-3.4.3.2-r1
@ -10,7 +10,7 @@ amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools base bash-completion check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
 binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba webdav pdfimport linguas_de linguas_en_GB linguas_en_ZA linguas_es linguas_fr linguas_hu linguas_it bash-completion elibc_FreeBSD java aqua kde kdeenablefinal

->=app-office/libreoffice-l10n-3.4 bash-completion? ( app-shells/bash-completion )
+=app-office/libreoffice-l10n-3.4.3* bash-completion? ( app-shells/bash-completion )

 3

--- a/metadata/cache/app-office/libreoffice-3.4.4.2-r1
+++ b/metadata/cache/app-office/libreoffice-3.4.4.2-r1
@ -10,7 +10,7 @@ LibreOffice, a full office productivity suite.
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
 binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python templates test +vba webdav linguas_de linguas_en_GB linguas_en_ZA linguas_es linguas_fr linguas_hu linguas_it elibc_FreeBSD java aqua kde kdeenablefinal
 gnome? ( gtk ) nsplugin? ( gtk ) eds? ( gnome )
->=app-office/libreoffice-l10n-3.4
+=app-office/libreoffice-l10n-3.4.4*

 4

--- a/metadata/cache/app-office/libreoffice-3.4.9999-r2
+++ b/metadata/cache/app-office/libreoffice-3.4.9999-r2
@ -10,7 +10,7 @@ LibreOffice, a full office productivity suite.
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
 binfilter +branding custom-cflags dbus debug eds gnome graphite gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python test +vba webdav elibc_FreeBSD java aqua kde kdeenablefinal
 gnome? ( gtk ) nsplugin? ( gtk ) eds? ( gnome )
->=app-office/libreoffice-l10n-3.4
+=app-office/libreoffice-l10n-3.4*

 4

--- a/metadata/cache/app-office/libreoffice-3.5.0.0
+++ b/metadata/cache/app-office/libreoffice-3.5.0.0
@ -0,0 +1,22 @@
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+0
+branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.5.0.0.tar.bz2 binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.5.0.0.tar.bz2 ) http://download.documentfoundation.org/libreoffice/src/libreoffice-core-3.5.0.0.tar.bz2 binfilter? ( http://download.documentfoundation.org/libreoffice/src/libreoffice-binfilter-3.5.0.0.tar.bz2 ) http://download.documentfoundation.org/libreoffice/old/src/libreoffice-core-3.5.0.0.tar.bz2 binfilter? ( http://download.documentfoundation.org/libreoffice/old/src/libreoffice-binfilter-3.5.0.0.tar.bz2 ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+
+http://www.libreoffice.org
+LGPL-3
+LibreOffice, a full office productivity suite.
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
+binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
+nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
+=app-office/libreoffice-l10n-3.5.0*
+
+4
+
+compile configure install postinst postrm preinst prepare pretend setup test unpack
+
+
+
+
+
--- a/metadata/cache/app-office/libreoffice-9999-r2
+++ b/metadata/cache/app-office/libreoffice-9999-r2
@ -1,7 +1,7 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=media-libs/vigra-1.7 >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
 app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
-branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )

 http://www.libreoffice.org
 LGPL-3
@ -10,7 +10,7 @@ LibreOffice, a full office productivity suite.
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
 binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
->=app-office/libreoffice-l10n-9999
+=app-office/libreoffice-l10n-9999*

 4

--- a/metadata/cache/app-office/libreoffice-bin-3.4.3.2-r1
+++ b/metadata/cache/app-office/libreoffice-bin-3.4.3.2-r1
@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e dev-libs/redland[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.5 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) net-nds/openldap virtual/opengl net-libs/neon >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e dev-libs/redland[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.5 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) net-nds/openldap virtual/opengl net-libs/neon !app-office/libreoffice !app-office/openoffice-bin !app-office/openoffice java? ( >=virtual/jre-1.6 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e dev-libs/redland[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.5 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) net-nds/openldap virtual/opengl net-libs/neon >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0e dev-libs/redland[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.5 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender >=dev-libs/dbus-glib-0.92 gnome? ( gnome-base/gconf:2 gnome-extra/evolution-data-server ) >=x11-libs/gtk+-2.24:2 media-gfx/graphite2 >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) net-nds/openldap virtual/opengl net-libs/neon !app-office/libreoffice !app-office/openoffice-bin !app-office/openoffice java? ( >=virtual/jre-1.6 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 amd64? ( kde? ( !java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//amd64/libreoffice-kde-3.4.3.2-r1.tbz2 -> libreoffice-kde-amd64-3.4.3.2-r1.tbz2 ) java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//amd64/libreoffice-kde-java-3.4.3.2-r1.tbz2 -> libreoffice-kde-java-amd64-3.4.3.2-r1.tbz2 ) ) gnome? ( !java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//amd64/libreoffice-gnome-3.4.3.2-r1.tbz2 -> libreoffice-gnome-amd64-3.4.3.2-r1.tbz2 ) java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//amd64/libreoffice-gnome-java-3.4.3.2-r1.tbz2 -> libreoffice-gnome-java-amd64-3.4.3.2-r1.tbz2 ) ) !kde? ( !gnome? ( !java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//amd64/libreoffice-base-3.4.3.2-r1.tbz2 -> libreoffice-base-amd64-3.4.3.2-r1.tbz2 ) java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//amd64/libreoffice-base-java-3.4.3.2-r1.tbz2 -> libreoffice-base-java-amd64-3.4.3.2-r1.tbz2 ) ) ) ) x86? ( kde? ( !java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//x86/libreoffice-kde-3.4.3.2-r1.tbz2 -> libreoffice-kde-x86-3.4.3.2-r1.tbz2 ) java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//x86/libreoffice-kde-java-3.4.3.2-r1.tbz2 -> libreoffice-kde-java-x86-3.4.3.2-r1.tbz2 ) ) gnome? ( !java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//x86/libreoffice-gnome-3.4.3.2-r1.tbz2 -> libreoffice-gnome-x86-3.4.3.2-r1.tbz2 ) java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//x86/libreoffice-gnome-java-3.4.3.2-r1.tbz2 -> libreoffice-gnome-java-x86-3.4.3.2-r1.tbz2 ) ) !kde? ( !gnome? ( !java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//x86/libreoffice-base-3.4.3.2-r1.tbz2 -> libreoffice-base-x86-3.4.3.2-r1.tbz2 ) java? ( http://dev.gentooexperimental.org/~scarabeus/libreo_binary//x86/libreoffice-base-java-3.4.3.2-r1.tbz2 -> libreoffice-base-java-x86-3.4.3.2-r1.tbz2 ) ) ) )
 test strip
@ -10,7 +10,7 @@ amd64 ~x86
 base eutils fdo-mime gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions multilib pax-utils portability toolchain-funcs user versionator virtualx
 gnome java kde aqua kde kdeenablefinal elibc_FreeBSD java
 kde? ( !gnome ) gnome? ( !kde )
->=app-office/libreoffice-l10n-3.4
+=app-office/libreoffice-l10n-3.4.3*

 4

--- a/metadata/cache/app-office/libreoffice-l10n-3.5.0
+++ b/metadata/cache/app-office/libreoffice-l10n-3.5.0
--- a/metadata/cache/dev-cpp/libcmis-0.1.0
+++ b/metadata/cache/dev-cpp/libcmis-0.1.0
@ -6,7 +6,7 @@ test
 http://gitorious.org/libcmis
 || ( GPL-2 LGPL-2 MPL-1.1 )
 C++ client library for the CMIS interface
-~amd64 ~x86 ~amd64-linux ~x86-linux
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools eutils libtool multilib portability toolchain-funcs user
 static-libs test

--- a/metadata/cache/dev-db/redis-2.2.11
+++ b/metadata/cache/dev-db/redis-2.2.11
@ -1,22 +0,0 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-
-0
-http://redis.googlecode.com/files/redis-2.2.11.tar.gz
-
-http://code.google.com/p/redis/
-BSD
-A persistent caching system, key-value and data structures database.
-~amd64 ~x86 ~x86-macos ~x86-solaris
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-doc tcmalloc test
-
-
-
-2
-
-install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/dev-db/redis-2.2.2
+++ b/metadata/cache/dev-db/redis-2.2.2
@ -1,22 +0,0 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-
-0
-http://redis.googlecode.com/files/redis-2.2.2.tar.gz
-
-http://code.google.com/p/redis/
-BSD
-A persistent caching system, key-value and data structures database.
-amd64 x86 ~x86-macos ~x86-solaris
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-tcmalloc test
-
-
-
-2
-
-install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/dev-db/redis-2.2.6
+++ b/metadata/cache/dev-db/redis-2.2.6
@ -1,22 +0,0 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-
-0
-http://redis.googlecode.com/files/redis-2.2.6.tar.gz
-
-http://code.google.com/p/redis/
-BSD
-A persistent caching system, key-value and data structures database.
-amd64 x86 ~x86-macos ~x86-solaris
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-tcmalloc test
-
-
-
-2
-
-install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/dev-db/redis-2.2.8
+++ b/metadata/cache/dev-db/redis-2.2.8
@ -1,22 +0,0 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-
-0
-http://redis.googlecode.com/files/redis-2.2.8.tar.gz
-
-http://code.google.com/p/redis/
-BSD
-A persistent caching system, key-value and data structures database.
-~amd64 ~x86 ~x86-macos ~x86-solaris
-autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-tcmalloc test
-
-
-
-2
-
-install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/dev-db/redis-2.4.4
+++ b/metadata/cache/dev-db/redis-2.4.4
@ -0,0 +1,22 @@
+>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+
+0
+http://redis.googlecode.com/files/redis-2.4.4.tar.gz
+
+http://redis.io/
+BSD
+A persistent caching system, key-value and data structures database.
+~amd64 ~x86 ~x86-macos ~x86-solaris
+autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
+jemalloc tcmalloc test
+tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )
+
+
+4
+
+install prepare setup
+
+
+
+
+
--- a/metadata/cache/dev-java/commons-beanutils-1.8.3
+++ b/metadata/cache/dev-java/commons-beanutils-1.8.3
@ -6,7 +6,7 @@ mirror://apache/commons/beanutils/source/commons-beanutils-1.8.3-src.tar.gz
 http://commons.apache.org/beanutils/
 Apache-2.0
 Provides easy-to-use wrappers around Reflection and Introspection APIs
-~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc source test elibc_FreeBSD

--- a/metadata/cache/dev-java/commons-cli-1.2
+++ b/metadata/cache/dev-java/commons-cli-1.2
@ -6,7 +6,7 @@ mirror://apache/commons/cli/source/commons-cli-1.2-src.tar.gz
 http://commons.apache.org/cli/
 Apache-2.0
 A Java library for working with the command line arguments and options.
-amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc source test elibc_FreeBSD

--- a/metadata/cache/dev-java/commons-collections-3.2.1
+++ b/metadata/cache/dev-java/commons-collections-3.2.1
@ -6,7 +6,7 @@ mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
 http://commons.apache.org/collections/
 Apache-2.0
 Jakarta-Commons Collections Component
-amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 test-framework elibc_FreeBSD doc source test elibc_FreeBSD

--- a/metadata/cache/dev-java/guava-07
+++ b/metadata/cache/dev-java/guava-07
@ -6,7 +6,7 @@ http://guava-libraries.googlecode.com/files/guava-r07.zip
 http://code.google.com/p/guava-libraries/
 Apache-2.0
 A collection of Google's core Java libraries
-~amd64 ~x86
+~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 eutils java-pkg-2 java-pkg-simple java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc source elibc_FreeBSD

--- a/metadata/cache/dev-java/jsr305-1.0-r1
+++ b/metadata/cache/dev-java/jsr305-1.0-r1
@ -6,7 +6,7 @@ mirror://gentoo/jsr-305-source.tar.gz
 http://code.google.com/p/jsr-305/
 BSD
 Reference implementation for JSR 305: Annotations for Software Defect Detection in Java
-amd64 ppc ppc64 x86
+amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc examples source test elibc_FreeBSD

--- a/metadata/cache/dev-lang/vala-0.10.3
+++ b/metadata/cache/dev-lang/vala-0.10.3
@ -1,22 +0,0 @@
->=dev-libs/glib-2.14:2 sys-devel/flex || ( sys-devel/bison dev-util/byacc dev-util/yacc ) dev-util/pkgconfig dev-libs/libxslt test? ( >=dev-libs/glib-2.26 dev-libs/dbus-glib ) >=sys-apps/sed-4
->=dev-libs/glib-2.14:2
-0.10
-mirror://gnome/sources/vala/0.10/vala-0.10.3.tar.bz2
-
-http://live.gnome.org/Vala
-LGPL-2.1
-Vala - Compiler for the GObject type system
-alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-test +vapigen
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
--- a/metadata/cache/dev-lang/vala-0.14.1
+++ b/metadata/cache/dev-lang/vala-0.14.1
@ -1,12 +1,12 @@
 >=dev-libs/glib-2.16:2 sys-devel/flex || ( sys-devel/bison dev-util/byacc dev-util/yacc ) dev-util/pkgconfig dev-libs/libxslt test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 ) app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2
 0.14
-mirror://gnome/sources/vala/0.13/vala-0.13.4.tar.xz
+mirror://gnome/sources/vala/0.14/vala-0.14.1.tar.xz

 http://live.gnome.org/Vala
 LGPL-2.1
 Vala - Compiler for the GObject type system
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux
 alternatives eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
 test +vapigen

--- a/metadata/cache/dev-ml/camlp5-6.02.3_p1
+++ b/metadata/cache/dev-ml/camlp5-6.02.3_p1
@ -0,0 +1,22 @@
+>=dev-lang/ocaml-3.10[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+>=dev-lang/ocaml-3.10[ocamlopt?]
+0
+http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.02.3.tgz http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.3-1 -> camlp5-6.02.3-patch-1.patch
+
+http://pauillac.inria.fr/~ddr/camlp5/
+BSD
+A preprocessor-pretty-printer of ocaml
+~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+eutils findlib multilib portability toolchain-funcs user
+doc +ocamlopt
+
+
+
+2
+
+compile configure install prepare
+
+
+
+
+
--- a/metadata/cache/dev-php/PEAR-PEAR-1.9.4
+++ b/metadata/cache/dev-php/PEAR-PEAR-1.9.4
@ -6,7 +6,7 @@ http://pear.php.net/get/PEAR-1.9.4.tgz
 http://pear.php.net/package/PEAR
 MIT
 PEAR Base System
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos
 depend.php eutils multilib phpconfutils portability toolchain-funcs user


--- a/metadata/cache/dev-scheme/tinyscheme-1.40
+++ b/metadata/cache/dev-scheme/tinyscheme-1.40
@ -6,8 +6,8 @@ mirror://sourceforge/tinyscheme/tinyscheme-1.40.tar.gz
 http://tinyscheme.sourceforge.net
 BSD
 Lightweight scheme interpreter
-~amd64 ~ppc ~x86
-
+~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos
+eutils flag-o-matic multilib portability toolchain-funcs user



--- a/metadata/cache/dev-texlive/texlive-latexextra-2011-r1
+++ b/metadata/cache/dev-texlive/texlive-latexextra-2011-r1
--- a/metadata/cache/dev-util/checkstyle-5.5
+++ b/metadata/cache/dev-util/checkstyle-5.5
@ -6,7 +6,7 @@ mirror://sourceforge/checkstyle/checkstyle-5.5-src.tar.gz http://dev.gentoo.org/
 http://checkstyle.sourceforge.net
 LGPL-2.1
 A development tool to help programmers write Java code that adheres to a coding standard.
-~amd64 ~x86
+~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc source test elibc_FreeBSD

--- a/metadata/cache/media-libs/audiofile-0.2.7
+++ b/metadata/cache/media-libs/audiofile-0.2.7
@ -1,22 +0,0 @@
-|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-
-0
-http://www.68k.org/~michael/audiofile/audiofile-0.2.7.tar.gz
-
-http://www.68k.org/~michael/audiofile/
-GPL-2 LGPL-2
-An elegant API for accessing audio files
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-autotools eutils libtool multilib portability toolchain-funcs user
-static-libs
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
--- a/metadata/cache/media-libs/audiofile-0.3.2
+++ b/metadata/cache/media-libs/audiofile-0.3.2
@ -0,0 +1,22 @@
+|| ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool app-arch/xz-utils
+
+0
+mirror://gnome/sources/audiofile/0.3/audiofile-0.3.2.tar.xz
+
+http://www.68k.org/~michael/audiofile/
+GPL-2 LGPL-2
+An elegant API for accessing audio files
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+autotools eutils gnome.org libtool multilib portability toolchain-funcs user versionator
+static-libs
+
+
+
+4
+
+configure install prepare test
+
+
+
+
+
--- a/metadata/cache/media-libs/libvisio-0.0.11
+++ b/metadata/cache/media-libs/libvisio-0.0.11
@ -6,7 +6,7 @@ http://dev-www.libreoffice.org/src/libvisio-0.0.11.tar.xz
 http://www.freedesktop.org/wiki/Software/libvisio
 LGPL-2.1
 Library parsing the visio documents
-~amd64 ~x86
+~amd64 ~ppc ~x86
 base eutils multilib portability toolchain-funcs user
 doc static-libs

--- a/metadata/cache/media-libs/sampleicc-1.6.4
+++ b/metadata/cache/media-libs/sampleicc-1.6.4
@ -6,7 +6,7 @@ mirror://sourceforge/sampleicc/SampleICC-1.6.4.tar.gz
 http://sampleicc.sourceforge.net/
 BSD-2
 C++ library for reading, writing, manipulating, and applying ICC profiles
-~amd64 ~x86 ~amd64-linux ~x86-linux
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux

 static-libs

--- a/metadata/cache/net-misc/npapi-sdk-0.27
+++ b/metadata/cache/net-misc/npapi-sdk-0.27
@ -6,7 +6,7 @@ http://cloud.github.com/downloads/mgorny/npapi-sdk/npapi-sdk-0.27.tar.bz2
 https://github.com/mgorny/npapi-sdk/
 MPL-1.1
 NPAPI headers bundle
-~amd64 ~x86 ~x86-fbsd
+~amd64 ~ppc ~x86 ~x86-fbsd
 autotools autotools-utils base eutils libtool multilib portability toolchain-funcs user


--- a/metadata/cache/sys-devel/dragonegg-3.0_rc4
+++ b/metadata/cache/sys-devel/dragonegg-3.0_rc4
@ -1,5 +1,5 @@
->=sys-devel/gcc-4.5.0[lto] ~sys-devel/llvm-3.0_rc4
->=sys-devel/gcc-4.5.0[lto] ~sys-devel/llvm-3.0_rc4
+|| ( sys-devel/gcc:4.5[lto] >=sys-devel/gcc-4.6 ) ~sys-devel/llvm-3.0_rc4
+|| ( sys-devel/gcc:4.5[lto] >=sys-devel/gcc-4.6 ) ~sys-devel/llvm-3.0_rc4
 0
 http://llvm.org/pre-releases/3.0/rc4/dragonegg-3.0rc4.src.tar.gz

--- a/metadata/cache/sys-kernel/gentoo-sources-3.1.4
+++ b/metadata/cache/sys-kernel/gentoo-sources-3.1.4
@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.1.4
+mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) mirror://gentoo/genpatches-3.1-7.base.tar.bz2 mirror://gentoo/genpatches-3.1-7.extras.tar.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches
+GPL-2 !deblob? ( freedist )
+Full sources including the Gentoo patchset for the 3.1 kernel tree
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+2
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
--- a/metadata/cache/sys-kernel/tuxonice-sources-3.0.11
+++ b/metadata/cache/sys-kernel/tuxonice-sources-3.0.11
@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.0.11
+mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.bz2 mirror://gentoo/genpatches-3.0-11.base.tar.bz2 mirror://gentoo/genpatches-3.0-11.extras.tar.bz2 http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-3.0_20111012.patch.bz2
+binchecks strip
+http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net
+GPL-2 freedist
+TuxOnIce + Gentoo patchset sources
+~amd64 ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+symlink build
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
--- a/metadata/cache/www-client/httrack-3.44.1-r1
+++ b/metadata/cache/www-client/httrack-3.44.1-r1
@ -0,0 +1,22 @@
+sys-libs/zlib
+sys-libs/zlib
+0
+http://download.httrack.com/httrack-3.44.1.tar.gz
+
+http://www.httrack.com/
+GPL-2
+HTTrack Website Copier, Open Source Offline Browser
+~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+eutils multilib portability toolchain-funcs user
+static-libs
+
+
+
+4
+
+compile configure prepare
+
+
+
+
+
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 30 Nov 2011 09:36:43 +0000
+Wed, 30 Nov 2011 15:36:52 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 30 Nov 2011 09:36:43 +0000
+Wed, 30 Nov 2011 15:36:52 +0000
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 30 Nov 2011 09:36:45 +0000
+Wed, 30 Nov 2011 15:36:54 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Nov 30 09:36:43 UTC 2011
+Wed Nov 30 15:36:52 UTC 2011
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 30 Nov 2011 10:00:01 +0000
+Wed, 30 Nov 2011 16:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1322645701 Wed Nov 30 09:35:01 2011 UTC
+1322667301 Wed Nov 30 15:35:01 2011 UTC
--- a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
+++ b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild,v 1.1 2011/09/13 16:34:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild,v 1.2 2011/11/30 12:43:00 xarthisius Exp $

 EAPI=4
 inherit autotools-utils
@ -11,5 +11,5 @@ SRC_URI="http://cloud.github.com/downloads/mgorny/${PN}/${P}.tar.bz2"

 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
--- a/net-zope/zope-testing/metadata.xml
+++ b/net-zope/zope-testing/metadata.xml
@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-zope</herd>
-	<herd>python</herd>
 </pkgmetadata>
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -922,6 +922,7 @@ dev-db/postgresql-base:pg-intdatetime - Enable --enable-integer-datetimes config
 dev-db/postgresql-base:pg_legacytimestamp - Use double precision floating-point numbers instead of 64-bit integers for timestamp storage.
 dev-db/postgresql-server:pg_legacytimestamp - Use double precision floating-point numbers instead of 64-bit integers for timestamp storage.
 dev-db/postgresql-server:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid)
+dev-db/redis:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/redis:tcmalloc - Use the dev-util/google-perftools libraries to replace the malloc() implementation with a possibly faster one.
 dev-db/spatialite:geos - Add the sci-libs/geos library for exact topological tests
 dev-db/spatialite:proj - Add the sci-libs/proj library for reprojection features
--- a/sys-devel/dragonegg/dragonegg-3.0_rc4.ebuild
+++ b/sys-devel/dragonegg/dragonegg-3.0_rc4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.0_rc4.ebuild,v 1.1 2011/11/28 10:56:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/dragonegg/dragonegg-3.0_rc4.ebuild,v 1.2 2011/11/30 10:35:01 voyageur Exp $

 EAPI=4
 inherit multilib
@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=">=sys-devel/gcc-4.5.0[lto]
+DEPEND="|| ( sys-devel/gcc:4.5[lto]
+		>=sys-devel/gcc-4.6 )
 	~sys-devel/llvm-${PV}"
 RDEPEND="${DEPEND}"

--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@ -42,6 +42,8 @@ DIST genpatches-3.1-5.base.tar.bz2 115408 RMD160 f2f638fc59ee79de070cdc29ff6c8db
 DIST genpatches-3.1-5.extras.tar.bz2 17187 RMD160 7c45690a22d68bb40b90fbd692cd52d786b69a05 SHA1 e780917129e86c668048175ca7de2c6a96701d0b SHA256 c71596744bf82b3605ed5e2e582ea8dd3b8519cd9ff9216514aa37ef63bb9179
 DIST genpatches-3.1-6.base.tar.bz2 130496 RMD160 8ca2a91c65e42dc1c3a4c200d521decb8c659c96 SHA1 c9c585c23132271d68a51d3709df7cab4abffcdb SHA256 5ab97ae5dff50355dcde83d5334a98ee952d936321b9f90f330c509150e1f5ca
 DIST genpatches-3.1-6.extras.tar.bz2 17200 RMD160 fa8aa6ba8bc1e554758017d371769536d025bdc1 SHA1 47240cdc21d69d2af05d0b2bd7dcbb1615508f86 SHA256 b108dbf3b5ddad1701cacd2f1c936a63b60d1a4cd86fd7f9311230e3bacac56b
+DIST genpatches-3.1-7.base.tar.bz2 130517 RMD160 46e538a8b0033dd41fcb7f4ea578a836e87cb03d SHA1 ad247c4e2d48692ea823ee721f60ef4b7200399d SHA256 2cf45b51ccf4fd2de9542d2998d509e9a86c9271439760ff2fc1450f5fbf2084
+DIST genpatches-3.1-7.extras.tar.bz2 17200 RMD160 fa8aa6ba8bc1e554758017d371769536d025bdc1 SHA1 47240cdc21d69d2af05d0b2bd7dcbb1615508f86 SHA256 b108dbf3b5ddad1701cacd2f1c936a63b60d1a4cd86fd7f9311230e3bacac56b
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.1.4.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.1.4.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.1.4.ebuild,v 1.1 2011/11/30 13:16:09 psomas Exp $
+
+EAPI="2"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="7"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@ -14,6 +14,8 @@ DIST genpatches-2.6.38-8.base.tar.bz2 194001 RMD160 6abc3131bc8094131ab647a31f02
 DIST genpatches-2.6.38-8.extras.tar.bz2 15675 RMD160 3d40e9fcad874591de0cc7497a52795ea04a9b9b SHA1 ca1b5f319e87960fa97ea6302dd0146901cacd9e SHA256 6d4c134be67714382efc8aec208c5a73d6c0f84d96acc76640b9ed3be93877a4
 DIST genpatches-3.0-10.base.tar.bz2 323891 RMD160 a20636d0ef3c6102275a43b5a9f73089c33f33b5 SHA1 270790afe632984fbd97944922f3df762a766ca5 SHA256 08020ed6363e203ae3c0f20c4d61e0f16a1826b812e89c8d2a4098c96c458e3a
 DIST genpatches-3.0-10.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
+DIST genpatches-3.0-11.base.tar.bz2 346369 RMD160 dda57728150b2a799978a99637699617e5687ce3 SHA1 1a27224155980c659166de6b1d8bba51d91b76b1 SHA256 790e84532e7389fbe1dbbafa47d7de1f8de52abaca8e6853511386bf14590140
+DIST genpatches-3.0-11.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
 DIST genpatches-3.0-8.base.tar.bz2 216509 RMD160 4ca8618b482a013adea3b5a66222975288c3f589 SHA1 68caec5b7080ab7140ad09ec7caa3414f185e5f8 SHA256 857d6ccd8bf965ec82c944c229218fb71a37c0c13f26228dc69c4e556dbfa17d
 DIST genpatches-3.0-8.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
 DIST genpatches-3.0-9.base.tar.bz2 229050 RMD160 2c9832e195851a10b327a74de668d4f704d1909d SHA1 13e6ec91dad89ba264bba55d8670b77164821bbd SHA256 fe4ca0d112efa96bb940f67ada7d981537b536f95bb8c0330a19189049d9d2fe
--- a/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.11.ebuild
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.11.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.0.11.ebuild,v 1.1 2011/11/30 15:18:05 pacho Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="11"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net"
+IUSE=""
+
+TUXONICE_SNAPSHOT="20111012"
+TUXONICE_VERSION=""
+TUXONICE_TARGET="3.0"
+
+# Because "current" patches can change without notifying, we need to supply them
+if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
+	TUXONICE_SRC="http://dev.gentoo.org/~pacho/tuxonice/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch"
+	UNIPATCH_LIST="${DISTDIR}/current-tuxonice-for-${TUXONICE_TARGET}_${TUXONICE_SNAPSHOT}.patch.bz2"
+else
+	TUXONICE_SRC="http://www.tuxonice.net/files/tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
+	UNIPATCH_LIST="${DISTDIR}/tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch.bz2"
+fi
+
+TUXONICE_URI="${TUXONICE_SRC}.bz2"
+
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any
+queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
--- a/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
+++ b/www-client/httrack/files/httrack-3.44.1+zlib-1.2.5.1.patch
@ -0,0 +1,21 @@
+--- httrack-3.44.1/src/minizip/ioapi.h
+++ httrack-3.44.1/src/minizip/ioapi.h
+@@ -9,6 +9,7 @@
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
+#define OF(x) x
+ 
+ #define ZLIB_FILEFUNC_SEEK_CUR (1)
+ #define ZLIB_FILEFUNC_SEEK_END (2)
+--- httrack-3.44.1/src/minizip/zip.h
+++ httrack-3.44.1/src/minizip/zip.h
+@@ -42,6 +42,8 @@
+       ftp://ftp.pkware.com/probdesc.zip
+ */
+ 
+#define OF(x) x
+
+ #ifndef _zip_H
+ #define _zip_H
+ 
--- a/www-client/httrack/httrack-3.44.1-r1.ebuild
+++ b/www-client/httrack/httrack-3.44.1-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/httrack/httrack-3.44.1-r1.ebuild,v 1.1 2011/11/30 11:23:20 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/"
+SRC_URI="http://download.httrack.com/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}+zlib-1.2.5.1.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake -j1
+}
+
+DOCS=( AUTHORS README greetings.txt history.txt )