cleanup tree

2012-10-25 17:22:20 +02:00 · 2012-10-25 17:22:20 +02:00 · e566efbeb5
commit e566efbeb5
parent b44b8ea806
145 changed files with 34 additions and 6347 deletions
--- a/Documentation/nas-new-kernel.eclass
+++ b/Documentation/nas-new-kernel.eclass
--- a/Documentation/nas-old-kernel.eclass
+++ b/Documentation/nas-old-kernel.eclass
--- a/Documentation/orion5x-kernel.eclass
+++ b/Documentation/orion5x-kernel.eclass
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@ -1,13 +1,9 @@
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jre-bin-1.7.env 1044 SHA256 338e601872b21b21d1828c20622a427c2ad712ab5b804f79d749be03b700ddd6 SHA512 7fed7767ae3b7f2d61f0606e0762196e6247c384244403462f29a97d032ac890c66f28a131e4b67405e26cc4bcf7b1fc30bcf4ef45959851d0056ad7c3c801e0 WHIRLPOOL b3e12c9be85caadb1f7e22759a91694062be36ac9a048e0fee967b05a08e8c08b9d2ec5cd00eafee26213122df93b19f389d85b9fb7d55083b6d9c79beb8cedf
 DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
 DIST ejre-7u2-fcs-b13-linux-arm-sflt-headless-22_nov_2011.tar.gz 32950518 SHA256 ac3f6a928c876e689790f968237ec223396f3af1bf7f5826e62ee77796f92f9e
 DIST ejre-7u2-fcs-b13-linux-arm-vfp-client_headful-22_nov_2011.tar.gz 38810335 SHA256 df1a8581001892c7e767b6d6604bbaa0299ea45cd86e69f3252378b830ba6444
 DIST ejre-7u2-fcs-b13-linux-arm-vfp-client_headless-22_nov_2011.tar.gz 32775664 SHA256 dd569e640091c7d4ee62489ecbbdfc815023d71135e44c7d15c74c6a9b87f9c5
 DIST ejre-7u6-fcs-b24-linux-arm-sflt-headless-10_aug_2012.tar.gz 33138075 SHA256 408203bf2763f3cfcaadd7b00256e057165113533735bb814e6b63c530fb6aa9 SHA512 0a983d868000913c7e113242fea6fee949eeb8c0352a920421db20c9b93bc40aa1b872584a0c6555233b384d323ae440a8f7c0ad67e5e6b31a59176df7bdc7e0 WHIRLPOOL 364937acd457e5e947fde2008ead4011f9d4a9704b29a86bd5441c612ee74f595e4a40bb96e3bf023e96966afe5ea5e8ed37f238721e0e146ee37d5b2cb52484
 DIST ejre-7u6-fcs-b24-linux-arm-vfp-client_headful-10_aug_2012.tar.gz 39099870 SHA256 e91de4c48069b20f26a9ddba7b96e088fac7a387a9e8c2dd1490c9dcce8ee027 SHA512 f5b8625b46368dd9bfee61a2f352041f5d272fb0d1f1fc766ad70d6e3102321cb320e10bbb98e0a06da23c4b03f7e047c49a5af9123b8b35e3639abe540f217a WHIRLPOOL b92e6ac57de6db68369707bad45af9eb64b90b4b2019f83bcd08fa00256a2c555d010cc5a9fa17d90b4edf18a16071bf8b595bb0ae5fac8258a5cbd36f5c2240
 DIST ejre-7u6-fcs-b24-linux-arm-vfp-client_headless-10_aug_2012.tar.gz 32910356 SHA256 f770aa79f9a8ccde2d81bd936aa2ca48c3c294ebea3414b6f86cfebc59d813c9 SHA512 60f011c2edc061053aaece0a7a2079526551c438f7d7582eabeaf3b60fcca1499a99530ef3abf05b046a60c0ee16f198768fca7ed8f0da4a676ead66a61f4686 WHIRLPOOL 82afb7d4a5c5604f355489f553332ca66962e8a8e1d0befde67426ce7795aa9af25d7ac78aab655a332eb8b941af7d6cad6a1a3866adea8b09fc7e37b778e454
 EBUILD oracle-jre-bin-1.7.0.2.ebuild 3823 SHA256 76c48533ac0e12f0ebcaf6dfde9a4fae51d08646380f3461db7aada7772584de SHA512 0514e03bc04a8d791a1863cc5e27d9514e130c11561283466b543565a1d01a1bdbb2d4e8c4d77a3e0bfff4ec19454c37c8905db4876287e79feafa1dfe94e8c3 WHIRLPOOL c6f3def53974329b082920475168ffce49506a84f1bde0ae5d4aaf05add72674e9e198bd85a5986f0769501e89117f9b54d99667d97f154f61882e670280bdd6
 EBUILD oracle-jre-bin-1.7.0.6.ebuild 3823 SHA256 a636079e3d3dcf4e2d762fe5fce3039b07389a4111e4da5044856a67f8e1e9be SHA512 3ad4b3f6ab21ff2aa1eca035f9ec1149e70aba375163a39a53e0b67db342a1a37b01ade0dd0d78b3ab16f47d3d638c394f6869ce58165012667655ba6d167847 WHIRLPOOL 9680e4e72a7be27a856e06242f99d74db2223944ec81fe85eb6e1d80b02bbd8123ec5b9cbc6b1894bc3f9ee5179a343389ee91b3a2f7ea4e3ca0a7762843d695
 MISC ChangeLog 2248 SHA256 eb84549d0f390585af9a574a4970e1277f30384e78d9ee85c873809224a8b0c4 SHA512 f0f16be4d202ca561af6aeb5cb6dfdb27c99c59d3c4969bc66013d47d560c22ada31a31f5009590961dec92b482563949ff15210ab0a13e92d75aa0b93257fe3 WHIRLPOOL cf6abcafff2a39ea07719e5c7cd23262fcbc9ccb47a8dc6198a9d48d8684617567765a8d74ca14fb0615eaf877d7b84672084ff3e9edd83d4feec73c984414f6
 MISC metadata.xml 374 SHA256 32decb0503e4843bf9157625a4c494955b4c93ccd079bec72da1c374c03b7fa8 SHA512 c55b3500fa8a9e04e33a6917112039b4cfb8539735780f060195bb56d62b0ad400a97f538c7f1525721943e6afcee55a0188ed2c0e209a7b3abf92d31dde055e WHIRLPOOL fb73fb8fde357d8a91b6985921b6d26bfd138db10e18e10e1d37d72f029e11763e3264ea94712b48a41171301a6ca4e550ba47ea81bd35acb4752d2be32774da
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild
@ -1,141 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.2.ebuild,v 1.1 2011/12/18 09:52:17 sera Exp $
 EAPI="4"
 inherit java-vm-2 eutils prefix versionator
 UPDATE="$(get_version_component_range 4)"
 UPDATE="${UPDATE#0}"
 MY_PV="$(get_version_component_range 2)u${UPDATE}"
 S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
 BUILD="13"
 BUILDDATE="22_nov_2011"
 SUFFIX=".tar.gz"
 ARMV5_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-sflt-headless-${BUILDDATE}${SUFFIX}"
 ARMV6_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-vfp-client_headless-${BUILDDATE}${SUFFIX}"
 ARMV7_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-vfp-client_headful-${BUILDDATE}${SUFFIX}"
 # This URIs need updating when bumping!
 JRE_URI="http://www.oracle.com/technetwork/java/embedded/overview/getstarted/index.html"
 JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
 JCE_DIR="UnlimitedJCEPolicy"
 JCE_FILE="${JCE_DIR}JDK7.zip"
 DESCRIPTION="Oracle's Java SE Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="arm? ( ${ARMV5_AT} ${ARMV6_AT} ${ARMV7_AT} )
 	jce? ( ${JCE_FILE} )"
 LICENSE="ejre-7"
 SLOT="1.7"
 KEYWORDS="~arm"
 RESTRICT="fetch strip"
 IUSE="X alsa jce"
 DEPEND="jce? ( app-arch/unzip )"
 RDEPEND="${DEPEND}
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libX11
 	)
 	alsa? ( media-libs/alsa-lib )
 	!prefix? ( sys-libs/glibc )"
 QA_TEXTRELS_arm="
 	opt/${P}/lib/arm/client/libjvm.so
 	opt/${P}/lib/arm/server/libjvm.so"
 S="${WORKDIR}/ejre${S_PV}"
 pkg_nofetch() {
 	if use arm; then
 		AT="${ARMV5_AT} ${ARMV6_AT} ${ARMV7_AT}"
 	fi
 	einfo "Please download ${AT} from:"
 	einfo "${JRE_URI}"
 	einfo "and move it to ${DISTDIR}"
 	if use jce; then
 		einfo "Also download ${JCE_FILE} from:"
 		einfo ${JCE_URI}
 		einfo "and move it to ${DISTDIR}"
 	fi
 }
 src_unpack() {
 	einfo "Unpacking for arch ${CHOST/-*/}"
 	if [[ ${CHOST/-*/} = "armv5tel" ]]; then
 		unpack ${ARMV5_AT}
 	elif [[ ${CHOST/-*/} = "armv6j" ]]; then
 		unpack ${ARMV6_AT}
 	elif [[ ${CHOST/-*/} = "armv7a" ]]; then
 		unpack ${ARMV7_AT}
 	fi
 }
 src_prepare() {
 	if use jce; then
 		mv "${WORKDIR}"/${JCE_DIR} "${S}"/lib/security/ || die
 	fi
 }
 src_compile() {
 	# This needs to be done before CDS - #215225
 	java-vm_set-pax-markings "${S}"
 	# see bug #207282
 	einfo "Creating the Class Data Sharing archives"
 	if use arm; then
 		"${S}"/bin/java -client -Xshare:dump || die
 	fi
 	#"${S}"/bin/java -server -Xshare:dump || die
 	# Create files used as storage for system preferences.
 	mkdir .systemPrefs || die
 	touch .systemPrefs/.system.lock || die
 	touch .systemPrefs/.systemRootModFile || die
 }
 src_install() {
 	dodir /opt/${P}
 	cp -pPR bin lib "${ED}"/opt/${P} || die
 	# Remove empty dirs we might have copied
 	#rmdir -v $(find "${ED}" -type d -empty) || die
 	dodoc COPYRIGHT README THIRDPARTYLICENSEREADME.txt
 	if use jce; then
 		dodir /opt/${P}/lib/security/strong-jce
 		mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
 			"${ED}"/opt/${P}/lib/security/strong-jce || die
 		mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
 			"${ED}"/opt/${P}/lib/security/strong-jce || die
 		dosym /opt/${P}/lib/security/${JCE_DIR}/US_export_policy.jar \
 			/opt/${P}/lib/security/
 		dosym /opt/${P}/lib/security/${JCE_DIR}/local_policy.jar \
 			/opt/${P}/lib/security/
 	fi
 	# bug #56444
 	cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
 	eprefixify "${T}"/fontconfig.properties
 	insinto /opt/${P}/lib/
 	doins "${T}"/fontconfig.properties
 	# bug #388127
 	dodir /etc/sandbox.d
 	echo 'SANDBOX_PREDICT="/dev/random:/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
 	set_java_env
 	java-vm_revdep-mask
 }
--- a/dev-java/sun-jre-bin/Manifest
+++ b/dev-java/sun-jre-bin/Manifest
@ -1,12 +1,8 @@
 AUX fontconfig.Gentoo.properties 10932 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 SHA512 bd63d2e910fd22b398ef838a48d52314c241180ee3e29f5af5a8ae4021c78c693beee451e3ca3409fc7ba39d00a1433717257d0115947185288e3dab44983482 WHIRLPOOL fe29c889df02f8faea096adeb8bc4388aba8848227feff6205e440cc0b9b38c4db40c25cc9da9a676bd6ddc5bac77278cedabca6af58c15b960d31e7a3c05042
 AUX sun-jre-bin-1.6.env 936 SHA256 0d4cf9f8c6cd3e1e466e215f3f90c696802910f39f8e33f6ff7a6a9ca87d58d9 SHA512 4b905931aeb7de0782101c80440ae7faf11fe2fbd045be9cdac8dcd54cf31a2b70421f0f521272f1a23fa83d59683e82094fde534d855ef1d6a16df09070ef95 WHIRLPOOL 0328f716072bcf1acb4fcc57bcc2da6ef5a2278ecb473318e7e5541760bf6a9c80b2fa53241390dd6c34351c361d105c9164f8b577dc941eb2d996c1e3be737b
 DIST ejre-1_6_0_30-fcs-b12-linux-arm-sflt-eabi-headless-10_nov_2011.tar.gz 28136052 SHA256 eeac5f1dd5a835aac7ee1a7c7e64512d1a751163ceac348ef1b5a41a5cd58609
 DIST ejre-1_6_0_30-fcs-b12-linux-arm-vfp-eabi-headful-10_nov_2011.tar.gz 34606130 SHA256 8467aaef7b515624067d01b8603c877717b9fc15bf5e1a561e9311ebbf0b5be0
 DIST ejre-1_6_0_30-fcs-b12-linux-arm-vfp-eabi-headless-10_nov_2011.tar.gz 28005658 SHA256 1f57b5b8d884af92856ec72c57128866067012c116a0d4e7abc46022df7311a6
 DIST ejre-1_6_0_34-fcs-b04-linux-arm-sflt-eabi-headless-19_jul_2012.tar.gz 28014672 SHA256 1946013a8c5edaeeb1949f348647ed82a2b0837bc55de9cc4dd674dd2620d139 SHA512 7904cc47820ccf9b321b464b938a7ae4b6943c33c8389506a8c816d336d18630d664a132d69ca816954ec3ec6c28c9b7638663923ce0cfc82f57ba21c459dcc6 WHIRLPOOL 210719a4e8bff4a6a13656b64cee743aa3cd5265c762d7fb8a90bb817dd7f1ca8c8e06f32a02b91c5c3ab00cdff9f25d36977590d957c9c254056791e4e226f5
 DIST ejre-1_6_0_34-fcs-b04-linux-arm-vfp-eabi-headful-19_jul_2012.tar.gz 34489730 SHA256 0637cf9d751bfaf6e9b1fab1e35286bb28157d7f6e04f23964be6bb8c24fc9f5 SHA512 3b482cb9c0573f4beada9f5b94210e90d93f96baa0cbb48193debefc1de7e33223db302ba13ea425dcb9f5858c75c755c2555aea6c6d8c5ffcd1c24923cef933 WHIRLPOOL 7fe13f726b8c2db9072ca0208c04987811ac1cf31b00b8e57d25d6c289f851f5e3af5560835e037f6b2981642e4547e2866c71e04e610ab550c994c831bd6977
 DIST ejre-1_6_0_34-fcs-b04-linux-arm-vfp-eabi-headless-19_jul_2012.tar.gz 27883939 SHA256 1ae0453a4d8f4101058bd1ed9f3865a4987b2c14c7fb9717b885eefaeef09118 SHA512 5f5be50711e5cd9fc76c8617de4dc67addc7be81bdcc47e3a88ecec8096f9cf9249bf2d35cc1df2f474d31a91545f5f52b74b8ca30e90f83d396a5b4316be06e WHIRLPOOL d3b05a9ae1912fdb5f34cc16bfa18f9c44c1954db1847bcf6c1c829c098be17f46461d3c586fc4e6994a8f69bdeaf1ad9d1c84bf352f1dad7387898b3b7bd677
 EBUILD sun-jre-bin-1.6.0.30.ebuild 3385 SHA256 02cd17cc732e380bffbf87da96e570532f6e01267bfe76fa8f26d04c187e48e5 SHA512 4794be94b021cffedc0fd2232e8793f68bf351244b9cd438cb57fc8387c0734cc0fd43772ff2b76d056a581191abfa1302d2aa1212d9682b0586c38d2089da88 WHIRLPOOL a0178ee63206277cc27261f3fb371b3a66481be077453f1b65ce2e859030f87494fc4640b983077a9b8b294cd28a734a781b1fb44de40cda8b180c04573491a9
 EBUILD sun-jre-bin-1.6.0.34.ebuild 3385 SHA256 f5f80aa665e4206ea332b79f6fe55c053316a97da40235d4d914a56fc61bf91a SHA512 c883f44c32aeeb646a50c7ed7de983767c3ff13b325b9bd22282b2fb276a1966e295aa984ed13b9072a714b094e0af9c56a8445c008937ab902fc4c46a0bb0e2 WHIRLPOOL ae386e5200a0735addf3ad08ce9ca1af7267f550995bee56a87b2579f01aaae8efccee28c65f9ecac26f70f0af593455471c3e244b456b436ba1f3c0b3479853
 MISC ChangeLog 2073 SHA256 b75bc4fe52c4e06312c17803231026a4b48ad2e145538a82d2ca531b8cdc25f3 SHA512 c849df1047454ed214a4973154e3c24f83fdada2a33e7c43241572ceb1f834de56a474f00b9716c946c6c3baed19b2091d9ce01ece1c9c00b6073d67514ff53c WHIRLPOOL 24a81e5c3c8f1995942a12c253a78cee03f2ab94e3a3443ce76a72d548cb7cde5b31a1787dd53f4ecba3800f52bb511817b8a1d7088a83ed77d251403bb5799f
 MISC metadata.xml 349 SHA256 fe0ef52d77b220fb36e9c39d2148bf03ec11223d80320cdc066c0fa723a1ae7d SHA512 d569a3be38e37e914c91e6b548a1f8c96665da723a0d11cf02dc431a521898f5e29fecaf015b9f9df2285aec050c0ac06760fdcde63892082a095e9fc17fa024 WHIRLPOOL a94d594ec778384561dd79509d729d20ca6584ceb05f85ddcf178b12b6799ddf61cdb7513bc74f0ea4d88711e5325a3a33486c892ec05c63929e5dfbdcdd13e4
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.30.ebuild
@ -1,113 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.22.ebuild,v 1.3 2010/10/13 11:24:06 hwoarang Exp $
 inherit versionator pax-utils eutils java-vm-2
 MY_PVR="$(replace_version_separator 3 _)"
 MY_PV="$(replace_all_version_separators _ )"
 MY_PVS="$(get_version_component_range 2)u$(get_version_component_range 4)"
 BUILD="12"
 BUILDDATE="10_nov_2011"
 SUFFIX=".tar.gz"
 ARMV5_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-sflt-eabi-headless-${BUILDDATE}${SUFFIX}"
 ARMV6_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-vfp-eabi-headless-${BUILDDATE}${SUFFIX}"
 ARMV7_AT="ejre-${MY_PV}-fcs-b${BUILD}-linux-arm-vfp-eabi-headful-${BUILDDATE}${SUFFIX}"
 DESCRIPTION="Sun's Java SE Embedded Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/embedded/overview/index.html"
 URL_BASE="http://download.oracle.com/otn-pub/java/ejre/${MY_PVS}-b${BUILD}/"
 SRC_URI="arm? ( ${URL_BASE}/${ARMV5_AT} ${URL_BASE}/${ARMV6_AT} ${URL_BASE}/${ARMV7_AT} )"
 SLOT="1.6"
 LICENSE="ejre-6"
 KEYWORDS="~arm"
 RESTRICT="strip fetch"
 IUSE="X jce odbc"
 DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
 RDEPEND="${DEPEND}
 	sys-libs/glibc
 	X? (
 		x11-libs/libXext
 		x11-libs/libX11
 	)
 	odbc? ( dev-db/unixODBC )"
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
 QA_TEXTRELS_ARM="opt/${P}/lib/arm/client/libjvm.so
 	opt/${P}/lib/arm/motif21/libmawt.so
 	opt/${P}/lib/arm/libdeploy.so
 	opt/${P}/lib/arm/server/libjvm.so"
 S="${WORKDIR}/ejre${MY_PVR}"
 src_unpack() {
 	einfo "Unpacking for arch ${CHOST/-*/}"
 	if [[ ${CHOST/-*/} = "armv5tel" ]]; then
 		unpack ${ARMV5_AT}
 	elif [[ ${CHOST/-*/} = "armv6j" ]]; then
 		unpack ${ARMV6_AT}
 	elif [[ ${CHOST/-*/} = "armv7a" ]]; then
 		unpack ${ARMV7_AT}
 	fi
 }
 src_compile() {
 	# Set PaX markings on all JDK/JRE executables to allow code-generation on
 	# the heap by the JIT compiler. This has to be done before CDS - #215225
 	pax-mark m $(list-paxables "${S}"/bin/*)
 	# see bug #207282
 	if use arm; then
 		einfo "Creating the Class Data Sharing archives"
 		"${S}"/bin/java -client -Xshare:dump || die
 	#	"${S}"/bin/java -server -Xshare:dump || die
 	fi
 }
 src_install() {
 	local dirs="bin lib"
 	dodir /opt/${P}
 	cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
 	dodoc README COPYRIGHT THIRDPARTYLICENSEREADME.txt || die
 	dodir /opt/${P}/share/
 	if use jce; then
 		cd "${D}/opt/${P}/lib/security"
 		dodir /opt/${P}/lib/security/strong-jce
 		mv "${D}"/opt/${P}/lib/security/US_export_policy.jar \
 			"${D}"/opt/${P}/lib/security/strong-jce || die
 		mv "${D}"/opt/${P}/lib/security/local_policy.jar \
 			"${D}"/opt/${P}/lib/security/strong-jce || die
 		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/lib/security/
 		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/lib/security/
 	fi
 	# bug #56444
 	insinto /opt/${P}/lib/
 	newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
 	set_java_env
 	java-vm_revdep-mask
 }
 pkg_postinst() {
 	# Set as default VM if none exists
 	java-vm-2_pkg_postinst
 }
 pkg_nofetch() {
 	einfo "This files require you to register at ${HOMEPAGE} (free account)"
 	einfo "Please download following file:"
 	einfo " - ${ARMV5_AT} - ${ARMV6_AT} - ${ARMV7_AT}"
 	einfo "from ${HOMEPAGE}"
 	einfo "and place them into ${DISTDIR}"
 }
--- a/dev-libs/dietlibc/ChangeLog
+++ b/dev-libs/dietlibc/ChangeLog
@ -1,396 +0,0 @@
 # ChangeLog for dev-libs/dietlibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/ChangeLog,v 1.88 2011/11/20 09:20:49 xarthisius Exp $
  13 Dec 2011; Mario Fetka <mario.fetka@gmail.com> dietlibc-9999.ebuild:
  add ln for ARCH -> CHOST
 *dietlibc-9999 (13 Dec 2011)
  13 Dec 2011; Mario Fetka <mario.fetka@gmail.com>
  -dietlibc-0.33_pre20110403.ebuild, +dietlibc-9999.ebuild,
  -files/arm-binutils-fix.patch:
  move to love ebuild for arm
  13 Dec 2011; Mario Fetka <mario.fetka@gmail.com>
  dietlibc-0.33_pre20110403.ebuild:
  add arm binutils fix
  20 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> dietlibc-0.28.ebuild,
  dietlibc-0.30-r2.ebuild, dietlibc-0.30.ebuild,
  dietlibc-0.33_pre20100626.ebuild, dietlibc-0.33_pre20110403.ebuild:
  ppc/ppc64 keywords dropped wrt #364103
  12 Jul 2011; Mike Frysinger <vapier@gentoo.org> dietlibc-0.28.ebuild:
  Convert from old `test_flag` to new `test-flag`.
  14 May 2011; Benedikt Böhm <hollow@gentoo.org>
  dietlibc-0.33_pre20100626.ebuild:
  use Gentoo mirrors for custom snapshot
  06 May 2011; Guy Martin <gmsoft@gentoo.org>
  dietlibc-0.33_pre20110403.ebuild:
  Marking -hppa as it doesn't build.
  02 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
  dietlibc-0.33_pre20110403.ebuild:
  x86 stable wrt bug #364103
  01 May 2011; Markos Chandras <hwoarang@gentoo.org>
  dietlibc-0.33_pre20110403.ebuild:
  Stable on amd64 wrt bug #364103
 *dietlibc-0.33_pre20110403 (03 Apr 2011)
  03 Apr 2011; Benedikt Böhm <hollow@gentoo.org>
  -dietlibc-0.33_pre20090721.ebuild, +dietlibc-0.33_pre20110403.ebuild:
  new snapshot with many fixes and clean cross compile support for previous
  rename-patches
 *dietlibc-0.33_pre20100626 (26 Jun 2010)
  26 Jun 2010; Benedikt Böhm <hollow@gentoo.org>
  dietlibc-0.33_pre20090721.ebuild, +dietlibc-0.33_pre20100626.ebuild:
  fix -nopie wrt #325539
  24 Aug 2009; Benedikt Böhm <hollow@gentoo.org>
  -dietlibc-0.32_pre20081116.ebuild, dietlibc-0.33_pre20090721.ebuild:
  fix #111880 (again)
 *dietlibc-0.33_pre20090721 (10 Aug 2009)
  10 Aug 2009; Benedikt Böhm <hollow@gentoo.org>
  -dietlibc-0.31_pre20070503.ebuild, -dietlibc-0.31_pre20070612.ebuild,
  -dietlibc-0.32_pre20080829.ebuild, -dietlibc-0.32.ebuild,
  +dietlibc-0.33_pre20090721.ebuild:
  version bump
 *dietlibc-0.32 (10 Aug 2009)
  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> +dietlibc-0.32.ebuild:
  Version bump.
 *dietlibc-0.32_pre20081116 (16 Nov 2008)
  16 Nov 2008; Benedikt Böhm <hollow@gentoo.org>
  +dietlibc-0.32_pre20081116.ebuild:
  new snapshot, fixes #227793
  03 Sep 2008; Benedikt Böhm <hollow@gentoo.org>
  dietlibc-0.32_pre20080829.ebuild:
  fix #236417
 *dietlibc-0.32_pre20080829 (29 Aug 2008)
  29 Aug 2008; Benedikt Böhm <hollow@gentoo.org>
  +dietlibc-0.32_pre20080829.ebuild:
  new snapshot wrt #227429
  14 Mar 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
  fix metadata
 *dietlibc-0.31_pre20070612 (12 Jun 2007)
  12 Jun 2007; Benedikt Böhm <hollow@gentoo.org>
  -dietlibc-0.31_pre20070611.ebuild, +dietlibc-0.31_pre20070612.ebuild:
  another prerelease; should fix #181261
 *dietlibc-0.31_pre20070611 (11 Jun 2007)
  11 Jun 2007; Benedikt Böhm <hollow@gentoo.org>
  +dietlibc-0.31_pre20070611.ebuild:
  custom tarball with patches already included, see
  http://svn.linux-vserver.org/projects/dietlibc/
  23 May 2007; Raúl Porcel <armin76@gentoo.org> dietlibc-0.30-r2.ebuild:
  alpha stable wrt #179408
  23 May 2007; Jeroen Roovers <jer@gentoo.org> dietlibc-0.30-r2.ebuild:
  Stable for HPPA (bug #179408).
  22 May 2007; Christian Heim <phreak@gentoo.org>
  dietlibc-0.31_pre20070503.ebuild:
  Removing the MAKEOPTS override, seems to work now.
 *dietlibc-0.31_pre20070503 (03 May 2007)
  03 May 2007; Benedikt Böhm <hollow@gentoo.org> -files/gcc-33.patch,
  -files/0.25-gcc34.patch, -dietlibc-0.25.ebuild, -dietlibc-0.29.ebuild,
  +dietlibc-0.31_pre20070503.ebuild:
  add pre release for new SSP stuff; remove old cruft where possible
  20 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
  dietlibc-0.30-r2.ebuild:
  Stable on sparc
  21 Jan 2007; Benedikt Böhm <hollow@gentoo.org> dietlibc-0.30-r2.ebuild:
  fix #163059
  20 Jan 2007; Christian Heim <phreak@gentoo.org> dietlibc-0.30-r2.ebuild:
  Moving dietlibc-0.30-r2 stable on amd64 and x86.
  16 Oct 2006; Jason Wever <weeve@gentoo.org> dietlibc-0.30.ebuild:
  Stable on SPARC.
  24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> dietlibc-0.30.ebuild:
  Stable on ppc.
 *dietlibc-0.30-r2 (08 Sep 2006)
  08 Sep 2006; Benedikt Böhm <hollow@gentoo.org> -dietlibc-0.30-r1.ebuild,
  +dietlibc-0.30-r2.ebuild:
  and hopefully fix PIC mess on x86 too
 *dietlibc-0.30-r1 (07 Sep 2006)
  07 Sep 2006; Benedikt Böhm <hollow@gentoo.org> +dietlibc-0.30-r1.ebuild:
  hopefully fix SSP/PIE/STACKGAP mess (also fixes #138468); fix executable
  stacks; fix CFLAGS handling
  04 Sep 2006; Joshua Jackson <tsunam@gentoo.org> dietlibc-0.30.ebuild:
  Stable x86; bug #140905
 *dietlibc-0.30 (22 Jun 2006)
  22 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
  -dietlibc-0.30_pre20060501-r1.ebuild, -dietlibc-0.30_pre20060621.ebuild,
  +dietlibc-0.30.ebuild:
  version bump
 *dietlibc-0.30_pre20060621 (21 Jun 2006)
  21 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
  +dietlibc-0.30_pre20060621.ebuild:
  new cvs snapshot
 *dietlibc-0.30_pre20060501-r1 (03 May 2006)
  03 May 2006; Benedikt Böhm <hollow@gentoo.org>
  -dietlibc-0.30_pre20060501.ebuild, +dietlibc-0.30_pre20060501-r1.ebuild:
  fix ppc rename patch
 *dietlibc-0.30_pre20060501 (02 May 2006)
  02 May 2006; Benedikt Böhm <hollow@gentoo.org> -files/gcc-33-r2.patch,
  -dietlibc-0.27.ebuild, -dietlibc-0.29-r1.ebuild,
  +dietlibc-0.30_pre20060501.ebuild:
  new cvs snapshot; should fix 114796 + 111880; cleanup
  11 Apr 2006; Christian Heim <phreak@gentoo.org> dietlibc-0.29-r1.ebuild:
  Fixing SRC_URI, cleaning up the patch-mess; Logic cleanup
 *dietlibc-0.29-r1 (06 Apr 2006)
  06 Apr 2006; Christian Heim <phreak@gentoo.org> +dietlibc-0.29-r1.ebuild:
  Adding a reworked ebuild; need to get other arches to test the ebuild
  07 Jan 2006; Christian Heim <phreak@gentoo.org> metadata.xml:
  Updating Copyright header, dev-libs/dietlibc is now managed by vserver-devs@g.o
  24 Dec 2005; Simon Stelling <blubb@gentoo.org> dietlibc-0.28.ebuild:
  stable on amd64
 *dietlibc-0.29 (04 Sep 2005)
  04 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> +dietlibc-0.29.ebuild:
  Bumped version and fixed compilation on 32-bit userland with 64-bit kernel on
  ppc.
  07 Aug 2005; Jason Wever <weeve@gentoo.org> dietlibc-0.28.ebuild:
  Stable on SPARC.
  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> dietlibc-0.28.ebuild:
  Stable on alpha.
  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
  dietlibc-0.28.ebuild:
  ppc stable
  20 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> dietlibc-0.28.ebuild:
  Stable on hppa. Added fix for hppa of not available gcc option.
  20 Jul 2005; Markus Rothe <corsair@gentoo.org> dietlibc-0.28.ebuild:
  Stable on ppc64
  12 Jul 2005; <solar.@gentoo.org> dietlibc-0.28.ebuild:
  - marked 0.28 stable on x86
  16 May 2005; Daniel Black <dragonheart@gentoo.org> dietlibc-0.25.ebuild,
  dietlibc-0.27.ebuild, dietlibc-0.28.ebuild:
  removed gcc.eclass usage as per bug #92745.
  09 Apr 2005; Tom Gall <tgall@gentoo.org>
  dietlibc-0.27.ebuild:
  stable on ppc64
 *dietlibc-0.28 (08 Mar 2005)
  08 Mar 2005; Mike Frysinger <vapier@gentoo.org>
  +files/dietlibc-0.28-Makefile.patch, +files/gcc-33-r3.patch,
  +dietlibc-0.28.ebuild:
  Version bump.
  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> dietlibc-0.25.ebuild:
  Stable on alpha.
  27 Dec 2004; Markus Rothe <corsair@gentoo.org> dietlibc-0.27.ebuild:
  Added ~ppc64 to KEYWORDS
  05 Dec 2004; <solar@gentoo.org> files/ssp.c, dietlibc-0.27.ebuild:
  - Fixed misc ssp problems introduced from dietlibc-0.26-r1 -> dietlibc-0.27-r0
  which were causing genkernel failures for hardened users. bug #73112
  14 Oct 2004; Guy Martin <gmsoft@gentoo.org> dietlibc-0.25.ebuild:
  Stable on hppa.
 *dietlibc-0.27 (01 Oct 2004)
  01 Oct 2004; Robin H. Johnson <robbat2@gentoo.org> +files/gcc-33-r2.patch,
  +dietlibc-0.27.ebuild:
  Version bump, add debug support, do CFLAGS properly, do gcc3[34] patch
  properly, ssp.c merged upstream, mips in unstable, and add cross-compile
  stuff.
 *dietlibc-0.26-r1 (21 Aug 2004)
  21 Aug 2004; <solar@gentoo.org> files/dietlibc-0.26-ssp.patch,
  dietlibc-0.26-r1.ebuild:
  more patch work needed for ssp on sparc/sparc64. sparc64 is building sparc32
  crt files. x86_64 seems more like a gcc-3.4.x compile problem. For now we will
  only patch for x86
  13 Aug 2004; Jason Wever <weeve@gentoo.org> dietlibc-0.25.ebuild:
  Stable on sparc.
  07 Aug 2004; <solar@gentoo.org> :
  Made dietlibc propolice/ssp aware on arches sparc/sparc64/x86_64/i386. Also
  made feeble attempt to version bump to 0.27 but that failed something fierce
  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> dietlibc-0.23.ebuild:
  || die for sparc's make in src_compile().
 *dietlibc-0.26 (18 Jul 2004)
  18 Jul 2004; Daniel Black <dragonheart@gentoo.org> +dietlibc-0.26.ebuild
  dietlibc-0.24.ebuild, dietlibc-0.25.ebuild:
  version bump as per bug #54790. May not work properly. No 3.4 patch applied -
  wasn't sure if necessary. x86 stable for 0.24 and 0.25
  01 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/0.25-gcc34.patch,
  dietlibc-0.25.ebuild:
  Add gcc-3.4 patch #51053 by Imad R. Faiad.
 *dietlibc-0.25 (29 May 2004)
  29 May 2004; Travis Tilley <lv@gentoo.org> +dietlibc-0.25.ebuild:
  version bump - works with gcc 3.4
  25 Mar 2004; Jason Wever <weeve@gentoo.org> dietlibc-0.24.ebuild:
  Added fix for bug #45716.
  25 Mar 2004; Jason Wever <weeve@gentoo.org> dietlibc-0.24.ebuild,
  files/dietlibc-sparc64-makefile.patch:
  Fix for bug #45601 and adjusted Makefile so that the usage of the sparc32
  command isn't needed anymore.
  19 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> dietlibc-0.23.ebuild,
  dietlibc-0.24.ebuild, files/gcc-33.patch:
  add patch from Frank Eibisch to correct wrapper not to use old options for gcc
  3 (bug #41763); some repoman cleanup
  17 Feb 2004; David Holm <dholm@gentoo.org> dietlibc-0.24.ebuild:
  Added to ~ppc.
  14 Dec 2003; Alexander Gabert <pappy@gentoo.org> dietlibc-0.24.ebuild:
  added filter-flags logic for propolice
  06 Dec 2003; Jason Wever <weeve@gentoo.org> dietlibc-0.22-r2.ebuild,
  dietlibc-0.23.ebuild, dietlibc-0.24.ebuild:
  Marked stable on sparc.
  22 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dietlibc-0.24.ebuild:
  inherit fixheadtails and do ht_fix_all (bug 34125)
 *dietlibc-0.24 (21 Nov 2003)
  21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dietlibc-0.24.ebuild,
  files/0.24-dirent-prototype.patch:
  version bump
  21 Oct 2003; <solar@gentoo.org> dietlibc-0.23.ebuild:
  bumping 0.23 to stable on x86 per request, and added a metadata.xml
  07 Oct 2003; Jason Wever <weeve@gentoo.org> dietlibc-0.22-r2.ebuild,
  dietlibc-0.23.ebuild:
  Ebuild touchups for sparc because of new rev of sys-devel/sparc32
  29 Sep 2003; Jason Wever <weeve@gentoo.org> dietlibc-0.22-r2.ebuild,
  dietlibc-0.23.ebuild:
  Added sparc64 fix for bug #27171.
 *dietlibc-0.23 (12 Sep 2003)
  20 Dec 2003; Guy Martin <gmsoft@gentoo.org> dietlibc-0.23.ebuild,
  files/dietlibc-0.23-hppa.patch:
  Added hppa patch. Fix #32701.
  12 Sep 2003; <solar@gentoo.org> dietlibc-0.23.ebuild,
  files/0.23-dirent-prototype.patch:
  version bump, this release fixes a ton of outstanding bugs upstream. seems the
  dirent patch never made it's way back to fefe.de, new gentoo dirent patch
  created to keep offsets happy.
  11 Aug 2003; Will Woods <wwoods@gentoo.org> dietlibc-0.22-r2.ebuild:
  Marked stable for alpha
  25 May 2003; Martin Holzer <mholzer@gentoo.org> dietlibc-0.20.ebuild,
  dietlibc-0.21.ebuild, dietlibc-0.22-r1.ebuild, dietlibc-0.22-r2.ebuild,
  dietlibc-0.22.ebuild:
  now uses mirror://kernel
 *dietlibc-0.22-r2 (14 May 2003)
  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
  Added a small prototype patch ... prototypes used 'long int' while
  actual function used 'off_t' ... set them both to 'off_t'.
  14 May 2003; John Mylchreest <johnm@gentoo.org> dietlibc-0.22-r2.ebuild:
  Updated dietlibc to compile with -fstack-protector
 *dietlibc-0.22-r1 (30 Mar 2003)
  30 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> dietlibc-0.22-r1.ebuild :
  Forgot to apply a patch. Applied patch is from Debian's dietblic-0.22-2 release.
 *dietlibc-0.22 (28 Mar 2003)
  28 Mar 2003; Guy Martin <gmsoft@gentoo.org> dietlibc-0.22.ebuild :
  Added ~hppa to KEYWORDS.
  28 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> dietlibc-0.22.ebuild :
  Security update.
  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 *dietlibc-0.21 (29 Oct 2002)
  29 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
  Version bump. Ebuild contributed by fridtjof@fbunet.de, ppc patch by 
  Nicolas Kaiser <nikai@nikai.net>. All in #9484
 *dietlibc-0.20 (27 Sep 2002)
  Version bump that includes security fix. Ebuild contributed by fridtjof@fbunet.de.
 *dietlibc-0.16 (29 Mar 2002)
  29 Mar 2002; Thilo Bangert <bangert@gentoo.org> ChangeLog :
  completely reworked ebuild
 *dietlibc-0.16 (28 Mar 2002)
  28 Mar 2002; Thilo Bangert <bangert@gentoo.org> ChangeLog :
  bumped version, use emake || die instead of try make
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@ -1,3 +0,0 @@
 EBUILD dietlibc-9999.ebuild 1775 SHA256 da17bcf2c28dc2e69e822da809f589557ed79fb0e88ddaae8897ffb0c75b8425 SHA512 19042c5db8d1d4ebac5feb290afc9901d02f25f150609b540289bf502c1492c47f602bb3825e5d98bcd13d78d381e89fc4297e7a13de569cea101fc6e43de7f0 WHIRLPOOL dec8e9db78d0e5497240fb3ed3e4b5aa08c6ce3cce69960d78c40f05101c3a23ecceea0f95da38924b994863c739c7839e9d48ecaf22f741f9ce259d0f68f76e
 MISC ChangeLog 13490 SHA256 fd8235170697fdbce668e217c3eb930e5f6bafff9824f5293d64e89044462ebc SHA512 13e7d6ef38008839525c1ee06e85cf438f8be40daa358ba11f0db13b0b2d724d097fb70103fe6b334ecbe4f0ce894389a429914db96c371eef9dd1cf56db917a WHIRLPOOL 7fd1b8301fd3df570db48aa34ff72675f8ffe5eaa25cfa90a088d58b80b9a5dce906ab47a288e9dd2efc00f74d37dddc41d1e2c7898821d79df9caa1ef890ed3
 MISC metadata.xml 410 SHA256 3fc38345f9430d71c6369f84fc1b6248bc8aa0ec74cb4ae5b2797fe01cf48721 SHA512 d0819fcafbbc30e86adb68974c4bf0a09dc049a46a264647e05aa7b2f41543ac7c6fd0e206e73720404f0392cbd55b2736cbb54d63486882d439b8801a3b7547 WHIRLPOOL 1e559e60d0e43f84d18bac49ef2f338257d723fc4531d767c5f3d13511a790bbe94a93f0c60436aa86375cdb1df897e8e2fa58fc2cf8575b6a2da335721b6090
--- a/dev-libs/dietlibc/dietlibc-9999.ebuild
+++ b/dev-libs/dietlibc/dietlibc-9999.ebuild
@ -1,73 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/dietlibc/dietlibc-0.33_pre20110403.ebuild,v 1.5 2011/11/20 09:20:49 xarthisius Exp $
 EAPI="3"
 EGIT_REPO_URI="https://github.com/ensc/dietlibc.git"
 inherit eutils flag-o-matic toolchain-funcs git-2
 DESCRIPTION="A libc optimized for small size"
 HOMEPAGE="http://www.fefe.de/dietlibc/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm"
 IUSE="debug"
 DEPEND=""
 RDEPEND=""
 #S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
 #S="${WORKDIR}/${MY_P}"
 DIETHOME=/usr/diet
 pkg_setup() {
 	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
 	use sparc && replace-sparc64-flags
 	# gcc-hppa suffers support for SSP, compilation will fail
 	use hppa && strip-unsupported-flags
 	# debug flags
 	use debug && append-flags -g
 	# Makefile does not append CFLAGS
 	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
 		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
 		-Wno-unused -Wredundant-decls -fno-strict-aliasing
 	# only use -nopie on archs that support it
 	gcc-specs-pie && append-flags -nopie
 }
 src_prepare() {
 	ln -sf bin-${ARCH} bin-${CHOST/-*/}
 }
 src_compile() {
 	emake prefix=${DIETHOME} \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		STRIP=":" \
 		|| die "make failed"
 }
 src_install() {
 	emake prefix=${DIETHOME} \
 		DESTDIR="${D}" \
 		install-bin \
 		install-headers \
 		|| die "make install failed"
 	# broken so add a workaround
 	ln -sf lib-${ARCH} ${DIETHOME}/lib-${CHOST/-*/}
 	dobin "${D}"${DIETHOME}/bin/* || die "dobin failed"
 	doman "${D}"${DIETHOME}/man/*/* || die "doman failed"
 	rm -r "${D}"${DIETHOME}/{man,bin}
 	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
 }
--- a/dev-libs/dietlibc/metadata.xml
+++ b/dev-libs/dietlibc/metadata.xml
@ -1,10 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vserver</herd>
 	<longdescription>
 		The diet libc is a libc that is optimized for small size.  It can be
 		used to create small statically linked binaries for Linux on alpha, arm,
 		hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.
 	</longdescription>
 </pkgmetadata>
--- a/dev-libs/pth/ChangeLog
+++ b/dev-libs/pth/ChangeLog
@ -1,261 +0,0 @@
 # ChangeLog for dev-libs/pth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/pth/ChangeLog,v 1.69 2011/06/23 14:44:10 hwoarang Exp $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> pth-2.0.7-r3.ebuild:
  correct compare
  23 Jun 2011; Markos Chandras <hwoarang@gentoo.org> -pth-2.0.7-r2.ebuild:
  Remove old ebuilds. Requested by Arfrever
  21 May 2011; Kacper Kowalik <xarthisius@gentoo.org> pth-2.0.7-r3.ebuild:
  ppc/ppc64 stable wrt #366665
  21 May 2011; Raúl Porcel <armin76@gentoo.org> pth-2.0.7-r3.ebuild:
  alpha/m68k/s390/sh/sparc/x86 stable wrt #366665
  13 May 2011; Jeroen Roovers <jer@gentoo.org> pth-2.0.7-r3.ebuild:
  Stable for HPPA (bug #366665).
  11 May 2011; Markos Chandras <hwoarang@gentoo.org> pth-2.0.7-r3.ebuild:
  Stable on amd64 wrt bug #366665
 *pth-2.0.7-r3 (09 Apr 2011)
  09 Apr 2011; Raúl Porcel <armin76@gentoo.org> +pth-2.0.7-r3.ebuild,
  +files/pth-2.0.7-ia64.patch:
  Add a new revision that provides a workaround for bug #350815, and a patch
  for ia64. Straight to stable for arm/ia64/sh
  25 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
  -pth-2.0.7.ebuild, -pth-2.0.7-r1.ebuild:
  Delete.
  12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
  pth-2.0.7-r2.ebuild:
  Copy stable keywords from 2.0.7-r1. Changes introduced in 2.0.7-r2 don't
  affect installed files and there shouldn't have been revision bump.
 *pth-2.0.7-r2 (13 Dec 2010)
  13 Dec 2010; Dane Smith <c1pher@gentoo.org> +pth-2.0.7-r2.ebuild,
  +files/pth-2.0.7-parallel-install.patch:
  New patch pth-2.0.7-parallel-install.patch addresses the parallel install
  problem starting in 2.0.7.
  Revbump to -r2 applies patch and removes the need to emake -j1 for
  install. 
  Also fixes the implicit RDEPEND="${DEPEND}" warning in repoman.
  Fixed the headers for 2.0.7 ad 2.0.7-r1.
  15 Jan 2008; Mike Frysinger <vapier@gentoo.org> pth-2.0.7-r1.ebuild:
  Use `emake -j1` when installing rather than `make`.
 *pth-2.0.7-r1 (14 Jan 2008)
  14 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> +pth-2.0.7-r1.ebuild:
  --disable-debug actually removed shared libraries, bug#205875, thanks to drac
  14 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> pth-2.0.7.ebuild:
  Add debug USE flag
  28 Sep 2007; Alon Bar-Lev <alonbl@gentoo.org>
  -files/pth-1.4.0-sigstack.patch, -files/pth-2.0.3-m4.patch,
  -pth-1.4.0.ebuild, -pth-2.0.3.ebuild, -pth-2.0.5.ebuild,
  -pth-2.0.6.ebuild:
  Cleanup
  28 Sep 2007; Joshua Kinard <kumba@gentoo.org> pth-2.0.7.ebuild:
  Stable on mips, per #193894.
  27 Sep 2007; Jeroen Roovers <jer@gentoo.org> pth-2.0.7.ebuild:
  Stable for HPPA (bug #193894).
  25 Aug 2007; Steve Dibb <beandog@gentoo.org> pth-2.0.6.ebuild,
  pth-2.0.7.ebuild:
  amd64 stable
  13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> pth-2.0.7.ebuild:
  ppc. stable
  22 Jul 2007; Tom Gall <tgall@gentoo.org> pth-2.0.7.ebuild:
  stable on ppc64
  12 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> pth-2.0.7.ebuild:
  Stable on sparc
  03 Jul 2007; Raúl Porcel <armin76@gentoo.org> pth-2.0.7.ebuild:
  alpha/ia64/x86 stable
  01 May 2007; Alon Bar-Lev <alonbl@gentoo.org> pth-2.0.7.ebuild:
  Fix header
  24 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> pth-2.0.6.ebuild:
  Stable on sparc
 *pth-2.0.7 (23 Apr 2007)
  23 Apr 2007; Alon Bar-Lev <alonbl@gentoo.org> +pth-2.0.7.ebuild:
  Version bump, bug#175771
  23 Apr 2007; Raúl Porcel <armin76@gentoo.org> pth-2.0.6.ebuild:
  ia64 + x86 stable
  13 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> pth-2.0.3.ebuild:
  Stable on sparc
  12 Mar 2007; Raúl Porcel <armin76@gentoo.org> pth-2.0.3.ebuild:
  x86 stable
  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
  Transition to Manifest2.
  27 Oct 2006; Fabian Groffen <grobian@gentoo.org> pth-1.4.0.ebuild,
  pth-2.0.3.ebuild, pth-2.0.5.ebuild, pth-2.0.6.ebuild:
  Dropped ppc-macos keyword, see you in prefix.
  23 Sep 2006; Daniel Black <dragonheart@gentoo.org>
  +files/pth-1.4.0-sigstack.patch, +files/pth-2.0.6-sigstack.patch,
  pth-1.4.0.ebuild, pth-2.0.6.ebuild:
  patch to fix hanging checking for sigstack.(bug #131234 and bug #139000).
  Thanks to reports by nmonkee and Miro Bogner. Patches thanks to Alon Bar-Lev
  16 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> pth-2.0.3.ebuild:
  ppc stable
  17 May 2006; Diego Pettenò <flameeyes@gentoo.org> pth-2.0.6.ebuild:
  Add ~x86-fbsd keyword.
  07 May 2006; Simon Stelling <blubb@gentoo.org> pth-2.0.3.ebuild:
  stable on amd64
  28 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
  +files/pth-2.0.6-ldflags.patch, pth-2.0.6.ebuild:
  Add patch to respect ldflags and run elibtoolize, bug #127916.
 *pth-2.0.6 (06 Feb 2006)
  06 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -pth-2.0.4.ebuild,
  +pth-2.0.6.ebuild:
  2.0.6 version bump for bug 121726. Thanks to Ryan Hill <dirtyepic dot sk at
  gmail dot com>.
  22 Jan 2006; Caleb Tennis <caleb@gentoo.org> -pth-1.4.1.ebuild:
  Removing package masked version old version
 *pth-2.0.5 (07 Nov 2005)
  07 Nov 2005; Daniel Black <dragonheart@gentoo.org>
  +files/pth-2.0.5-parallelfix.patch, +pth-2.0.5.ebuild:
  version bump - bug #110232 thanks to emanuele.giaquinta and Marcelo
  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> pth-2.0.3.ebuild:
  Mark 2.0.3 stable on alpha
  06 Sep 2005; Markus Rothe <corsair@gentoo.org> pth-2.0.3.ebuild:
  Stable on ppc64
 *pth-2.0.4 (02 Sep 2005)
  02 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +pth-2.0.4.ebuild:
  Version bump. m4 patch in upstream.
  31 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> pth-2.0.3.ebuild:
  Added ~mips for bug 79171.
  25 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> pth-1.4.0.ebuild,
  pth-1.4.1.ebuild:
  Replacing pow10 with math_pow10 and round with math_round in pth_string.c to
  fix warnings.
  09 Feb 2005; Daniel Black <dragonheart@gentoo.org> pth-2.0.3.ebuild:
  gawk problem fixed enabling full locale
  23 Jan 2005; Daniel Black <dragonheart@gentoo.org> pth-2.0.3.ebuild:
  Added LC_ALL=C to pth_p.h compile as per bug #78749. Thanks to Fabio Coatti
  <cova@ferrara.linux.it>.
  22 Jan 2005; <plasmaroo@gentoo.org> pth-2.0.3.ebuild:
  Marking stable on IA64; bug #72897.
  22 Jan 2005; Scott W Taylor <swtaylor@gentoo.org> pth-2.0.3.ebuild:
  pth_p.h was being built wrong from other locales. closes bug 78749
 *pth-2.0.3 (20 Jan 2005)
  20 Jan 2005; Daniel Black <dragonheart@gentoo.org> -pth-2.0.2.ebuild,
  +pth-2.0.3.ebuild:
  Version bump to fix bug #78219. Broken 2.0.2 version removed. Thanks to Felix
  Riemann <felix@hsgheli.de>
  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
  Change encoding to UTF-8 for GLEP 31 compliance
  20 Dec 2004; Markus Rothe <corsair@gentoo.org> pth-1.4.0.ebuild,
  pth-1.4.1.ebuild, pth-2.0.2.ebuild:
  added (~)ppc64 keywords
  30 Nov 2004; Sven Wegener <swegener@gentoo.org> pth-1.4.0.ebuild,
  pth-1.4.1.ebuild, pth-2.0.2.ebuild:
  Changed SRC_URI to use mirror:// syntax and ${PN}/${P} variables. Version
  2.0.2 is not parallel build safe, appended -j1 to emake. Closes bug #72898.
  Fixed obsolete head -1 syntax in configure script. Fixed digest for 1.4.1.
 *pth-2.0.2 (30 Nov 2004)
  30 Nov 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
  pth-1.4.1.ebuild, +pth-2.0.2.ebuild:
  added missing ~alpha keyword to 1.4.1. Version bump.
  11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> pth-1.4.0.ebuild:
  Added to ppc-macos.
  25 Aug 2004; Travis Tilley <lv@gentoo.org> pth-1.4.0.ebuild:
  stable on amd64
  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> pth-1.4.0.ebuild,
  pth-1.4.1.ebuild:
  virtual/glibc -> virtual/libc
  08 Jun 2004; Guy Martin <gmsoft@gentoo.org> pth-1.4.0.ebuild,
  pth-1.4.1.ebuild:
  Marked stable on hppa.
  26 May 2004; Jason Eric Huebel <jhuebel@gentoo.org> pth-1.4.1.ebuild:
  ~amd64, added gnuconfig_update
  23 May 2004; Bryan Østergaard <kloeri@gentoo.org> pth-1.4.0.ebuild:
  Stable on alpha.
  20 May 2004; <paul@gentoo.org> pth-1.4.0.ebuild:
  Make it work with amd64. It is needed for making the newpg that has gpg-agent
  working
  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> pth-1.4.0.ebuild:
  Add ~alpha
  05 Mar 2003; Bartosch Pixa <darkspecter@gentoo.org> pth-1.4.1.ebuild:
  set ~ppc in keywords
  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 *pth-1.4.0 (13 Nov 2002)
  13 Nov 2002; Bart Verwilst <verwilst@gentoo.org>:
  Re-added 1.4.0, and masked 1.4.1, since it b0rks jabber-server :$
 *pth-1.4.1 (1 Oct 2002)
  01 Oct 2002; Bart Verwilst <verwilst@gentoo.org>:
  New version, bugfix release
 *pth-1.4.0 (1 Feb 2002)
  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
  Added initial ChangeLog which should be updated whenever the package is
  updated in any way. This changelog is targetted to users. This means that the
  comments should well explained and written in clean English. The details about
  writing correct changelogs are explained in the skel.ChangeLog file which you
  can find in the root directory of the portage repository.
--- a/dev-libs/pth/Manifest
+++ b/dev-libs/pth/Manifest
@ -1,9 +0,0 @@
 AUX pth-2.0.5-parallelfix.patch 415 SHA256 f005fbb328c8fc82624c2968da037189f39d0957b759432a3ec20f6f691325f5 SHA512 a294f725dff68f887540bcdd1b8d8b76ca7b3ce2d0d10ad9b93d9eece83c05d4d1e98095af85d37ae2070049bf12efd4d02d1306a5b20d12b5656a81abe75868 WHIRLPOOL 63ddde1afd253245d3cdb1aa76be6a5875f9e09e5cbb3e9a3b1e766f6ab2c1b253c05f0c41bee8c2aef52038e5774501bc56ee422f1f7d508a59df3f1dc98d63
 AUX pth-2.0.6-ldflags.patch 813 SHA256 ed366b2f28a458e2d718dc3a90f54a91a478a8e3f64ee6e4fa3c8a7d7693bd9c SHA512 099c8221d0011dd5284a96d216ed5315619ae377c3c0a01d15af2976aec57e286166601740b139852f340b36fdc7c5ce62f69faf268d6feaabe70db2bbfdf372 WHIRLPOOL a73438ba84865e9aecf7c9a839eee59803f59685a5ab35498004cb0a333fadc0a84841ee10cf0bdb62c0068e11aaea21f131ec14067d2b1a8e804394c7ee441b
 AUX pth-2.0.6-sigstack.patch 820 SHA256 b1f090242535640fc6518796b162d108c8436551f4e6bb43fd7cb8c9e916a868 SHA512 0011405ae5e8371390adb2a718277d675db5bc085fe5c5f6054ba1bb08f2276d9e5f4d5c083e833417893173210b1e791a2d0f0a9b6d13194f11c9f587397635 WHIRLPOOL c7d5bd555c01124ddeea8b96fd8816fe3e28fd50b4becd3f82d69459b03d5da721dfaaa4afa164b4747bf4b278e887bfe660a6e6e04c1ab42dd071a08ef8727e
 AUX pth-2.0.7-ia64.patch 1207 SHA256 c4d2509cc218d0001081ce23796f0a4a22e8ccc8aa3b00ad14d80dfd50c1c073 SHA512 984edb59caca26081c0db48372b5035a2845087c5e93265486edbd03c1f262de8a18b04ad810756f6fc86cae2b6af551f65056a3bd45a675d30df07cd47875ac WHIRLPOOL 05d1454933d7aa08a0377dc088c72d0615112b6ea26f0b0a5d74a82ad3891f417a13e36ba7599f4d841d3558f829726cff52529123de75c6d6e57ffef971fa30
 AUX pth-2.0.7-parallel-install.patch 428 SHA256 92e5d8ada700573e0a68e2c30e418ae95b7dcc5a7429a963d3c9ea207205c0c3 SHA512 b9abcfbe02a275e19e7f4d7676d84bb8d78f4e7eda882efda0be697311efc09598b4d3f0128c8a8182cefd18e63400573cde46de62f5741433e155aefa8113c4 WHIRLPOOL df14957560978b555378a6db7ee2a2fd8ef074743be7c8b629bbda057559cbaf8ec77c8b1e4e23f52c7938cdc0dff9080c053482c30c6be14c05a2998d542b14
 DIST pth-2.0.7.tar.gz 652640 SHA256 72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232
 EBUILD pth-2.0.7-r3.ebuild 1480 SHA256 67c13325b6a23902255727f3c7df87d611e86f6e57f651b327a976cb6b429cf3 SHA512 0f409747ae30bce945248265892c2ecd2fb2a11d8ccc3efa60300fcba1fda584177d38e54c39b1d19acc8cbbfce94dca973b78ad8276e320feb9a893e997423b WHIRLPOOL 4d703149522585f2d33953d84dc8a7d46a03bad7ba2a8459cc47757e881f59f178269177ab19a7ee0543ea7706ce02be4adf6b7cf4499fd10b96ddece8a6f8c4
 MISC ChangeLog 9110 SHA256 c58504e02cf21526efe2becdaa78036a18b8bd2cfcbf4b28c255375e1aab149d SHA512 74b3022f849a55378e4acdf5effdcb89b77b492d294a5d8f23ae2285c20fb262f31a00c609e9ffce8f3b0997e022cbe418a084c221847a10dee3989cfc422c5d WHIRLPOOL d630fa4c1bcf5381c7333789e380c026002c21c1c9b52cec1f007f7f5981bd62ab3c052489d7d27a4627721dd885e961a0beea4e386c4a5a38fb3735e8db0c85
 MISC metadata.xml 224 SHA256 9e9ce661a9fdb45a535ad875a247b700a70745359b27533ec29a6a46fa708e86 SHA512 7bb810d3b17360a817b46ff4c9e72f227ccdac73cfa8c195a9387199f6673c010431696f559064ae98c847f17edeaa8cb723461b6ac3fa0507615740e1642cf6 WHIRLPOOL 52aee7dca1b6f5997df4acb32c2b7be88cf6ed6cddc6a210b469de9ea667373a9066967c64ad15ce5b4362aee7e0a030ef60970d47e6548d022b9d262d25018a
--- a/dev-libs/pth/files/pth-2.0.5-parallelfix.patch
+++ b/dev-libs/pth/files/pth-2.0.5-parallelfix.patch
@ -1,15 +0,0 @@
 --- Makefile.in.orig	2005-11-08 05:58:55.000000000 +1100
 +++ Makefile.in	2005-11-08 06:29:02.000000000 +1100
@@ -148,10 +148,9 @@
 #   be aware of libtool when building the objects
 .SUFFIXES:
 -.SUFFIXES: .c .o .lo
 -.c.o:
 +%.o: %.c $(TARGET_PREQ)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
 -.c.lo:
 +%.lo: %.c $(TARGET_PREQ)
 	$(LIBTOOL) --mode=compile --quiet $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
 #   the default target
--- a/dev-libs/pth/files/pth-2.0.6-ldflags.patch
+++ b/dev-libs/pth/files/pth-2.0.6-ldflags.patch
@ -1,17 +0,0 @@
 Index: pth-2.0.6/Makefile.in
 ===================================================================
 --- pth-2.0.6.orig/Makefile.in
 +++ pth-2.0.6/Makefile.in
@@ -168,10 +168,10 @@ pth_p.h: $(S)pth_p.h.in
 #   build the static and possibly shared libraries
 libpth.la: $(LOBJS)
 -	$(LIBTOOL) --mode=link --quiet $(CC) -o libpth.la $(LOBJS) \
 +	$(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o libpth.la $(LOBJS) \
 	-rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
 libpthread.la: pthread.lo $(LOBJS)
 -	$(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LOBJS) \
 +	$(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o libpthread.la pthread.lo $(LOBJS) \
 	-rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
 #   build the manual pages
--- a/dev-libs/pth/files/pth-2.0.6-sigstack.patch
+++ b/dev-libs/pth/files/pth-2.0.6-sigstack.patch
@ -1,22 +0,0 @@
 diff -urNp pth-2.0.6.old/aclocal.m4 pth-2.0.6/aclocal.m4
 --- pth-2.0.6.old/aclocal.m4	2004-12-31 21:33:19.000000000 +0200
 +++ pth-2.0.6/aclocal.m4	2006-09-20 14:46:59.000000000 +0300
@@ -1522,6 +1522,7 @@ int main(int argc, char *argv[])
     int sksize;
     char result[1024];
     int i;
 +exit (1);
     sksize = 32768;
     skbuf = (char *)malloc(sksize*2+2*sizeof(union alltypes));
     if (skbuf == NULL)
 diff -urNp pth-2.0.6.old/configure pth-2.0.6/configure
 --- pth-2.0.6.old/configure	2005-11-22 09:49:21.000000000 +0200
 +++ pth-2.0.6/configure	2006-09-20 14:55:23.000000000 +0300
@@ -24735,6 +24735,7 @@ int main(int argc, char *argv[])
     int sksize;
     char result[1024];
     int i;
 +exit (1);
     sksize = 32768;
     skbuf = (char *)malloc(sksize*2+2*sizeof(union alltypes));
     if (skbuf == NULL)
--- a/dev-libs/pth/files/pth-2.0.7-ia64.patch
+++ b/dev-libs/pth/files/pth-2.0.7-ia64.patch
@ -1,30 +0,0 @@
 # http://bugs.debian.org/225780
 diff -Naurp pth.orig/pth_sched.c pth/pth_sched.c
 --- pth.orig/pth_sched.c	2009-07-16 23:16:52.000000000 +0000
 +++ pth/pth_sched.c	2009-07-16 23:20:51.000000000 +0000
@@ -297,8 +297,15 @@ intern void *pth_scheduler(void *dummy)
         /*
          * Check for stack overflow
          */
 +#ifndef __ia64__
         if (pth_current->stackguard != NULL) {
             if (*pth_current->stackguard != 0xDEAD) {
 +#else
 +	      /* On ia64 the stack grows down but the bottom part is used for register
 +	       * backing store which grows up. So we check for a meet in the middle
 +	       */
 +		if (pth_current->mctx.uc.uc_mcontext.sc_gr[12] <= pth_current->mctx.uc.uc_mcontext.sc_ar_bsp) {
 +#endif
                 pth_debug3("pth_scheduler: stack overflow detected for thread 0x%lx (\"%s\")",
                            (unsigned long)pth_current, pth_current->name);
                 /*
@@ -324,7 +331,9 @@ intern void *pth_scheduler(void *dummy)
                 pth_current->state = PTH_STATE_DEAD;
                 kill(getpid(), SIGSEGV);
             }
 +#ifndef __ia64__
         }
 +#endif
         /*
          * If previous thread is now marked as dead, kick it out
--- a/dev-libs/pth/files/pth-2.0.7-parallel-install.patch
+++ b/dev-libs/pth/files/pth-2.0.7-parallel-install.patch
@ -1,12 +0,0 @@
 --- Makefile.in	2010-12-13 12:59:07.000000000 -0500
 +++ Makefile.new	2010-12-13 13:00:22.000000000 -0500
@@ -215,7 +215,8 @@
 #   install the package
 install: all-for-install
 -	@$(MAKE) $(MKFLAGS) install-dirs install-pth @INSTALL_PTHREAD@
 +	@$(MAKE) $(MKFLAGS) install-dirs 
 +	@$(MAKE) $(MKFLAGS) install-pth @INSTALL_PTHREAD@
 	@touch .done-install >/dev/null 2>&1 || $(TRUE)
 	@$(MAKE) $(MKFLAGS) what-next
 install-dirs:
--- a/dev-libs/pth/metadata.xml
+++ b/dev-libs/pth/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
 	<maintainer>
 		<email>crypto@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/dev-libs/pth/pth-2.0.7-r3.ebuild
+++ b/dev-libs/pth/pth-2.0.7-r3.ebuild
@ -1,52 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/pth/pth-2.0.7-r3.ebuild,v 1.5 2011/05/21 19:57:38 xarthisius Exp $
 inherit eutils fixheadtails libtool flag-o-matic
 DESCRIPTION="GNU Portable Threads"
 HOMEPAGE="http://www.gnu.org/software/pth/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="debug"
 DEPEND=""
 RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-2.0.5-parallelfix.patch
 	epatch "${FILESDIR}"/${PN}-2.0.6-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-2.0.6-sigstack.patch
 	epatch "${FILESDIR}"/${PN}-2.0.7-parallel-install.patch
 	epatch "${FILESDIR}"/${PN}-2.0.7-ia64.patch
 	ht_fix_file aclocal.m4 configure
 	elibtoolize
 }
 src_compile() {
 	# bug 350815
 	( use arm || use sh ) && append-flags -U_FORTIFY_SOURCE
 	local conf
 	# Broken build on armv5tel
 	if [[ "${CHOST/-*/}" = "armv5tel" ]]; then
 		conf="--with-mctx-mth=sjlj --with-mctx-dsp=ssjlj --with-mctx-stk=sas"
 	fi
 	use debug && conf="${conf} --enable-debug"	# have a bug --disable-debug and shared
 	econf ${conf} || die
 	emake || die
 }
 src_install() {
 	#Parallel install issuse fixed with parallel-install.patch.
 	#Submitted upstream on 12-13-2010.
 	emake DESTDIR="${D}" install || die
 	dodoc ANNOUNCE AUTHORS ChangeLog NEWS README THANKS USERS || die
 }
--- a/eclass/avahi.eclass
+++ b/eclass/avahi.eclass
@ -1,102 +0,0 @@
 # Copyright 2004-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $
 SUPPORTED_AVAHI_MODULES="base gtk gtk3 mono qt"
 # @ECLASS-VARIABLE: AVAHI_MODULE
 # @DESCRIPTION:
 # Set this variable to the avahi module ebuild name, by default it's used
 # the second part of PN, for example: for avahi-glib, it is "glib".
 # Supported avahi modules:
 # base gtk gtk3 mono qt
 AVAHI_MODULE="${AVAHI_MODULE:-${PN/avahi-}}"
 # @ECLASS-VARIABLE: AVAHI_PATCHES
 # @DEFAULT-UNSET
 # @DESCRIPTION:
 # List of patches to apply
 if [ -z "${AVAHI_PATCHES}" ]; then
 	AVAHI_PATCHES=()
 fi
 # @ECLASS-VARIABLE: AVAHI_MODULE_DEPEND
 # @DESCRIPTION:
 # Avahi module built time dependencies list
 AVAHI_MODULE_DEPEND="${AVAHI_MODULE_DEPEND:-}"
 # @ECLASS-VARIABLE: AVAHI_MODULE_RDEPEND
 # @DESCRIPTION:
 # Avahi module run time dependencies list
 AVAHI_MODULE_RDEPEND="${AVAHI_MODULE_RDEPEND:-}"
 # @ECLASS-VARIABLE: AVAHI_MODULE_PDEPEND
 # @DESCRIPTION:
 # Avahi module post dependencies list
 AVAHI_MODULE_PDEPEND="${AVAHI_MODULE_PDEPEND:-}"
 _supported="0"
 for mod in ${SUPPORTED_AVAHI_MODULES} ; do
    if [ "${mod}" = "${AVAHI_MODULE}" ]; then
        _supported="1"
        break
    fi
 done
 if [ "${_supported}" = "0" ]; then
    die "Unsupported avahi module: ${AVAHI_MODULE}"
 fi
 MY_P=${P/-${AVAHI_MODULE}}
 inherit autotools eutils flag-o-matic
 DESCRIPTION="avahi ${AVAHI_MODULE} module"
 HOMEPAGE="http://avahi.org/"
 SRC_URI="http://avahi.org/download/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~arm ~amd64 ~x86"
 AVAHI_COMMON_DEPEND=">=dev-util/intltool-0.40.5
 	>=dev-util/pkgconfig-0.9.0"
 DEPEND="${AVAHI_MODULE_DEPEND} ${AVAHI_COMMON_DEPEND}"
 RDEPEND="${AVAHI_MODULE_RDEPEND}"
 PDEPEND="${AVAHI_MODULE_PDEPEND}"
 avahi_src_prepare() {
 	sed -i\
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
 	for i in ${!AVAHI_PATCHES[@]}; do
 		epatch "${AVAHI_PATCHES[i]}"
 	done
 	eautoreconf
 }
 avahi_src_configure() {
 	use sh && replace-flags -O? -O0
 	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
 	unset DISPLAY
 	local myconf="
 		--disable-static
 		--localstatedir=/var
 		--with-distro=gentoo
 		--disable-xmltoman
 		--disable-monodoc
 		--enable-glib
 		--enable-gobject
 		--disable-qt3
 		$@"
 	econf ${myconf}
 }
 avahi_src_install-cleanup() {
 	# Remove .la files
 	find "${D}" -name '*.la' -exec rm -f {} + || die
 }
 EXPORT_FUNCTIONS src_prepare src_configure
--- a/net-dns/avahi-base/ChangeLog
+++ b/net-dns/avahi-base/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for net-dns/avahi-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> avahi-base-0.6.30-r2.ebuild:
  Bump & add ~arm keyword
--- a/net-dns/avahi-base/Manifest
+++ b/net-dns/avahi-base/Manifest
@ -1,7 +0,0 @@
 AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32 WHIRLPOOL e6b256655f64f557338ae5f79eaf98ead572d39cf90c76ca270dc54cee4b5edfc087326e5f04166eb2ff232ec2a8a5b87adadc8b3bd8b2ec2e3b6503ca39bee6
 AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 SHA256 0bd4f2b2f720684b754698d86b6b1f106576473cead815e7b60b1c62171e4cdc SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517 WHIRLPOOL faae601dca07f267ebe6f8254ff2e00d7ff3de3aa4aa92186e9dead9ac49b43c670b3310d0d7671eae8858ef2f046a4c6b27cb1bb23c20413fddb791ad793a67
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-base-0.6.30-r2.ebuild 3719 SHA256 2fe1e60ff995cd294a1a90e22af79e0e67f0f61059f5794e93e9124f20429f8d SHA512 bf260cd4ac24ac77f94934f9673230517630bc78a5835a292a9990b774a253660800d12dac38a855753f8845d39d168457c9284de8d813552a9f3cb6c55201f7 WHIRLPOOL 9ff8184d5f2fe160bc6f9647a3cf6be1bccefc8c1eb4d502adb652b0eba870fb27b6d54dbd8deff1ff15ebd80d4c723b7daa41dd9b5a13d885dedcd5345705f6
 MISC ChangeLog 226 SHA256 6b1eba1e1c7bc6ea69d661eaf208a92f3e3098ef1a334b83c7d1dfe180541cb2 SHA512 274e81966fdbf6ceecf9132abc96c0cbf8f1d3f55436251b9059fad3af480fa7f809828d665049489f5eb0de280947d80e360e5c25f515f6740c616db3425b27 WHIRLPOOL 311f66a76d81bcdb99f8d1754308869789f4f9984e5af8ce20d15cbd8805538903c42a960258ecab56f44624f617942223e2a00b94786423bc606a7249362c16
 MISC metadata.xml 606 SHA256 b051169158ed4c39ba6eb9080c0de8d637f3f32b01f85f6cca57c8817f68d9e0 SHA512 ceec9f97630277cd0a36c2842bc81acf57f6f51c847c96356357288a3f7158e89f95a6b42190b4f8f76a3e47deb87ab14b7b12d947f2587bdc860029d0c28b57 WHIRLPOOL 0cd6426a1708a3bbd45333bdb2a2efda369ee537dfdee1bd0f772711a3f9006c90918843fac9a4f8d7e612627bad6d7a4348f5fbd9806ba574ab987c165db75d
--- a/net-dns/avahi-base/avahi-base-0.6.30-r2.ebuild
+++ b/net-dns/avahi-base/avahi-base-0.6.30-r2.ebuild
@ -1,157 +0,0 @@
 # Copyright 1999-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 PYTHON_DEPEND="python? 2"
 PYTHON_USE_WITH="gdbm"
 PYTHON_USE_WITH_OPT="python"
 DBUS_DEPEND=">=sys-apps/dbus-0.30"
 IUSE="autoipd bookmarks dbus doc gdbm howl-compat introspection ipv6
 	mdnsresponder-compat python test"
 COMMON_DEPEND=">=dev-libs/libdaemon-0.14
 	dev-libs/expat
 	dev-libs/glib:2
 	gdbm? ( sys-libs/gdbm )
 	dbus? (
 			${DBUS_DEPEND}
 			python? ( dev-python/dbus-python )
 	)
 	howl-compat? ( ${DBUS_DEPEND} )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	mdnsresponder-compat? ( ${DBUS_DEPEND} )
 	bookmarks? (
 			dev-python/twisted
 			dev-python/twisted-web
 	)
 	kernel_linux? ( sys-libs/libcap )
 	"
 AVAHI_MODULE_DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )"
 AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}
 	howl-compat? ( !net-misc/howl )
 	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
 AVAHI_PATCHES=( "${FILESDIR}/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch" )
 inherit eutils multilib python avahi
 pkg_setup() {
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
 	fi
 }
 pkg_preinst() {
 	enewgroup netdev
 	enewgroup avahi
 	enewuser avahi -1 -1 -1 avahi
 	if use autoipd; then
 		enewgroup avahi-autoipd
 		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
 	fi
 }
 src_prepare() {
 	if use ipv6; then
 		sed -i \
 			-e s/use-ipv6=no/use-ipv6=yes/ \
 			avahi-daemon/avahi-daemon.conf || die
 	fi
 }
 src_configure() {
 	local myconf=""
 	if use python; then
 		myconf+=" $(use_enable dbus python-dbus)"
 	fi
 	# these require dbus enabled
 	if use mdnsresponder-compat || use howl-compat; then
 		myconf+=" --enable-dbus"
 	fi
 	myconf+="
 		$(use_enable test tests)
 		$(use_enable autoipd)
 		$(use_enable mdnsresponder-compat compat-libdns_sd)
 		$(use_enable howl-compat compat-howl)
 		$(use_enable doc doxygen-doc)
 		$(use_enable dbus)
 		$(use_enable python)
 		$(use_enable introspection)
 		$(use_enable gdbm)
 		--disable-qt4
 		--disable-gtk
 		--disable-gtk3
 		--disable-pygtk
 		--disable-mono"
 	if use python; then
 		myconf+=" $(use_enable dbus python-dbus)"
 	else
 		myconf+=" --disable-python-dbus"
 	fi
 	avahi_src_configure "${myconf}"
 }
 src_compile() {
 	emake || die "emake failed"
 	use doc && { emake avahi.devhelp || die ; }
 }
 src_install() {
 	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
 	use bookmarks || rm -f "${D}"/usr/bin/avahi-bookmarks
 	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
 	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
 	if use autoipd; then
 		insinto /$(get_libdir)/rcscripts/net
 		doins "${FILESDIR}"/autoipd.sh || die
 		insinto /$(get_libdir)/rc/net
 		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
 	fi
 	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
 	if use doc; then
 		dohtml -r doxygen/html/. || die
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi
 	echo
 	elog "If you changed USE flags or did a version/revision bump, make sure"
 	elog "to rebuild all the modules:"
 	for mod in ${SUPPORTED_AVAHI_MODULES}; do
 		elog "  net-dns/avahi-${mod}"
 	done
 	echo
 	avahi_src_install-cleanup
 }
 pkg_postrm() {
 	use python && python_mod_cleanup avahi
 }
 pkg_postinst() {
 	use python && python_mod_optimize avahi
 	if use autoipd; then
 		echo
 		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
 		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
 	fi
 	if use dbus; then
 		echo
 		elog "If this is your first install of avahi please reload your dbus config"
 		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
 	fi
 }
--- a/net-dns/avahi-base/files/autoipd-openrc.sh
+++ b/net-dns/avahi-base/files/autoipd-openrc.sh
@ -1,32 +0,0 @@
 # Copyright (C) 2004-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Contributed by Sven Wegener (swegener@gentoo.org)
 _config_vars="$_config_vars autoipd"
 autoipd_depend() {
 	program /usr/sbin/avahi-autoipd
 	after interface
 }
 autoipd_start() {
 	_exists true || return 1
        eval args=\$autoipd_${IFVAR}
 	ebegin "Starting avahi-autoipd"
 	/usr/sbin/avahi-autoipd --daemonize --syslog --wait ${args} "${IFACE}"
 	eend "${?}" || return 1
 	_show_address
 	return 0
 }
 autoipd_stop() {
 	/usr/sbin/avahi-autoipd --check --syslog "${IFACE}" || return 0
 	ebegin "Stopping avahi-autoipd"
 	/usr/sbin/avahi-autoipd --kill --syslog "${IFACE}"
 	eend "${?}"
 }
--- a/net-dns/avahi-base/files/autoipd.sh
+++ b/net-dns/avahi-base/files/autoipd.sh
@ -1,52 +0,0 @@
 # Copyright (c) 2004-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Contributed by Sven Wegener (swegener@gentoo.org)
 # void autoipd_depend(void)
 #
 # Sets up the dependencies for the module
 autoipd_depend() {
 	after interface
 }
 # void autoipd_expose(void)
 #
 # Expose variables that can be configured
 autoipd_expose() {
 	variables autoipd
 }
 # bool autoipd_start(char *iface)
 #
 # Tries to configure the interface via avahi-autoipd
 autoipd_start() {
 	local iface="${1}" ifvar="$(bash_variable "${iface}")" opts="autoipd_${ifvar}" addr=""
 	interface_exists "${iface}" true || return 1
 	ebegin "Starting avahi-autoipd"
 	if /usr/sbin/avahi-autoipd --daemonize --syslog --wait ${!opts} "${iface}"
 	then
 			eend 0
 			addr="$(interface_get_address "${iface}")"
 			einfo "${iface} received address ${addr}"
 			return 0
 	fi
 	eend "${?}" "Failed to get address via avahi-autoipd!"
 }
 # bool autoipd_stop(char *iface)
 #
 # Stops a running avahi-autoipd instance
 autoipd_stop() {
 	local iface="${1}"
 	/usr/sbin/avahi-autoipd --check --syslog "${iface}" || return 0
 	ebegin "Stopping avahi-autoipd"
 	/usr/sbin/avahi-autoipd --kill --syslog "${iface}"
 	eend "${?}" "Failed to stop running avahi-autoipd instance!"
 }
 # vim: set ts=4 :
--- a/net-dns/avahi-base/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
+++ b/net-dns/avahi-base/files/avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
@ -1,22 +0,0 @@
 --- avahi-0.6.30/initscript/gentoo/avahi-daemon.in
 +++ avahi-0.6.30/initscript/gentoo/avahi-daemon.in
@@ -2,7 +2,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 -opts="reload"
 +extra_started_commands="reload"
 depend() {
 	before netmount nfsmount
 --- avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
 +++ avahi-0.6.30/initscript/gentoo/avahi-dnsconfd.in
@@ -2,7 +2,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 -opts="reload"
 +extra_started_commands="reload"
 depend() {
 	need avahi-daemon
--- a/net-dns/avahi-base/metadata.xml
+++ b/net-dns/avahi-base/metadata.xml
@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
 	<email>lxnay@gentoo.org</email>
 </maintainer>
 <use>
 	<flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address
 		configuration daemon</flag>
 	<flag name='bookmarks'>Install the avahi-bookmarks application (requires
 		<pkg>dev-python/twisted</pkg>)</flag>
 	<flag name='howl-compat'>Enable compat libraries for howl</flag>
 	<flag name='mdnsresponder-compat'>Enable compat libraries for
 		mDNSResponder</flag>
 </use>
 </pkgmetadata>
--- a/net-dns/avahi-gtk/ChangeLog
+++ b/net-dns/avahi-gtk/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for net-dns/avahi-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> avahi-gtk-0.6.30-r2.ebuild:
  Bump & add ~arm keyword
--- a/net-dns/avahi-gtk/Manifest
+++ b/net-dns/avahi-gtk/Manifest
@ -1,5 +0,0 @@
 AUX avahi-0.6.28-optional-gtk-utils.patch 1897 SHA256 5bfe28c75d923cd858f591ddc090fc8c8d1bc605dcaaaf028c92ba4cbc098e8f SHA512 344e1fb2888ac26ad4f2a89ec9441ad8f0786cc44c0798748faaa7780adb7ddd681145a28117257694f2394fa3d0cc8b232f52bcae02821970427812efd12c6b WHIRLPOOL 0339d41e8460f4e890f9dba8bd01345f2fd4995109d3711e83af1b480a5ed5d99dff6035111631bf07064ae545d55dc4d2cb03de1e746f5c94dbd7315791c5d6
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-gtk-0.6.30-r2.ebuild 1426 SHA256 97a2424768386d024932f126f333da656c6f96fbb3065aa624fc465410e5fe47 SHA512 f5641d1bd1032bd55ddadf14f1c4ee364e062a2bafef6ee6d78c227ef8b3bfc263f13139a801902f4bc95b2c20e0fa7e6958621231777e1eaf980ec225f806ff WHIRLPOOL 51f0240eb0b6cd08bc32b8178e20d76996e1965d73232c173f496a3db6297de59010b64646250570ffcf6410c2be3200d2db2b55a49d0dc9b9aead0a6acb2261
 MISC ChangeLog 224 SHA256 487d7fe75440660076eb39f3484a604fa5c73ba6774e38db8bc51de39e4a0bf2 SHA512 a4fdc48f315cb5c7cbf554fa1234f98f62dec334959869c843f2ba379523fb1b4ea6884e1f153a53dd7c5554c9c43afd84830cbe5204fc6a9f1626814d81e524 WHIRLPOOL 2072188c45c3a463b78b3345a8e54c200d3cf9800d771543cf5668534bf41111f1e71fbc3c0dab296bb1d381993ca4d4a2437873b52eb704d81b6158aeb38a1f
 MISC metadata.xml 220 SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 SHA512 bf7084a831937a62d1db223585cb82f0684f25a75e6ff0fb0fd1d80b6feefcb1df0e66929fb609642783ce618744a813d5f1853683452f7e7ee0dad85c5de84e WHIRLPOOL 5a29d3d78ecbfbaeeb21f150554236c3d0425047fa67bdb755374b586a94a504ccfafc51058ad7aa37096ab312f16f11b244d61ed9c2674f27628390005d6612
--- a/net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild
+++ b/net-dns/avahi-gtk/avahi-gtk-0.6.30-r2.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 IUSE="python utils dbus"
 COMMON_DEPEND="=net-dns/avahi-base-${PVR}[dbus=,python=]
 	>=x11-libs/gtk+-2.14.0:2
 	python? ( >=dev-python/pygtk-2 )"
 AVAHI_MODULE_DEPEND="${COMMON_DEPEND}"
 AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}"
 AVAHI_PATCHES=( "${FILESDIR}/avahi-0.6.28-optional-gtk-utils.patch" )
 inherit eutils python avahi
 src_configure() {
 	local myconf=" --enable-gtk
 		--disable-gtk3
 		--disable-mono
 		$(use_enable dbus)
 		$(use_enable utils gtk-utils)
 		--enable-pygtk"
 	if use python; then
 		myconf+=" $(use_enable dbus python-dbus)"
 	fi
 	avahi_src_configure "${myconf}"
 }
 src_compile() {
 	for target in avahi-common avahi-client avahi-glib avahi-ui; do
 		cd "${S}"/${target} || die
 		emake || die
 	done
 	cd "${S}" || die
 	emake avahi-ui.pc || die
 }
 src_install() {
 	cd "${S}"/avahi-ui || die
 	emake install py_compile=true DESTDIR="${D}" || die
 	if use python; then
 		cd "${S}"/avahi-python/avahi-discover || die
 		emake install py_compile=true DESTDIR="${D}" || die
 	fi
 	cd "${S}" || die
 	dodir /usr/$(get_libdir)/pkgconfig
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins avahi-ui.pc
 	avahi_src_install-cleanup
 }
 pkg_postrm() {
 	use python && python_mod_cleanup $(use dbus && echo avahi_discover)
 }
 pkg_postinst() {
 	use python && python_mod_optimize avahi $(use dbus && echo avahi_discover)
 }
--- a/net-dns/avahi-gtk/files/avahi-0.6.28-optional-gtk-utils.patch
+++ b/net-dns/avahi-gtk/files/avahi-0.6.28-optional-gtk-utils.patch
@ -1,61 +0,0 @@
 --- avahi-discover-standalone/Makefile.am
 +++ avahi-discover-standalone/Makefile.am
@@ -23,7 +23,7 @@
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 -if HAVE_GTK2OR3
 +if ENABLE_GTK_UTILS
 if HAVE_GLIB
 bin_PROGRAMS = \
 	avahi-discover-standalone
 --- avahi-ui/Makefile.am
 +++ avahi-ui/Makefile.am
@@ -76,6 +76,7 @@
 libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 +if ENABLE_GTK_UTILS
 bin_PROGRAMS = bssh
 desktop_DATA += bssh.desktop bvnc.desktop
 @INTLTOOL_DESKTOP_RULE@
@@ -102,6 +103,7 @@
 bvnc.desktop.in: bvnc.desktop.in.in
 	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
 +endif # ENABLE_GTK_UTILS
 endif # HAVE_GLIB
 endif
 endif
 --- configure.ac
 +++ configure.ac
@@ -564,7 +564,20 @@
 fi
 AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
 +#
 +# Check for GTK+ Utils
 +#
 +AC_ARG_ENABLE(gtk-utils,
 +        AS_HELP_STRING([--disable-gtk-utils],[Disable GTK+ utilities]),
 +        [case "${enableval}" in
 +                yes) ENABLE_GTK_UTILS=yes ;;
 +                no)  ENABLE_GTK_UTILS=no ;;
 +                *) AC_MSG_ERROR(bad value ${enableval} for --enable-gtk-utils) ;;
 +        esac],
 +        [ENABLE_GTK_UTILS=yes])
 +
 AM_CONDITIONAL(HAVE_GTK2OR3, test "x$HAVE_GTK3" = "xyes" -o "x$HAVE_GTK" = "xyes" )
 +AM_CONDITIONAL(ENABLE_GTK_UTILS, test "$HAVE_GTK2OR3" -a "x$ENABLE_GTK_UTILS" = "xyes" )
 #
 # D-Bus
@@ -1223,7 +1236,7 @@
     Building avahi-python:              ${BUILD_PYTHON}
     Building libavahi-glib:             ${HAVE_GLIB}
     Building libavahi-gobject:          ${BUILD_GOBJECT}
 -    Building avahi-discover-standalone: ${HAVE_GTK2OR3}
 +    Building avahi-discover-standalone: ${ENABLE_GTK_UTILS}
     Building libavahi-qt3:              ${HAVE_QT3}
     Building libavahi-qt4:              ${HAVE_QT4}
     Building avahi-sharp:               ${HAVE_MONO}
--- a/net-dns/avahi-gtk/metadata.xml
+++ b/net-dns/avahi-gtk/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
 	<email>lxnay@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
--- a/net-dns/avahi-gtk3/ChangeLog
+++ b/net-dns/avahi-gtk3/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for net-dns/avahi-gtk3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> avahi-gtk3-0.6.30-r2.ebuild:
  Bump & add ~arm keyword
--- a/net-dns/avahi-gtk3/Manifest
+++ b/net-dns/avahi-gtk3/Manifest
@ -1,4 +0,0 @@
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-gtk3-0.6.30-r2.ebuild 1035 SHA256 4ab4dc362403b8fabb27cd4336949d3bea15d434ee25ccdafaef3bf55d1daed7 SHA512 0f810caddc1f3a3bd7a5f1b2f928297dcef6c923aa3e9b3929c56cd0c2b4089d4fc838af6c9985572e6d4208c19913d715ddc7a1c214410807bb455ce8756afe WHIRLPOOL 59ced7ca561162c80472ee24465dc088bbf2c9d83a69cde2b10b7c8e8748eee208ae6750ee9ceca7123f2d9cc1bee99c49568c150e214d222525008d8459e412
 MISC ChangeLog 226 SHA256 e6fe5fccf3053229224e0811ba34ec75794dcdb09583a62fa7db0118ad7d10c4 SHA512 294dfc1f618adcecd6c0df31481d563165c10b79f8332547ad69b4a52d50e8729bf36600c2c8d4e060be4a157c407bcdde7d10006132b657361af2240b66c9dc WHIRLPOOL ef47544b9a5d60130d03d6ebef233513db186cecf79fac3c2a5dd259bb6b103a4f0f7c27fa85b960d120c845a9a55a1eb860d4129c6866bc48b071a9ab70225b
 MISC metadata.xml 220 SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 SHA512 bf7084a831937a62d1db223585cb82f0684f25a75e6ff0fb0fd1d80b6feefcb1df0e66929fb609642783ce618744a813d5f1853683452f7e7ee0dad85c5de84e WHIRLPOOL 5a29d3d78ecbfbaeeb21f150554236c3d0425047fa67bdb755374b586a94a504ccfafc51058ad7aa37096ab312f16f11b244d61ed9c2674f27628390005d6612
--- a/net-dns/avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild
+++ b/net-dns/avahi-gtk3/avahi-gtk3-0.6.30-r2.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 IUSE=""
 COMMON_DEPEND="=net-dns/avahi-base-${PVR}
 	x11-libs/gtk+:3"
 AVAHI_MODULE_DEPEND="${COMMON_DEPEND}"
 AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}"
 inherit eutils avahi
 src_configure() {
 	local myconf=" --disable-gtk --enable-gtk3"
 	avahi_src_configure "${myconf}"
 }
 src_compile() {
 	for target in avahi-common avahi-client avahi-glib avahi-ui; do
 		cd "${S}"/${target} || die
 		emake || die
 	done
 	cd "${S}" || die
 	emake avahi-ui-gtk3.pc || die
 }
 src_install() {
 	cd "${S}"/avahi-ui || die
 	emake -j1 install py_compile=true DESTDIR="${D}" || die
 	cd "${S}" || die
 	dodir /usr/$(get_libdir)/pkgconfig
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins avahi-ui-gtk3.pc
 	avahi_src_install-cleanup
 	# Workaround for avahi-ui.h collision between avahi-gtk and avahi-gtk3
 	root_avahi_ui="${ROOT}usr/include/avahi-ui/avahi-ui.h"
 	if [ -e "${root_avahi_ui}" ]; then
 		rm -f "${ED}usr/include/avahi-ui/avahi-ui.h"
 	fi
 }
--- a/net-dns/avahi-gtk3/metadata.xml
+++ b/net-dns/avahi-gtk3/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
 	<email>lxnay@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
--- a/net-dns/avahi-mono/ChangeLog
+++ b/net-dns/avahi-mono/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for net-dns/avahi-mono
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> avahi-mono-0.6.30-r2.ebuild:
  Bump & add ~arm keyword
--- a/net-dns/avahi-mono/Manifest
+++ b/net-dns/avahi-mono/Manifest
@ -1,4 +0,0 @@
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-mono-0.6.30-r2.ebuild 1165 SHA256 c26aa97a3244d337a9152fc4b76790b17b21bb7aa8edb488c828f3e2a2cdf470 SHA512 1ac91539f39b311b7e835bc3fa2d8c770e6e4adf8431216044d3b76689a9da582f16f89eecd2ecaf6c49f887e51a65e314e93c47544be0cab44d3e779f5e2efb WHIRLPOOL 06e74c0a680085f58d9f62f0e34179aec8dcf08b46bf3bcaf2f501ca3004f00fd386280f7decc092a8ad8ff98f70e5341fe5d365333926f9b326a8e944a4fb81
 MISC ChangeLog 226 SHA256 1ddd690c550933a4011d35a23584224e518c221b3b6b172ed97cdc6500de398d SHA512 8f11ffef72b071086651b0a52ec7f22d015bbcd70567c1714131d5fa7821a6674e38f7b7cf350890a2656bc21b3548442020c6229b5b8e4a5883d0fa39215385 WHIRLPOOL 95087089d54644f7a89798a443ac33ddefa49d1fc596f3769a05884ca4d855e848b5bf8143176deff4a878df720621856c23b07b4cbb1078f894a4f6a73c4d4e
 MISC metadata.xml 220 SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 SHA512 bf7084a831937a62d1db223585cb82f0684f25a75e6ff0fb0fd1d80b6feefcb1df0e66929fb609642783ce618744a813d5f1853683452f7e7ee0dad85c5de84e WHIRLPOOL 5a29d3d78ecbfbaeeb21f150554236c3d0425047fa67bdb755374b586a94a504ccfafc51058ad7aa37096ab312f16f11b244d61ed9c2674f27628390005d6612
--- a/net-dns/avahi-mono/avahi-mono-0.6.30-r2.ebuild
+++ b/net-dns/avahi-mono/avahi-mono-0.6.30-r2.ebuild
@ -1,54 +0,0 @@
 # Copyright 1999-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 IUSE="doc gtk"
 COMMON_DEPEND="=net-dns/avahi-base-${PVR}[dbus]
 	>=dev-lang/mono-1.1.10
 	gtk? (
 		=net-dns/avahi-gtk-${PVR}
 		>=dev-dotnet/gtk-sharp-2
 	)"
 AVAHI_MODULE_DEPEND="${COMMON_DEPEND}
 	doc? ( >=virtual/monodoc-1.1.8 )"
 AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}"
 inherit eutils avahi
 src_configure() {
 	local myconf="--enable-mono --enable-dbus"
 	myconf+=" $(use_enable doc monodoc)"
 	avahi_src_configure "${myconf}"
 }
 src_compile() {
 	for target in avahi-common avahi-client avahi-glib avahi-sharp; do
 		cd "${S}"/${target} || die
 		emake || die
 	done
 	cd "${S}" || die
 	emake avahi-sharp.pc || die
 	if use gtk; then
 		cd "${S}"/avahi-ui-sharp || die
 		emake || die
 		cd "${S}" || die
 		emake avahi-ui-sharp.pc || die
 	fi
 }
 src_install() {
 	cd "${S}"/avahi-sharp || die
 	emake install DESTDIR="${D}" || die
 	if use gtk; then
 		cd "${S}"/avahi-ui-sharp || die
 		emake install DESTDIR="${D}" || die
 	fi
 	cd "${S}" || die
 	dodir /usr/$(get_libdir)/pkgconfig
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins *.pc
 	avahi_src_install-cleanup
 }
--- a/net-dns/avahi-mono/metadata.xml
+++ b/net-dns/avahi-mono/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
 	<email>lxnay@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
--- a/net-dns/avahi-qt/ChangeLog
+++ b/net-dns/avahi-qt/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for net-dns/avahi-qt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> avahi-qt-0.6.30-r2.ebuild:
  Bump & add ~arm keyword
--- a/net-dns/avahi-qt/Manifest
+++ b/net-dns/avahi-qt/Manifest
@ -1,4 +0,0 @@
 DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
 EBUILD avahi-qt-0.6.30-r2.ebuild 785 SHA256 babc2807798b82e18fe8a60280fb5a02312c2ece71a0f14c07725b12065844c0 SHA512 33dda6822fa2c914a5dc466f6c579f638d7a09cc8e04dca5f704a7babb4cf88ded95db4a92f5fb5a4eab108064e1143b1fb0060a6e37045c84f38d94724f3cc3 WHIRLPOOL fc2d0094873a044b47d3091a7d3280da4ece9024a8995ceb3f288e3f6ee41c5cfddf4261d2a4c048db7a5a739beef64ae75cd7c01418d0cf6f70b325aa670b8c
 MISC ChangeLog 222 SHA256 21a99f08089ef7475bd6c040a282fb196a52632783bd2f971141835c3160ff74 SHA512 ad9d4336d414725f2dfe5e060fb35c277c411764c3b4e029be1124ec9f35cc14a5f3c01843f3c4bacb985807b57af868469f4afbee2e6b7fd790932d67fca14b WHIRLPOOL 9c28a6d42b4b9c0fc8fef8328a5b3fc45a8649e9c94bc9c4a36097fa0d56ca05d02f75207f3743c0ab08f87d64a3ecbe9bcd51425cd291284576943269d8c26b
 MISC metadata.xml 220 SHA256 e1f3a2843ea0147b5aa40aaf5ed41d3cb748d26e484a4abd07b5dc65c5e0e134 SHA512 bf7084a831937a62d1db223585cb82f0684f25a75e6ff0fb0fd1d80b6feefcb1df0e66929fb609642783ce618744a813d5f1853683452f7e7ee0dad85c5de84e WHIRLPOOL 5a29d3d78ecbfbaeeb21f150554236c3d0425047fa67bdb755374b586a94a504ccfafc51058ad7aa37096ab312f16f11b244d61ed9c2674f27628390005d6612
--- a/net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild
+++ b/net-dns/avahi-qt/avahi-qt-0.6.30-r2.ebuild
@ -1,42 +0,0 @@
 # Copyright 1999-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 inherit multilib
 IUSE=""
 COMMON_DEPEND="=net-dns/avahi-base-${PVR}
 	x11-libs/qt-core:4"
 AVAHI_MODULE_DEPEND="${COMMON_DEPEND}"
 AVAHI_MODULE_RDEPEND="${COMMON_DEPEND}"
 inherit eutils avahi
 src_configure() {
 	local myconf=" --enable-qt4
 	--disable-mono"
 	avahi_src_configure "${myconf}"
 }
 src_compile() {
 	cd "${S}"/avahi-common || die
 	emake || die
 	cd "${S}"/avahi-qt || die
 	emake || die
 	cd "${S}" || die
 	emake avahi-qt4.pc || die
 }
 src_install() {
 	cd "${S}"/avahi-qt || die
 	emake install DESTDIR="${D}" || die
 	cd "${S}" || die
 	dodir /usr/$(get_libdir)/pkgconfig
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins avahi-qt4.pc
 	avahi_src_install-cleanup
 }
--- a/net-dns/avahi-qt/metadata.xml
+++ b/net-dns/avahi-qt/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
 	<email>lxnay@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@ -1,7 +0,0 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
  29 Dec 2011; Mario Fetka <mario.fetka@gmail.com> avahi-0.6.30-r2.ebuild:
  Bump & add ~arm keyword
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@ -1,3 +0,0 @@
 EBUILD avahi-0.6.30-r2.ebuild 840 SHA256 0678ad000a17f81940ff3b4fcd0420ac777febb0921b318288231e18c263197f SHA512 1819487de468c2e0ae422411d45af31755ad06a953de5ab1b9f7083cc93f75590085d3997a22888acce6b6b14e3a3a411902157a3b9a0b1c7f183c954ea57621 WHIRLPOOL 227c18d0c6e31fef3c5f3d233b149581500ab29eaa1b619b10f4022401464cce5601a8a744cd9069d936556902de2012be232d737756ca4227480086b151a335
 MISC ChangeLog 216 SHA256 4ac4eae435d44b294c3c725a91e25228bb7cf421213e7ea4f7b35ae26bd1170d SHA512 1c87867ec4e3ccf77b06a03cc4137719f7aa70b025d768994cc384de47f7de6d5771a5ca9930c45a67e9d088dd619f5cee801ddb6a365522bfaef030453ce85b WHIRLPOOL d8bce3972e3712c8d3814df03a3ca603fe7fb30e6025aa17ea34a54f544a71ca95ba00373497186c64da002999d70633e638c82f1aeefab2963f2f82920b1868
 MISC metadata.xml 609 SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa SHA512 ecf30ac82f163d69a370a326150c660ccd43dd1d325807312be9d5b466c0eb656464504ef0f2c6cbdbccd2f2acd51e52c1eded2c206fa23402b96c468528e6e9 WHIRLPOOL f0fa30cfd159128f05e6d2f7b9a899c69d83477c29ba1b198746fa4c4e4a26e149e6a27299ba2c786f1105a9feb24c80c497bff8b2125ff1df9cdd22bbf10697
--- a/net-dns/avahi/avahi-0.6.30-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.30-r2.ebuild
@ -1,24 +0,0 @@
 # Copyright 1999-2011 Sabayon
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="3"
 DESCRIPTION="System which facilitates service discovery on a local network (meta package)"
 HOMEPAGE="http://avahi.org/"
 SRC_URI=""
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
 kernel_linux mdnsresponder-compat mono python qt4 test utils"
 COMMON_DEPEND="=net-dns/avahi-base-${PVR}[autoipd=,bookmarks=,dbus=,doc=,gdbm=,howl-compat=,introspection=,ipv6=,mdnsresponder-compat=,python=,test=]
 	gtk? ( =net-dns/avahi-gtk-${PVR} )
 	utils? ( =net-dns/avahi-gtk-${PVR}[utils] )
 	gtk3? ( =net-dns/avahi-gtk3-${PVR} )
 	mono? ( =net-dns/avahi-mono-${PVR} )
 	qt4? ( =net-dns/avahi-qt-${PVR} )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${DEPEND}"
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
 	<email>swegener@gentoo.org</email>
 </maintainer>
 <use>
 	<flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address
 		configuration daemon</flag>
 	<flag name='bookmarks'>Install the avahi-bookmarks application (requires
 		<pkg>dev-python/twisted</pkg>)</flag>
 	<flag name='howl-compat'>Enable compat libraries for howl</flag>
 	<flag name='mdnsresponder-compat'>Enable compat libraries for
 		mDNSResponder</flag>
 </use>
 </pkgmetadata>
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@ -1,15 +0,0 @@
 AUX arm-bug-644136.patch 472 SHA256 3152f9c5b3f9cd75caf522e71d4105be8fbcc4def3e2f4162663799d78e03511 SHA512 a32a2c9609c4fcd83a1e203dc777b92b686b6eefd0f7fb02ef43da31d8b6ea16e6cf03f57dabd82de16fd90b54131880b98e81a2d2e2b3ee362f9b72a69476b1 WHIRLPOOL a30173044c02fbd839f62cfc5f876a80f68b629f5ce136620b92e3c2b4e19d6d12db3f5f09f0313185c50a9c9e9abddbac9d5ac11a223b42732c8ab822b839a6
 AUX bug-270163.patch 251 SHA256 92f9762412318627eb6639f576385876958503eeb47c612c92f6e4cfc58e3edf SHA512 6a46df5f50dc7a857364848167bf564d12c7aa8c06e1a327ea41421ac5a32551d9f49ae8a275513e32a55b9163d90a864ac2c55c4f1cc3437baa8d106a76ad63 WHIRLPOOL 100e8bce1fee56b170081565ba7e98879d585be21191cbc588378c672cbe7500197009fad71621cc899678416c02c0be9ac513a155c2d757f38acf5f6f6529f9
 AUX bug-606109.patch 1243 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc SHA512 96b9c8e647f666c166851347e9ac8605274f74849505ecd560e2104ee74c5654fbd9d006f842fad8251cfaac52cd3fc60f6ab7f4bec2e761a57fa72d1cad5f06 WHIRLPOOL d97cc2e4e62dac190c636c0e6ed831e6012229ed662412d1c88cab26c8fb724a4ea7f37979d6d29b95cafafe6639dec0752063792ac34e4645b0654050db8653
 AUX bug-626229.patch 4172 SHA256 c61d16a56bcc7e333e8f47662d1ad9bc8468806bbf9d76c500d666bf645c1ddc SHA512 a77fb1675a5733a656e779c7317c14e301568c2ddabc1cec1d428b053bf8b27e26b5c68f5739cd468fd97b199cb818cb5a5f9ae263702f12d65b97c1b5b52294 WHIRLPOOL 4a7c1e96455f08b7611017d66faa141a3f8cae3e4915a3069a6c621ef5c6a025294d6c18da391f8a5e33d97454a0547a67e754de5eb2d1f9c195c51b7bafcf76
 AUX fix-animated-gifs.patch 7789 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443 SHA512 6341c300e30c3a65122e88757bd43f5972b9a970eca573b720c763c97150901e658c263254f3b6ae49684c04bac942748d68c950a08b4d9342d7803a9bae6f70 WHIRLPOOL 92b450e8f42105d76bdc92c8cb139af657dbe7048d81e65dfa3cfa7e599f8f72c5a6d5cb554e836694671c9c878cb3d883b3b54870dfb420c5d544cdad3db472
 AUX libnotify-0.7.patch 1777 SHA256 153d129004e63baca57182ce2ec381a9103feef9e5fbdf631339bce25cde9489 SHA512 68b5437e65c7e6fd11484f6c82e3e2eb82bd434e1a393688f4771a030f118519392f7948a78fac16eec450be0a235dde5cb9e7157e7b75fc33e5755cc926b1b9 WHIRLPOOL 56041fb9cead6ea00fcd60302ccfe0583fc655162a91ae24ef37410b2d08121259eef7d4253568db5e3443a7397d74c358eac4c8e1adad31d73a896d2bf66e18
 AUX mozilla-2.0_arm_respect_cflags.patch 3333 SHA256 fb92269bcd700b257133875d5ecba063e99f33235282b251d4bb0eb37a73ba8f SHA512 deabbdfa20520676799a32cf002f4a996f6ea1c11f5296a53e55115e2c04f0a8479ad8b3cd3047c0a04c8cd7c09e0c16abe9311755e41407e3067ae72cb8f1d9 WHIRLPOOL 290162e2d70beb9c9f93ef2c8735fd48dd14b1d0741b3a6e3e00f9adc06332b2f993dc6f0c8398774e38e869706e038f593b32d0592900ec56b7744371819ace
 AUX mozilla-2.0_support_64bit_big_endian.patch 1668 SHA256 041ffa768a680293f97b325573a91a2c63841cd25648294e7989fcfcaedc70f2 SHA512 a41d6c7c06c2dfa4f2b7b8458088bfe9025b46d46464185edfbd529588e35502edc967bdb78240ab6f08ee8013a2bc10293dc0423f6d8072e3e6bb8758e87173 WHIRLPOOL 8bfb5978914d44df3ed4ebe97588df77b599844f60b39592678d1d7d1cbfdc912945e4e05c381da0b382ac30b8d7835f0b4eb0ffaab3a1025e7e2a71a60511b8
 AUX xulrunner-1.9.2-gtk+-2.21.patch 663 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05 SHA512 05c652191a937632423aed59095e7f73965a5304796fbbfe6831129914fa4f8a8153c1b57a0ee1f0dbde61055e690c22907fbb8dbf35ce735ddab6ac663f1434 WHIRLPOOL c3b1de0e8f4afd328c502207126e7eb9da0b0777bc2dd30c8e0b205e4ff5350e3f7294f11b235d01d67527873c634e8ae0764969a487cae012daff4622289a5a
 AUX xulrunner-default-prefs.js 677 SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8 SHA512 f3f5ff479acc3d32cb24042d27e567c60e1a927ade4d3151427628227c3840890418e9e1044ebd1af68c7de79afa92ca7785d7a03e8d793a548de207984b403f WHIRLPOOL ff91dc1fb7fa0c5d59f1c3250a81b40929aa6123914e013d49bb817dd4ad2bf23160b424669d116f5ac3bebf21516837785e7ade315abf2631c888346ed2432e
 DIST firefox-3.6.22.source.tar.bz2 51675082 SHA256 788e5a64f8bdb07183405c568fda70d8cb7759d3a8d75c404f3589fe8a039229
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
 EBUILD xulrunner-1.9.2.22.ebuild 8569 SHA256 abc96ffa273ccd3787ce9d0b09048f8b071e9dea6c50cbe5212afabb9f541480 SHA512 f1279addd375c96a5708fedfa29ac1b16b0f49faa99d1565f83ea05716b166f065b5ffe50ca90fcf71620dca6b82f1b132528a1b97b3bcc04051f937f553f7b3 WHIRLPOOL 47a78a3eec94bb03f068ba1c5114c893031602f04e2665ae220bb53bbb424bcae332de97b4f5ef24286b7fa333bf866b492992aa60560b03c59c012e0146669f
 MISC ChangeLog 61955 SHA256 c42382a39878064a732f3d073fc462f8a895dc882db4e9dd5f9e2e2aec1bfa36 SHA512 a4f760f3669f75e51ca195c86d39031cc7d86e8417e75a72be65f53bd31585f8489cce77e05157adff8d309324c8f0715ca81652b2a596f4ea7ad7d8fd52d461 WHIRLPOOL 9920366ed6af0535e1d6e00276d9fccbd12bbb18c044bf433329b84994bbc657e322eb1d2f7d3234215ff1934d987add34eaa97d208123a0f20eb1ac6913698f
 MISC metadata.xml 737 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0 SHA512 c32b379179a2a363452bbef6113c6b01c2be46c6b4231cdaee41a82fcd122c9a204b2ceda7029378f636dddcafeabc1dbf8f8ed6ef833ee326d08fde09bd5530 WHIRLPOOL 8c083ed841650447c2b0daa1c8cff52d4ca41a5a066fe3c147e2973fd3eb10955ce206c2e537646cc2a4c0b5c265e4e21a06eac1731c95057cb3ae42ca428476
--- a/net-libs/xulrunner/files/arm-bug-644136.patch
+++ b/net-libs/xulrunner/files/arm-bug-644136.patch
@ -1,14 +0,0 @@
 diff -r 4e4c7457e8f7 js/src/ctypes/libffi/src/arm/sysv.S
 --- a/js/src/ctypes/libffi/src/arm/sysv.S	Sat Apr 02 11:48:22 2011 -0400
 +++ b/js/src/ctypes/libffi/src/arm/sysv.S	Sun Apr 03 04:55:15 2011 +0300
@@ -229,6 +229,10 @@
         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
 +/* Below are VFP hard-float ABI call and closure implementations.
 +   Add VFP FPU directive here. */
 +	.fpu	vfp
 +
 	@ r0:   fn
 	@ r1:   &ecif
 	@ r2:   cif->bytes
--- a/net-libs/xulrunner/files/bug-270163.patch
+++ b/net-libs/xulrunner/files/bug-270163.patch
@ -1,11 +0,0 @@
 --- a/mozilla/gfx/ots/src/os2.cc
 +++ b/mozilla/gfx/ots/src/os2.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 +#include <cstddef>
 +
 #include "os2.h"
 #include "head.h"
--- a/net-libs/xulrunner/files/bug-606109.patch
+++ b/net-libs/xulrunner/files/bug-606109.patch
@ -1,48 +0,0 @@
 # HG changeset patch
 # User Jory A. Pratt <anarchy@gentoo.org>
 # Parent 74e4421e0a30c6e21b594675e32a8d9d663c309c
 Add missing ifde MOZ_MEDIA
 diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
 --- a/content/base/src/nsContentSink.cpp
 +++ b/content/base/src/nsContentSink.cpp
@@ -1860,17 +1860,19 @@ nsIAtom** const kDefaultAllowedTags [] =
   &nsGkAtoms::nobr,
   &nsGkAtoms::noscript,
   &nsGkAtoms::ol,
   &nsGkAtoms::optgroup,
   &nsGkAtoms::option,
   &nsGkAtoms::output,
   &nsGkAtoms::p,
   &nsGkAtoms::pre,
 +#ifdef MOZ_MEDIA
   &nsGkAtoms::progress,
 +#endif
   &nsGkAtoms::q,
   &nsGkAtoms::rp,
   &nsGkAtoms::rt,
   &nsGkAtoms::ruby,
   &nsGkAtoms::s,
   &nsGkAtoms::samp,
   &nsGkAtoms::section,
   &nsGkAtoms::select,
@@ -1952,17 +1954,19 @@ nsIAtom** const kDefaultAllowedAttribute
   &nsGkAtoms::itemref,
   &nsGkAtoms::itemscope,
   &nsGkAtoms::itemtype,
   &nsGkAtoms::kind,
   &nsGkAtoms::label,
   &nsGkAtoms::lang,
   &nsGkAtoms::list,
   &nsGkAtoms::longdesc,
 +#ifdef MOZ_MEDIA
   &nsGkAtoms::loop,
 +#endif
   &nsGkAtoms::low,
   &nsGkAtoms::max,
   &nsGkAtoms::maxlength,
   &nsGkAtoms::media,
   &nsGkAtoms::min,
   &nsGkAtoms::mozdonotsend,
   &nsGkAtoms::method,
   &nsGkAtoms::multiple,
--- a/net-libs/xulrunner/files/bug-626229.patch
+++ b/net-libs/xulrunner/files/bug-626229.patch
@ -1,177 +0,0 @@
 diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
 --- a/dom/ipc/ContentChild.cpp
 +++ b/dom/ipc/ContentChild.cpp
@@ -43,27 +43,31 @@
 #ifdef MOZ_WIDGET_QT
 #include "nsQAppInstance.h"
 #endif
 #include "ContentChild.h"
 #include "CrashReporterChild.h"
 #include "TabChild.h"
 +#if defined(MOZ_SYDNEYAUDIO)
 #include "AudioChild.h"
 +#endif
 #include "mozilla/ipc/TestShellChild.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/ipc/XPCShellEnvironment.h"
 #include "mozilla/jsipc/PContextWrapperChild.h"
 #include "mozilla/dom/ExternalHelperAppChild.h"
 #include "mozilla/dom/StorageChild.h"
 #include "mozilla/dom/PCrashReporterChild.h"
 +#if defined(MOZ_SYDNEYAUDIO)
 #include "nsAudioStream.h"
 +#endif
 #include "nsIMemoryReporter.h"
 #include "nsIObserverService.h"
 #include "nsTObserverArray.h"
 #include "nsIObserver.h"
 #include "nsIPrefService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsXULAppAPI.h"
 #include "nsWeakReference.h"
@@ -379,26 +383,32 @@ ContentChild::RecvPTestShellConstructor(
     return true;
 }
 PAudioChild*
 ContentChild::AllocPAudio(const PRInt32& numChannels,
                           const PRInt32& rate,
                           const PRInt32& format)
 {
 +#if defined(MOZ_SYDNEYAUDIO)
     AudioChild *child = new AudioChild();
     NS_ADDREF(child);
     return child;
 +#else
 +    return nsnull;
 +#endif
 }
 bool
 ContentChild::DeallocPAudio(PAudioChild* doomed)
 {
 +#if defined(MOZ_SYDNEYAUDIO)
     AudioChild *child = static_cast<AudioChild*>(doomed);
     NS_RELEASE(child);
 +#endif
     return true;
 }
 PNeckoChild* 
 ContentChild::AllocPNecko()
 {
     return new NeckoChild();
 }
 diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
 --- a/dom/ipc/ContentParent.cpp
 +++ b/dom/ipc/ContentParent.cpp
@@ -63,17 +63,19 @@
 #include "nsCExternalHandlerService.h"
 #include "nsFrameMessageManager.h"
 #include "nsIAlertsService.h"
 #include "nsToolkitCompsCID.h"
 #include "nsIDOMGeoGeolocation.h"
 #include "nsIConsoleService.h"
 #include "nsIScriptError.h"
 #include "nsConsoleMessage.h"
 +#if defined(MOZ_SYDNEYAUDIO)
 #include "AudioParent.h"
 +#endif
 #if defined(ANDROID) || defined(LINUX)
 #include <sys/time.h>
 #include <sys/resource.h>
 #endif
 #ifdef MOZ_PERMISSIONS
 #include "nsPermissionManager.h"
@@ -682,26 +684,32 @@ ContentParent::DeallocPTestShell(PTestSh
   return true;
 }
 PAudioParent*
 ContentParent::AllocPAudio(const PRInt32& numChannels,
                            const PRInt32& rate,
                            const PRInt32& format)
 {
 +#if defined(MOZ_SYDNEYAUDIO)
     AudioParent *parent = new AudioParent(numChannels, rate, format);
     NS_ADDREF(parent);
     return parent;
 +#else
 +    return nsnull;
 +#endif
 }
 bool
 ContentParent::DeallocPAudio(PAudioParent* doomed)
 {
 +#if defined(MOZ_SYDNEYAUDIO)
     AudioParent *parent = static_cast<AudioParent*>(doomed);
     NS_RELEASE(parent);
 +#endif
     return true;
 }
 PNeckoParent* 
 ContentParent::AllocPNecko()
 {
     return new NeckoParent();
 }
 diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in
 --- a/dom/ipc/Makefile.in
 +++ b/dom/ipc/Makefile.in
@@ -51,38 +51,45 @@ DIRS = tests
 DIRS = tests
 endif
 EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h
 EXPORTS_NAMESPACES = mozilla/dom
 EXPORTS_mozilla/dom = \
 -  AudioChild.h \
 -  AudioParent.h \
   ContentChild.h \
   ContentParent.h \
   ContentProcess.h \
   CrashReporterChild.h \
   CrashReporterParent.h \
   TabParent.h \
   TabChild.h \
   $(NULL)
 CPPSRCS = \
 -  AudioChild.cpp \
 -  AudioParent.cpp \
   ContentProcess.cpp \
   ContentParent.cpp \
   ContentChild.cpp \
   CrashReporterParent.cpp \
   TabParent.cpp \
   TabChild.cpp \
   TabMessageUtils.cpp \
   $(NULL)
 +
 +ifdef MOZ_SYDNEYAUDIO
 +EXPORTS_mozilla/dom += \
 +  AudioChild.h \
 +  AudioParent.h \
 +  $(NULL)
 +CPPSRCS += \
 +  AudioChild.cpp \
 +  AudioParent.cpp \
 +  $(NULL)
 +endif
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/events/src \
--- a/net-libs/xulrunner/files/fix-animated-gifs.patch
+++ b/net-libs/xulrunner/files/fix-animated-gifs.patch
@ -1,246 +0,0 @@
 # HG changeset patch
 # User Rafał Mużyło <galtgendo@o2.pl>
 # Parent 69e253891ca3839b6d4b8f5cb7c0e6950bb66902
 Fix animated gif flickering bug 597174
 diff --git a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
 --- a/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
 +++ b/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -197,30 +197,29 @@ static NS_METHOD ReadDataOut(nsIInputStr
 }
 // Push any new rows according to mCurrentPass/mLastFlushedPass and
 // mCurrentRow/mLastFlushedRow.  Note: caller is responsible for
 // updating mlastFlushed{Row,Pass}.
 nsresult
 nsGIFDecoder2::FlushImageData(PRUint32 fromRow, PRUint32 rows)
 {
 -  nsIntRect r(0, fromRow, mGIFStruct.width, rows);
 +  nsIntRect r(mGIFStruct.x_offset, mGIFStruct.y_offset + fromRow, mGIFStruct.width, rows);
   // Update image  
   nsresult rv = mImageContainer->FrameUpdated(mGIFStruct.images_decoded, r);
   if (NS_FAILED(rv)) {
     return rv;
   }
   // Offset to the frame position
   // Only notify observer(s) for first frame
   if (!mGIFStruct.images_decoded && mObserver) {
     PRUint32 imgCurFrame;
     mImageContainer->GetCurrentFrameIndex(&imgCurFrame);
 -    r.y += mGIFStruct.y_offset;
     mObserver->OnDataAvailable(nsnull, imgCurFrame == PRUint32(mGIFStruct.images_decoded), &r);
   }
   return NS_OK;
 }
 nsresult
 nsGIFDecoder2::FlushImageData()
 {
 diff --git a/modules/libpr0n/src/imgContainer.cpp b/modules/libpr0n/src/imgContainer.cpp
 --- a/modules/libpr0n/src/imgContainer.cpp
 +++ b/modules/libpr0n/src/imgContainer.cpp
@@ -415,16 +415,18 @@ nsresult imgContainer::InternalAddFrameH
   nsAutoPtr<imgFrame> frame(aFrame);
   if (paletteData && paletteLength)
     frame->GetPaletteData(paletteData, paletteLength);
   frame->GetImageData(imageData, imageLength);
 +  frame->LockImageData();
 +
   mFrames.InsertElementAt(framenum, frame.forget());
   mNumFrames++;
   return NS_OK;
 }
 nsresult imgContainer::InternalAddFrame(PRUint32 framenum,
                                         PRInt32 aX, PRInt32 aY,
@@ -440,16 +442,21 @@ nsresult imgContainer::InternalAddFrame(
     return NS_ERROR_INVALID_ARG;
   nsAutoPtr<imgFrame> frame(new imgFrame());
   NS_ENSURE_TRUE(frame, NS_ERROR_OUT_OF_MEMORY);
   nsresult rv = frame->Init(aX, aY, aWidth, aHeight, aFormat, aPaletteDepth);
   NS_ENSURE_SUCCESS(rv, rv);
 +  if (mFrames.Length() > 0) {
 +    imgFrame *prevframe = mFrames.ElementAt(mFrames.Length() - 1);
 +    prevframe->UnlockImageData();
 +  }
 +
   if (mFrames.Length() == 0) {
     return InternalAddFrameHelper(framenum, frame.forget(), imageData, imageLength, 
                                   paletteData, paletteLength);
   }
   if (mFrames.Length() == 1) {
     // Since we're about to add our second frame, initialize animation stuff
     if (!ensureAnimExists())
 diff --git a/modules/libpr0n/src/imgFrame.cpp b/modules/libpr0n/src/imgFrame.cpp
 --- a/modules/libpr0n/src/imgFrame.cpp
 +++ b/modules/libpr0n/src/imgFrame.cpp
@@ -152,16 +152,17 @@ imgFrame::imgFrame() :
   mBlendMethod(1), /* imgIContainer::kBlendOver */
   mSinglePixel(PR_FALSE),
   mNeverUseDeviceSurface(PR_FALSE),
   mFormatChanged(PR_FALSE),
   mCompositingFailed(PR_FALSE)
 #ifdef USE_WIN_SURFACE
   , mIsDDBSurface(PR_FALSE)
 #endif
 +  , mLocked(PR_FALSE)
 {
   static PRBool hasCheckedOptimize = PR_FALSE;
   if (!hasCheckedOptimize) {
     if (PR_GetEnv("MOZ_DISABLE_IMAGE_OPTIMIZE")) {
       gDisableOptimize = PR_TRUE;
     }
     hasCheckedOptimize = PR_TRUE;
   }
@@ -413,18 +414,17 @@ void imgFrame::Draw(gfxContext *aContext
   nsRefPtr<gfxASurface> surface;
   gfxImageSurface::gfxImageFormat format;
   NS_ASSERTION(!sourceRect.Intersect(subimage).IsEmpty(),
                "We must be allowed to sample *some* source pixels!");
   PRBool doTile = !imageRect.Contains(sourceRect);
   if (doPadding || doPartialDecode) {
 -    gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height) +
 -      gfxPoint(aPadding.left, aPadding.top);
 +    gfxRect available = gfxRect(mDecoded.x, mDecoded.y, mDecoded.width, mDecoded.height);
     if (!doTile && !mSinglePixel) {
       // Not tiling, and we have a surface, so we can account for
       // padding and/or a partial decode just by twiddling parameters.
       // First, update our user-space fill rect.
       sourceRect = sourceRect.Intersect(available);
       gfxMatrix imageSpaceToUserSpace = userSpaceToImageSpace;
       imageSpaceToUserSpace.Invert();
@@ -708,17 +708,17 @@ nsresult imgFrame::ImageUpdated(const ns
   mem->IsLowMemory(&lowMemory);
   if (lowMemory)
     return NS_ERROR_OUT_OF_MEMORY;
   mDecoded.UnionRect(mDecoded, aUpdateRect);
   // clamp to bounds, in case someone sends a bogus updateRect (I'm looking at
   // you, gif decoder)
 -  nsIntRect boundsRect(0, 0, mSize.width, mSize.height);
 +  nsIntRect boundsRect(mOffset, mSize);
   mDecoded.IntersectRect(mDecoded, boundsRect);
 #ifdef XP_MACOSX
   if (mQuartzSurface)
     mQuartzSurface->Flush();
 #endif
   return NS_OK;
 }
@@ -806,17 +806,23 @@ void imgFrame::GetPaletteData(PRUint32 *
     *aPalette = (PRUint32 *) mPalettedImageData;
     *length = PaletteDataLength();
   }
 }
 nsresult imgFrame::LockImageData()
 {
   if (mPalettedImageData)
 -    return NS_OK;
 +    return NS_ERROR_NOT_AVAILABLE;
 +
 +  NS_ABORT_IF_FALSE(!mLocked, "Trying to lock already locked image data.");
 +  if (mLocked) {
 +    return NS_ERROR_FAILURE;
 +  }
 +  mLocked = PR_TRUE;
   if ((mOptSurface || mSinglePixel) && !mImageSurface) {
     // Recover the pixels
     mImageSurface = new gfxImageSurface(gfxIntSize(mSize.width, mSize.height),
                                         gfxImageSurface::ImageFormatARGB32);
     if (!mImageSurface || mImageSurface->CairoStatus())
       return NS_ERROR_OUT_OF_MEMORY;
@@ -832,23 +838,35 @@ nsresult imgFrame::LockImageData()
 #ifdef USE_WIN_SURFACE
     mWinSurface = nsnull;
 #endif
 #ifdef XP_MACOSX
     mQuartzSurface = nsnull;
 #endif
   }
 +  if (mImageSurface)
 +    mImageSurface->Flush();
 +
   return NS_OK;
 }
 nsresult imgFrame::UnlockImageData()
 {
   if (mPalettedImageData)
 -    return NS_OK;
 +    return NS_ERROR_NOT_AVAILABLE;
 +
 +  NS_ABORT_IF_FALSE(mLocked, "Unlocking an unlocked image!");
 +  if (!mLocked) {
 +    return NS_ERROR_FAILURE;
 +  }
 +  mLocked = PR_FALSE;
 +
 +  if (mImageSurface)
 +    mImageSurface->MarkDirty();
 #ifdef XP_MACOSX
   if (mQuartzSurface)
     mQuartzSurface->Flush();
 #endif
   return NS_OK;
 }
@@ -895,17 +913,17 @@ PRInt32 imgFrame::GetBlendMethod() const
 void imgFrame::SetBlendMethod(PRInt32 aBlendMethod)
 {
   mBlendMethod = (PRInt8)aBlendMethod;
 }
 PRBool imgFrame::ImageComplete() const
 {
 -  return mDecoded == nsIntRect(0, 0, mSize.width, mSize.height);
 +  return mDecoded == nsIntRect(mOffset, mSize);
 }
 // A hint from the image decoders that this image has no alpha, even
 // though we created is ARGB32.  This changes our format to RGB24,
 // which in turn will cause us to Optimize() to RGB24.  Has no effect
 // after Optimize() is called, though in all cases it will be just a
 // performance win -- the pixels are still correct and have the A byte
 // set to 0xff.
 diff --git a/modules/libpr0n/src/imgFrame.h b/modules/libpr0n/src/imgFrame.h
 --- a/modules/libpr0n/src/imgFrame.h
 +++ b/modules/libpr0n/src/imgFrame.h
@@ -167,16 +167,17 @@ private: // data
   gfxASurface::gfxImageFormat mFormat;
   PRInt8       mPaletteDepth;
   PRInt8       mBlendMethod;
   PRPackedBool mSinglePixel;
   PRPackedBool mNeverUseDeviceSurface;
   PRPackedBool mFormatChanged;
   PRPackedBool mCompositingFailed;
 +  PRPackedBool mLocked;
 #ifdef XP_WIN
   PRPackedBool mIsDDBSurface;
 #endif
 };
 #endif /* imgFrame_h */
--- a/net-libs/xulrunner/files/libnotify-0.7.patch
+++ b/net-libs/xulrunner/files/libnotify-0.7.patch
@ -1,56 +0,0 @@
 # HG changeset patch
 # User Priit Laes <plaes@plaes.org>
 # Parent 194dd9a57615185c998a87148fac65df51600758
 Bug 628222 - Add support for libnotify-0.7+. r=karlt
 diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
 --- a/toolkit/system/gnome/nsAlertsIconListener.cpp
 +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
@@ -42,16 +42,21 @@
 #include "nsNetUtil.h"
 #include "nsIImageToPixbuf.h"
 #include "nsIStringBundle.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libnotify/notify.h>
 #include <gdk/gdk.h>
 +// Compatibility macro for <libnotify-0.7
 +#ifndef NOTIFY_CHECK_VERSION
 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
 +#endif
 +
 static PRBool gHasActions = PR_FALSE;
 static void notify_action_cb(NotifyNotification *notification,
                              gchar *action, gpointer user_data)
 {
   nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
   alert->SendCallback();
 }
@@ -199,17 +204,23 @@ nsAlertsIconListener::OnStopFrame(imgIRe
   return NS_OK;
 }
 nsresult
 nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
 {
   NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
                                                        mAlertText.get(),
 -                                                       NULL, NULL);
 +                                          NULL
 +// >=libnotify-0.7.0 has no support for attaching to widgets
 +#if !NOTIFY_CHECK_VERSION(0,7,0)
 +                                          , NULL
 +#endif
 +                                          );
 +
   if (!notify)
     return NS_ERROR_OUT_OF_MEMORY;
   if (aPixbuf)
     notify_notification_set_icon_from_pixbuf(notify, aPixbuf);
   NS_ADDREF(this);
   if (mAlertHasAction) {
--- a/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch
+++ b/net-libs/xulrunner/files/mozilla-2.0_arm_respect_cflags.patch
@ -1,80 +0,0 @@
 diff -ur mozilla-release.orig//configure.in mozilla-release/configure.in
 --- mozilla-release.orig//configure.in	2011-07-17 13:44:12.000000000 +0200
 +++ mozilla-release/configure.in	2011-07-17 13:46:50.000000000 +0200
@@ -7165,9 +7165,6 @@
       if test "$GNU_CC"; then
         AC_DEFINE(MOZ_THUMB2)
         AC_DEFINE(MOZ_ARM_ARCH)
 -        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
       else
         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
       fi
@@ -7181,9 +7178,6 @@
     arm*)
       if test "$GNU_CC"; then
         AC_DEFINE(MOZ_ARM_ARCH)
 -        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
       else
         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
       fi
@@ -7192,16 +7186,6 @@
       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
     ;;
   esac
 -else
 -  case "$target_cpu" in
 -    arm*)
 -      if test "$GNU_CC"; then
 -        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
 -        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
 -        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
 -      fi
 -      ;;
 -  esac
 fi
 AC_SUBST(MOZ_THUMB2)
 diff -ur mozilla-release.orig//js/src/configure.in mozilla-release/js/src/configure.in
 --- mozilla-release.orig//js/src/configure.in	2011-07-17 13:43:42.000000000 +0200
 +++ mozilla-release/js/src/configure.in	2011-07-17 13:47:39.000000000 +0200
@@ -4607,9 +4607,6 @@
       if test "$GNU_CC"; then
         AC_DEFINE(MOZ_THUMB2)
         AC_DEFINE(MOZ_ARM_ARCH)
 -        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
       else
         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
       fi
@@ -4623,9 +4620,6 @@
     arm*)
       if test "$GNU_CC"; then
         AC_DEFINE(MOZ_ARM_ARCH)
 -        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
 -        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
       else
         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
       fi
@@ -4634,16 +4628,6 @@
       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
     ;;
   esac
 -else
 -  case "$target_cpu" in
 -    arm*)
 -      if test "$GNU_CC"; then
 -        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
 -        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
 -        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
 -      fi
 -      ;;
 -  esac
 fi
 AC_SUBST(MOZ_THUMB2)
--- a/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
+++ b/net-libs/xulrunner/files/mozilla-2.0_support_64bit_big_endian.patch
@ -1,60 +0,0 @@
 # HG changeset patch
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1303461188 -7200
 # Node ID 59771590e9203d48ef8cbcd7eaf2f8ae45dbb1c1
 # Parent  c4b82ec27d6d6e1c02ef0abb3b6e805bfdd092ec
 Bug 638056 - Avoid "The cacheFlush support is missing on this platform" error on exotic platforms. r=cdleary
 diff --git a/js/src/Makefile.in b/js/src/Makefile.in
 --- a/js/src/Makefile.in
 +++ b/js/src/Makefile.in
@@ -383,17 +383,17 @@ CPPSRCS += 	checks.cc \
 		platform.cc \
 		utils.cc \
 		$(NONE)
 #
 # END enclude sources for V8 dtoa
 #############################################
 -ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
 +ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
 VPATH +=	$(srcdir)/assembler \
 		$(srcdir)/assembler/wtf \
 		$(srcdir)/yarr/pcre \
 		$(NULL)
 CPPSRCS += 	pcre_compile.cpp \
                 pcre_exec.cpp \
 # HG changeset patch
 # User Luke Wagner <lw@mozilla.com>
 # Date 1299520258 28800
 # Node ID 68203913d04cf5be53fd16278816183d5670ba5c
 # Parent  27e5814815491ebb68e474e453aff6c2ea908c43
 Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
 diff --git a/js/src/jsval.h b/js/src/jsval.h
 --- a/js/src/jsval.h
 +++ b/js/src/jsval.h
@@ -342,16 +342,17 @@ typedef union jsval_layout
         JSValueTag         tag : 17;
         uint64             payload47 : 47;
     } debugView;
     struct {
         union {
             int32          i32;
             uint32         u32;
             JSWhyMagic     why;
 +            jsuword        word;
         } payload;
     } s;
     double asDouble;
     void *asPtr;
 } jsval_layout;
 # endif /* JS_BITS_PER_WORD */
 #endif  /* defined(IS_LITTLE_ENDIAN) */
--- a/net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch
+++ b/net-libs/xulrunner/files/xulrunner-1.9.2-gtk+-2.21.patch
@ -1,23 +0,0 @@
 # HG changeset patch
 # User Jonathan Callen <abcd@gentoo.org>
 # Parent 2599ed882191d88a8e8f0cb68492a156163c5ca7
 pass MOZ_GTK_CFLAGS to ensure proper includes are avaliable.
 diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
 --- a/toolkit/system/gnome/Makefile.in
 +++ b/toolkit/system/gnome/Makefile.in
@@ -84,13 +84,14 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_LIBNOTIFY_LIBS) \
 		$(NULL)
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 include $(topsrcdir)/config/rules.mk
 CXXFLAGS += \
 +	$(MOZ_GTK2_CFLAGS) \
 	$(MOZ_GCONF_CFLAGS) \
 	$(MOZ_GNOMEVFS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(MOZ_LIBNOTIFY_CFLAGS) \
 	$(NULL)
--- a/net-libs/xulrunner/files/xulrunner-default-prefs.js
+++ b/net-libs/xulrunner/files/xulrunner-default-prefs.js
@ -1,14 +0,0 @@
 pref("app.update.enabled",                 false);
 pref("app.update.autoInstallEnabled",      false);
 pref("browser.display.use_system_colors",  true);
 pref("browser.link.open_external",         3);
 pref("general.smoothScroll",               true);
 pref("general.autoScroll",                 false);
 pref("browser.tabs.tabMinWidth",           15);
 pref("browser.backspace_action",           0);
 pref("browser.urlbar.hideGoButton",        true);
 pref("accessibility.typeaheadfind",        true);
 pref("browser.shell.checkDefaultBrowser",  false); 
 pref("browser.EULA.override",              true); 
 pref("general.useragent.vendor", "Gentoo");
 pref("intl.locale.matchOS", true);
--- a/net-libs/xulrunner/metadata.xml
+++ b/net-libs/xulrunner/metadata.xml
@ -1,15 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>mozilla</herd>
  <use>
    <flag name="custom-optimization">Fine-tune custom compiler optimizations</flag>
 	<flag name="ipc">Use inter-process communication between tabs and plugins.
 		Allows for greater stability in case of plugin crashes</flag>
    <flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
        installation with secure-delete enabled</flag>
    <flag name="webm">Use system libvpx <pkg>media-libs/libvpx</pkg></flag>
    <flag name="crashreporter">Enable crash reporter for bugs</flag>
    <flag name="gconf">Enable gnome2 gconf support</flag>
  </use>
 </pkgmetadata>
--- a/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild
@ -1,263 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.22.ebuild,v 1.3 2011/12/11 14:31:32 armin76 Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils
 MY_PV="${PV/_rc/rc}" # Handle beta
 MY_PV="${MY_PV/1.9.2/3.6}"
 MAJ_PV="1.9.2" # from mozilla-* branch name
 PATCH="${PN}-1.9.2-patches-0.9"
 DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
 HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.8
 	>=dev-libs/nspr-4.8.6
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] )
 	alsa? ( media-libs/alsa-lib )
 	>=app-text/hunspell-1.2
 	>=x11-libs/cairo-1.8.8[X]
 	x11-libs/libXt
 	x11-libs/pixman
 	>=dev-libs/libevent-1.4.7
 	gnome? ( >=gnome-base/gnome-vfs-2.16.3
 		>=gnome-base/libgnomeui-2.16.1
 		>=gnome-base/gconf-2.16.0
 		>=gnome-base/libgnome-2.16.0 )
 	wifi? ( net-wireless/wireless-tools )
 	libnotify? ( >=x11-libs/libnotify-0.4 )"
 DEPEND="java? ( >=virtual/jdk-1.4 )
 	${RDEPEND}
 	=dev-lang/python-2*[threads]
 	dev-util/pkgconfig"
 # virtual/jre should not be in DEPEND. bug 325981
 RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
 S="${WORKDIR}/mozilla-${MAJ_PV}"
 pkg_setup() {
 	# Ensure we always build with C locale.
 	export LANG="C"
 	export LC_ALL="C"
 	export LC_MESSAGES="C"
 	export LC_CTYPE="C"
 	java-pkg-opt-2_pkg_setup
 	python_set_active_version 2
 }
 src_prepare() {
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 	epatch "${FILESDIR}/bug-606109.patch"
 	epatch "${FILESDIR}/bug-270163.patch"
 	eprefixify \
 		extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
 		xpcom/build/nsXPCOMPrivate.h \
 		xulrunner/installer/Makefile.in \
 		xulrunner/app/nsRegisterGREUnix.cpp
 	# fix double symbols due to double -ljemalloc
 	sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
 		xulrunner/stub/Makefile.in || die
 	#Fix compilation with curl-7.21.7 bug 376027
 	sed -e '/#include <curl\/types\.h>/d' \
 		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
 		-i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
 			|| die
 	sed -e '/curl\/types\.h/d' \
 		-i "${S}"/config/system-headers \
 		-i "${S}"/js/src/config/system-headers \
 			|| die
 	# Allow user to apply additional patches without modifing ebuild
 	epatch_user
 	# Same as in config/autoconf.mk.in
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
 	# Gentoo install dirs
 	sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
 		|| die "${MAJ_PV} sed failed!"
 	# Enable gnomebreakpad
 	if use debug ; then
 		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
 			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
 	fi
 	eautoreconf
 	cd js/src
 	eautoreconf
 }
 src_configure() {
 	####################################
 	#
 	# mozconfig, CFLAGS and CXXFLAGS setup
 	#
 	####################################
 	mozconfig_init
 	mozconfig_config
 	MEXTENSIONS="default"
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 	# It doesn't compile on alpha without this LDFLAGS
 	use alpha && append-ldflags "-Wl,--no-relax"
 	mozconfig_annotate '' --enable-crypto
 	mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
 	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
 	mozconfig_annotate '' --enable-application=xulrunner
 	mozconfig_annotate '' --disable-mailnews
 	mozconfig_annotate 'broken' --disable-crashreporter
 	mozconfig_annotate '' --enable-image-encoder=all
 	mozconfig_annotate '' --enable-canvas
 	mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
 	# Bug 60668: Galeon doesn't build without oji enabled, so enable it
 	# regardless of java setting.
 	mozconfig_annotate '' --enable-oji --enable-mathml
 	mozconfig_annotate 'places' --enable-storage --enable-places
 	mozconfig_annotate '' --enable-safe-browsing
 	# Build mozdevelop permately
 	mozconfig_annotate ''  --enable-jsd --enable-xpctools
 	# System-wide install specs
 	mozconfig_annotate '' --disable-installer
 	mozconfig_annotate '' --disable-updater
 	mozconfig_annotate '' --disable-strip
 	mozconfig_annotate '' --disable-install-strip
 	# Use system libraries
 	mozconfig_annotate '' --enable-system-cairo
 	mozconfig_annotate '' --enable-system-hunspell
 	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
 	mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
 	mozconfig_annotate '' --with-system-bz2
 	mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
 	mozconfig_use_enable gnome gnomevfs
 	mozconfig_use_enable gnome gnomeui
 	mozconfig_use_enable ipc # +ipc, upstream default
 	mozconfig_use_enable libnotify
 	mozconfig_use_enable java javaxpcom
 	mozconfig_use_enable wifi necko-wifi
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
 	mozconfig_use_enable system-sqlite
 	# Debug
 	if use debug ; then
 		mozconfig_annotate 'debug' --disable-optimize
 		mozconfig_annotate 'debug' --enable-debug=-ggdb
 		mozconfig_annotate 'debug' --enable-debug-modules=all
 		mozconfig_annotate 'debug' --enable-debugger-info-modules
 	fi
 	# Finalize and report settings
 	mozconfig_final
 	if [[ $(gcc-major-version) -lt 4 ]]; then
 		append-flags -fno-stack-protector
 	fi
 	####################################
 	#
 	#  Configure and build
 	#
 	####################################
 	# Disable no-print-directory
 	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
 	# Ensure that are plugins dir is enabled as default
 	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
 		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
 	# hack added to workaround bug 299905 on hosts with libc that doesn't
 	# support tls, (probably will only hit this condition with Gentoo Prefix)
 	tc-has-tls -l || export ac_cv_thread_keyword=no
 	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	rm "${ED}"/usr/bin/xulrunner
 	MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
 	SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
 	if has_multilib_profile; then
 		local config
 		for config in "${ED}"/etc/gre.d/*.system.conf ; do
 			mv "${config}" "${config%.conf}.${CHOST}.conf"
 		done
 	fi
 	dodir /usr/bin
 	dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
 	# env.d file for ld search path
 	dodir /etc/env.d
 	echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
 	# Add our defaults to xulrunner and out of firefox
 	cp "${FILESDIR}"/xulrunner-default-prefs.js \
 		"${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
 			die "failed to cp xulrunner-default-prefs.js"
 	pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
 	if use java ; then
 		java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
 		java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
 		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
 		java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
 	fi
 }
 pkg_postinst() {
 	ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
 	ewarn "If that does not fix the problem, rebuild dev-libs/nss"
 	ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
 	einfo
 	einfo "All prefs can be overridden by the user. The preferences are to make"
 	einfo "use of xulrunner out of the box on an average system without the user"
 	einfo "having to go through and enable the basics."
 	einfo
 	ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
 	ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
 	ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
 }
--- a/net-misc/twonkymedia/Manifest
+++ b/net-misc/twonkymedia/Manifest
@ -1,11 +1,7 @@
 AUX twonkymedia.initd 2402 SHA256 25ef19623aae72a5857843b308d8380c74182c140e507e1840e3d78fab997cbd SHA512 2e3b4c0e7e5dd8663276c57b2e788996e7b57fe3948f9e954aa93037a3459e0da0fa7c8780ccb3f652d22ed69782004b3b6991a9eaf342f632723ac0b0bb1b7a WHIRLPOOL 59f89147ecd49009a41263435d802f8e4dfd87893a1333d426a5b206302d0d7b96332c805fecae597e763aebe046534c9ea7a589426b1f7ded108497343bbd8f
 DIST twonkymedia-armel-glibc-2.2.5-6.0.38.zip 2113595 SHA256 42eea3db594eefd8660834e732003f6507212a262c25f743d8a7a4ca81299c95
 DIST twonkymedia-armel-glibc-2.2.5-6.0.39.zip 2126530 SHA256 5b11f8be3972adc81809483db5402702c3406ed0e602735fc437d98595d8cb6b
 DIST twonkymedia-i386-glibc-2.2.5-6.0.38.zip 3400110 SHA256 231b9208aa131f3e16e5bc41dbf389fa3ee437d3d316d4b6412ea821e571ab7a
 DIST twonkymedia-i386-glibc-2.2.5-6.0.39.zip 3412688 SHA256 042b380d71d94843edd8ad01bff6c0aa1aacf6b050cc1b8430e63dbe7570d8f9
 DIST twonkymedia-kirkwood-6.0.38.zip 2115297 SHA256 5716ee36dda9d095a880a0e830f33e2e0acf01d8fa241784279dac41a6808c1c
 DIST twonkymedia-kirkwood-6.0.39.zip 2127488 SHA256 8b6e8999c317c4e6c9858835c97cc653091de269873930629790cc9af98c92e2
 EBUILD twonkymedia-6.0.38.ebuild 1975 SHA256 241583910aae20e1e1ff33e61b099f679e2be1fbf190b4873cdf11f04e78cfc2 SHA512 b5c4f01df6012345f93747675d0acb520a5015039d6e568478602b51b908a978f180fbb87bd40f9822f291b7dea1d8eff69ef54dc94a207db0c56f644521f8b9 WHIRLPOOL aca91e520a74ee44ba5c8dec22b2bb32da13ae9a05355dbf747ac8bda50ab78e780a8404380e473fa76ab1c346ae6ba3f451caefe79eeda89099d354a23235cb
 EBUILD twonkymedia-6.0.39.ebuild 1975 SHA256 41a93eab9b57c3ca2a641f756a23583d8a5b7cf898a288a8e07684917eeb3b88 SHA512 325f99eacc787f10953cee872095eb0ad000551f2e7093aafa9875eba15b620202d623f2e18064291e0e63b0827bd85a98162cdf7f16accb120e3885436797aa WHIRLPOOL d4ec352dc40d372fbbf164711c1a55cbb600222a68b252888167242abb796a49ca40500a8d8e1d1af8724d0aff6a6caec05d8a1f5361af0e3266189b1a9a20c5
 MISC ChangeLog 670 SHA256 895d06c421823a7d8e2ff669b83df4f0791cfeb030d60ea563c599acf966f3f2 SHA512 ae03357377c36f14a02a7ba28e0942edf04bb86c02efc81ae0137822dc08787af24eeedc9b687f84b047de374e0de88e19d664662a5bf3e89a3d4f6c636f07c5 WHIRLPOOL cac0cff85ea926797e0ae38daff67a01a78a3183065e3757569f21d4d4ac6e7326146f5d55088c3847d3ca851cfd549a5adeee3de58d2076705b8581f2554838
 MISC metadata.xml 273 SHA256 9538d9b03de39acce753f3b37c282c146e6de540b37588aee26b1a2b404dde1d SHA512 fc6f519c6b13824ab049e7f416cb4dd32146d9c52098a40b26c98e691781d1fff5ff0197456cef78ecc644da993ea6fcff1d370cd1fbb8c8365aba2f25dcf141 WHIRLPOOL e49afc5a4caac6f76ed53f026062f18608274aea56e1a86493043a21e9dcb293321acc94fc843666f8920c2d85e5d81b684007c9ce4201534b3c61a57697bc4e
--- a/net-misc/twonkymedia/twonkymedia-6.0.38.ebuild
+++ b/net-misc/twonkymedia/twonkymedia-6.0.38.ebuild
@ -1,80 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 inherit eutils multilib
 SUFFIX="zip"
 X86_AT="twonkymedia-i386-glibc-2.2.5-${PV}.${SUFFIX}"
 AMD64_AT="twonkymedia-i386-glibc-2.2.5-${PV}.${SUFFIX}"
 ARMV5_AT="twonkymedia-kirkwood-${PV}.${SUFFIX}"
 # not tested on armv6
 ARMV6_AT="twonkymedia-armel-glibc-2.2.5-${PV}.${SUFFIX}"
 ARMV7_AT="twonkymedia-armel-glibc-2.2.5-${PV}.${SUFFIX}"
 DESCRIPTION="Stream your Media to the devices on your Netowrk"
 HOMEPAGE="http://www.twonky.com/"
 URL_BASE="http://www.twonkyforum.com/downloads/${PV}"
 SRC_URI="arm? ( ${URL_BASE}/${ARMV5_AT}
 		${URL_BASE}/${ARMV6_AT}
 		${URL_BASE}/${ARMV7_AT} )
 	x86? ( ${URL_BASE}/${X86_AT} )
 	amd64? ( ${URL_BASE}/${X86_AT} )"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT="strip"
 IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/glibc
 	sys-devel/gcc"
 QA_EXECSTACK="opt/twonkymedia/cgi-bin/convert
 	opt/twonkymedia/cgi-bin/cgi-jpegscale
 	opt/twonkymedia/twonkymediaserver
 	opt/twonkymedia/twonkymedia
 	opt/twonkymedia/plugins/mediafusion-integration-plugin
 	opt/twonkymedia/plugins/itunes-import"
 S="${WORKDIR}"
 src_unpack() {
 	einfo "Unpacking for arch ${CHOST/-*/}"
 	if [[ ${CHOST/-*/} = "armv5tel" ]]; then
 		unpack ${ARMV5_AT}
 	elif [[ ${CHOST/-*/} = "armv6j" ]]; then
 		unpack ${ARMV6_AT}
 	elif [[ ${CHOST/-*/} = "armv7a" ]]; then
 		unpack ${ARMV7_AT}
 	elif [[ ${ARCH} = "x86" ]]; then
 		unpack ${X86_AT}
 	elif [[ ${ARCH} = "amd64" ]]; then
 		unpack ${X86_AT}
 	fi
 }
 src_compile() { :; }
 src_install() {
 	local dirs="cgi-bin plugins resources"
 	dodir /opt/${PN}
 	cp -pPR $dirs "${D}/opt/${PN}/" || die "failed to copy"
 	insinto /opt/${PN}
 	doins initial_keystore.dat radio.m3u config.html twonkymedia-server-default.ini
 	exeinto /opt/${PN}
 	doexe twonkymedia twonkymediaserver
 	dodoc Linux-HowTo.txt RevisionHistory || die
 	newinitd "${FILESDIR}"/twonkymedia.initd twonkymedia
 }
 #pkg_postinst() {
 #}
--- a/sys-apps/micro-evtd/Manifest
+++ b/sys-apps/micro-evtd/Manifest
@ -5,6 +5,5 @@ AUX strEventScript-size.patch 994 SHA256 72fc662b70265a0a9ce4f5f5ea16f43f3157b5a
 DIST micro-evtd_3.4-2.debian.tar.gz 10216 SHA256 d930803194bd66a748bbfa969eddef7ac5303c42a50b8f4828e486d4b440992e SHA512 5e85d6fce67ec940b9dd9cec0dd4e924850a291617ecc13bf10958da6de3c6f9b2eaf40a8ba9520715e757521d656a70280df68d83e22f562fba2b451d17145a WHIRLPOOL 8d2a0b88e13317087d7ce509bcd623e60d281f236eff945d0c685bc903c165e3b9225f7b659f00645dcccb2998da099dda97e768ed9516767b0c4d358eb73a2c
 DIST micro-evtd_3.4.orig.tar.gz 46049 SHA256 3f4009267706346a31d5bdba788f2c294d1aed5c4ab1b8108f234e168e09c2e4
 EBUILD micro-evtd-3.4.2-r1.ebuild 1676 SHA256 fa82624653ad95b76ee952007215a62e602c88659b85f22476cf8a1c959c6087 SHA512 2042bdba5f1320810a8fb584d49f6f94acf9965e0c8beffbf83e3dae8c1d4eba1f0c5224aefb5d913f02e5025949c166eb876657764775b82379621637d127b0 WHIRLPOOL 90585d6e092626fbd89e59f41389a2d53dc7e05c1caaacd5fed2cce9258b27397d90fb9629ae68a5a486a2760c9ecc8c6eeff03569d0d936f34de572b57ce6ca
 EBUILD micro-evtd-3.4.2.ebuild 2008 SHA256 1d69d20144fb81138c03469ca6b258e20035578dcd3b499e43998664026d9164 SHA512 1db79022994dea0b36aef62540e9f4d91b531e90d5e964d10e3c24125c44cc173fb217db5e21553252368863f801a50b28b66339dbbd96b84b2ddcc40ca5bd61 WHIRLPOOL 94acea5305e4cfc9f487e6abc6b6f6004983f6d6ba26ace9515711f5fd187493f20ec44f6c3b456ced8255b1ec2a5b649b8bd96893b0ff7f722eeedc7be80974
 MISC ChangeLog 1620 SHA256 bdc7bc48bcde10af3430d88a5fead3db5ad1089ff6cafaad0fd0a127e9f38b6b SHA512 c2cb2d0cc3af1e085a1aa45c7ab6e09aea92ec6ae8a9af7136e14d7dbb04ba1dfe0a81b581ce996e16d2e65ec1f1ba905147791bd92c396d67842485e31e1b0b WHIRLPOOL 33e9a968fc77d8034bc9e1691730da87bba649975b1f4bf302aa52d2a25a28c7f5f9cbc1eea51278f6ca8857764e7c6282f8e9498dab1c778e1a928dc870feb3
 MISC metadata.xml 703 SHA256 5d17ebbc2e2c0b96fb7ce1ed127ab4e50113ff6d6d79d180fe925efbc0067cad SHA512 7a682963e62047b3cc447b316320c3ccb3e4b5dd3d342bbcb07ccd2be0d37388fa28fd7d58383da4dc4f67b254254993ba57e2c6b7d98259922f935e49d21d5a WHIRLPOOL 22d09ccaa152289afe7fa8b53201c1f525e070de2f8dab5a51b37dd113761a073f29804bce11c2e0eacaaa8a0486e426a1c81c106748544b12f0a5272c273f60
--- a/sys-apps/micro-evtd/micro-evtd-3.4.2.ebuild
+++ b/sys-apps/micro-evtd/micro-evtd-3.4.2.ebuild
@ -1,66 +0,0 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=2
 inherit eutils versionator flag-o-matic toolchain-funcs
 DESCRIPTION="Daemon for Linkstation/Kuro PRO micro controller"
 HOMEPAGE="http://buffalo.nas-central.org/download/Users/lb_worm/micro_evtd/micro_evtd"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm"
 IUSE=""
 RESTRICT="mirror"
 # tarballs use debian versioning format
 MY_PN="micro-evtd"
 MY_PVR=$(replace_version_separator 2 '-' )
 MY_PV=${MY_PVR/-*/}
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 SRC_URI_BASE="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/"
 SRC_URI="${SRC_URI_BASE}${MY_PN}_${MY_PV}.orig.tar.gz
 		${SRC_URI_BASE}${MY_PN}_${MY_PVR}.debian.tar.gz"
 DEPEND=""
 RDEPEND=""
 src_prepare() {
 	EPATCH_SOURCE="${WORKDIR}/debian/patches" EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" EPATCH_EXCLUDE="makefile.patch" epatch
 	ln -sf micro-evtd.mak Makefile
 }
 src_compile() {
 	emake SBIN_PREFIX=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" LDFLAGS="${LDFLAGS}" all || die "emake failed"
 	emake SBIN_PREFIX=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" LDFLAGS="${LDFLAGS}" ts || die "emake failed"
 }
 src_install() {
 	emake SBIN_PREFIX=/usr DESTDIR="${D}" install || die "install failed"
 	mv "${D}"/usr/sbin/micro-evtd "${D}"/usr/sbin/micro-evtd.pro
 	emake SBIN_PREFIX=/usr DESTDIR="${D}" install.ts || die "install failed"
 	mv "${D}"/usr/sbin/micro-evtd "${D}"/usr/sbin/micro-evtd.tera
 	dodoc Changelog README TODO
 	newinitd "${FILESDIR}"/micro-evtd-boot.initd-r2 micro-evtd-boot
 	newinitd "${FILESDIR}"/micro-evtd-default.initd-r2 micro-evtd
 }
 pkg_postinst() {
 	device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \
 		head -n1 | sed "s/^[^:]*: //")
 	case $device in
 		"Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro")
 		dosym micro-evtd.pro /usr/sbin/micro-evtd ;;
 		"Buffalo TeraStation Pro/Live")
 		dosym micro-evtd.tera /usr/sbin/micro-evtd ;;
 		*)
 		ewarn "Your device is unsupported" ;;
 	esac
 }
--- a/sys-kernel/buffalo_ls_chl-sources/Manifest
+++ b/sys-kernel/buffalo_ls_chl-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_chl-3.1.5-arm.config 83391 SHA256 c478df2050325e61a0e3a3d0550bd124397fd0b533f4c49aecb7a017673eea41
 DIST buffalo_ls_chl-3.1.6-arm.config 83391 SHA256 c478df2050325e61a0e3a3d0550bd124397fd0b533f4c49aecb7a017673eea41
 DIST buffalo_ls_chl-3.2.0-arm.config 85707 SHA256 ef5d85204e4ebf2078a724537b9e615ad30b0c2316d8cf74be59ff77a2f92515
 DIST buffalo_ls_chl-3.5.4-arm.config 93656 SHA256 92fd0c34374d36fb969029efcc5d06646a8c8a7cc3c8b88368847322ccae7563 SHA512 00f47d6769b1ec6c16acce8a00a0d8990dc3b79efedd57d0c8c9c5a4b45f8134e31537e6b1ea24023ce62d8ff788de5d99de0184017bb4eb6e7977cfed9b188c WHIRLPOOL 187635f611c1c09c0724a2b4a9953ba177ace042c08ac789a9a0766c0fb7830f82d658104cda4bc745ce437dbfd1f80cf9102b72770c6da39d3f667637445129
 DIST buffalo_ls_chl-fw_env-arm.config 363 SHA256 2b3e02d21a21f478739011d57b93c65a62a23be107c6df2fc16bd7df5e8e2ee7
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_chl-sources-3.1.5.ebuild 621 SHA256 a2d7b10848cb94d63cb8e5c61cb469f1d7ce7265bb7165ad47e1082a2a325123 SHA512 f5d99af0ca74175b4d9e8504f9986b6a6b6de9b914a265149d1afd3794469fa0f99c38cc97e114850b3bfd1c5c423395a17f141ec8fdb20c4e95b5abc1f9fda2 WHIRLPOOL ac3969b3cfa4ecd62165740eb6ae00a75df81dd09430d5147ab579bae91fee6afc51ad8940ff4d3934571f5f0340ebaa196106d9d286a7fee402b7d44cf62d21
 EBUILD buffalo_ls_chl-sources-3.1.6.ebuild 621 SHA256 ef34e69ac6051cbe87774eb63d8b8ac8aaad061dfb4b42391664ed28b01fc581 SHA512 c215b807901c97a32dff318c20c6983c4ab63227a951ad2ed8f06a200d678613f1009bcc59f64a9aa458e0ab31daaa3a299704991b279c51fd06e067a45ce89d WHIRLPOOL c81810ba76884f8a5a00c5b71aeef03e48ce032c73d3635f58fac6f8748c52246af3c9df5d721afbb0862322111f1be0a8f4de1837ba2e154402a72cd9c75202
 EBUILD buffalo_ls_chl-sources-3.2.0.ebuild 621 SHA256 ef34e69ac6051cbe87774eb63d8b8ac8aaad061dfb4b42391664ed28b01fc581 SHA512 c215b807901c97a32dff318c20c6983c4ab63227a951ad2ed8f06a200d678613f1009bcc59f64a9aa458e0ab31daaa3a299704991b279c51fd06e067a45ce89d WHIRLPOOL c81810ba76884f8a5a00c5b71aeef03e48ce032c73d3635f58fac6f8748c52246af3c9df5d721afbb0862322111f1be0a8f4de1837ba2e154402a72cd9c75202
 EBUILD buffalo_ls_chl-sources-3.5.4.ebuild 621 SHA256 a88baf0d28f601cbeb58542724d5debccda44fa07224e75989ce53ea88db8635 SHA512 335ffc93c592dae45d3438da81f9d1a031addc0ed70731d8774939f3f8ad0ab297b56bc0069c910c31080c79985478e6081eea265a4bd2654267cd3924b7cf7d WHIRLPOOL 8566ad6c1f105d7fef92f210e59d8d050fb0a7abd091436943d2963ebd5fe325ecf146e781b70ab3278930faf5dc52bba12fe86698a770f7190a55eae51c4c34
 MISC ChangeLog 2900 SHA256 ffb7ba01d276266ec6d1ae1c626f9fae2c8a64da805278c679f9f9b0ef7eabd6 SHA512 ebfb468736170742cffc9fb9dc95b597759e58b9eddf67fa6c231932077527f21c991ef8638d7685dbff11327995e9b827b088073ba31de4641866b0dabc0931 WHIRLPOOL ac35098b7fae2cd6da743374ecebe29945a040b5fbffb37b500c713fb8155a3dbc0aad6f16a722a0caeaa761ff9c15f9f9dccb9b2c0b331e6b41e691d81ca040
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_chl-sources/buffalo_ls_chl-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_chl-sources/buffalo_ls_chl-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_chl"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Live V3 / CHL Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_chl-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_chl-${PVR} )"
--- a/sys-kernel/buffalo_ls_chl-sources/buffalo_ls_chl-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_chl-sources/buffalo_ls_chl-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_chl"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Live V3 / CHL Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_chl-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_chl-${PVR} )"
--- a/sys-kernel/buffalo_ls_chl-sources/buffalo_ls_chl-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_chl-sources/buffalo_ls_chl-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_chl"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Live V3 / CHL Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_chl-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_chl-${PVR} )"
--- a/sys-kernel/buffalo_ls_chl2-sources/Manifest
+++ b/sys-kernel/buffalo_ls_chl2-sources/Manifest
@ -1,26 +1,12 @@
 DIST buffalo_ls_chl2-3.1.5-arm.config 77779 SHA256 2841d1ad132b3f2fb558415fee7c5fb3878f27bcf829ad856d3217436b73521f SHA512 f082a72865cb11a3513686dce5077ffa4fe7017f1d6f3bd7ffb7f4f496c21e575f781fe849b7dcb16f4d15f7c752a849306dbcedf41e2bc8c873353f38646e40 WHIRLPOOL 4ead3ebc48e7ebc9f314644482da139b0daabbee93c7fde0703d0851cb7b3c0b562ba95b4c6ba07aff4e38ec47149889ac3179cb4a2e028eb4ee4ebe6e07bbb4
 DIST buffalo_ls_chl2-3.1.6-arm.config 77779 SHA256 2841d1ad132b3f2fb558415fee7c5fb3878f27bcf829ad856d3217436b73521f SHA512 f082a72865cb11a3513686dce5077ffa4fe7017f1d6f3bd7ffb7f4f496c21e575f781fe849b7dcb16f4d15f7c752a849306dbcedf41e2bc8c873353f38646e40 WHIRLPOOL 4ead3ebc48e7ebc9f314644482da139b0daabbee93c7fde0703d0851cb7b3c0b562ba95b4c6ba07aff4e38ec47149889ac3179cb4a2e028eb4ee4ebe6e07bbb4
 DIST buffalo_ls_chl2-3.2.0-arm.config 80500 SHA256 a920e3fcf4d3d4e22e368c073aecbcb3a06a36735d0dfbac6edc687a42ae5a8f SHA512 3fbfc41bc24f5696e6334c473887f1f8c7a937cb62e989f3268a8d1e5e24dbc3f8c29fe1a24f64569c6eb6da3365c9e607e9296c6422668bcd174c6c044524e7 WHIRLPOOL 705e3b6c2e6b59a60f29267ef79b497aa44b5dfe87c36657e28f49f2080ced84c6f6b44291967c9716fc3ffe0db2743434851e5293cc2c34c58d737ee760ec4d
 DIST buffalo_ls_chl2-3.5.4-arm.config 87644 SHA256 cb16488644ace81389fb2e7b6ed7a36251fbff2e8ce7e9efbcd6da057c708478 SHA512 4826a66cded0bdbd1a6def2e5a5d76fb8188f6c2dae69a8c48c26a02cb0c89ac569f1fbccd69f38fe21f1913fbddcaee8c3a22bc01e9ade995e4166a2cf14fa3 WHIRLPOOL f3d4b0822636c08dc9641f9ff039653bb489e1884fb18de6041ae4af0ccd9b6f20e99ff217998a07c8a0b5747110496daaebc27b935eaa8a4ae1298ef2b89da2
 DIST buffalo_ls_chl2-3.6.2-arm.config 89453 SHA256 0c041858b0f87781eb9533b3a014eadba77388bef67c3f02b04ae7138e9c34f1 SHA512 9b6cc9f58a749a5d96b2fea0959499083e9b769a30dbbb1bfef2d972a3a641913582d7ee2b5d150e72dee3ad2982a5396022871e0db617ef8552162af8f8288b WHIRLPOOL 4520fa734982eeae9eb38ebc6b4741682009c2758fb902ab068d2db2df646b8536b994261e654d0153db5cd16f05d99fa1805fb6b40ad1dbb2a0bd8e70c2f8d0
 DIST buffalo_ls_chl2-fw_env-arm.config 363 SHA256 3bc4003b1731f906504e45b0c61634065efbc4f4da0aaa6f4b253a9900cc0be0 SHA512 6421a3a72318ec3898d093af3f1e9d018f806fb425bb465b6e4c2aef1e2a971bedf4994a887e366145096210cc45b1d2660658640198781d076cf94cc49355da WHIRLPOOL 2bac919826241f2120ec31d1812113e5063b8f85e9426e0a1f8b7a826e4da47c7ade656428507f9a76a96cc2df19e8007f7b93b3a04241fb878a248f0356c79a
 DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359 SHA512 131b814325d888bb11ba552bc5bdd91ee2d8e139b06ac7ba94e716bcbbcc99ba30867eeea4aab580907916203bc526ae0bccda688151b250ba7943e193e50252 WHIRLPOOL d224dd52c7133e9768817319d0ad0d3797d426180b4d3d936d5189b500521ac4abe4abae7cc71f055d7e5194171f549b6fdb0221ae023cb35b16993741ad1e61
 DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406 SHA512 24f78b02f0d21057e18effb240fd0cc0b6964bc20b0c3b4ce743f5dac8555132176e3c259d602e2b4e6ac41c8cc0e9d63948773f397db4b1a6602ebf083ba333 WHIRLPOOL f1d8da4a31b5ed6029bc008d6a294f0eed9bd072e216dd5af5bfbf612d6311e96f723356e35911b99f8a7704b3f994f1ad9abfe71bf671cc55a8ba65dd2a2c5d
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2 SHA512 557eb8a7ad489dfad48d7ae7d3de70c211e6ea5f56e75cfe0e826a8b8eee65b6c4bca54f4911692cab423cd3f636b0a1d6d07a0caf035ca1e4826517e1fda213 WHIRLPOOL cf62cf723eb99245fef8e6456637bba1b34670ed4414baa2eca2fe9be683d6081ab366447f0a4ce650eb03f1e6a62707fdf4c8914405cf8c67683615886cc9a6
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST nas-patches-3.6.2-7.tar.bz2 1603216 SHA256 0aed7d7313a0918ab1b79e719452a3a8cc36b6281b88ec4ae23a7f4ca8a01210 SHA512 0017a5f37db7a41fff7c499928dc0e8ec8528cf605417831b9f61538fe0508aec947a311dfa58d8a3005f4abee413dcc569aae1606b9c51ef3d603b25d4f86ef WHIRLPOOL c47577384b018c1e96e89079af04fdee1fae8cc1b64b8ebec3c4eb2b23ce40e99e318c2aacfca2b5009facec67a5ed1b13d990f22f171d89c41fe621b3177b23
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee SHA512 cdbdd824f2bb510cb563d327767a01bd66125949180879d15acef7b4d65b58b05d081f06adb4ba0d3c8692a320a366648f6a1d4bec606042b4ac4ae1cb4a51a0 WHIRLPOOL 83ace5eaa650e24d6dd1e6bea5070d44e9c6c22fc37e9702ef5b3b8b0c6fceb44e0fe6a4f9a164adb8fb0d74dd0358f8226f63aefa03195b6301309a552f6ce8
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c SHA512 7c6e4e1662d63d285ef950f30fe50a8059bd16a587cbf60c0e4e4b5e0577f0eefa64517390fb3381a856c0b278b865c28b0556f781d13ea951d54c2ef76a76a4 WHIRLPOOL f2f2a4a92c578cdaad243f39310d9000563010f10edb5559170761e086d1fc3857dae7c7ed10968c72f10f0396b4e0e79e5cb3c86e542b3edc71837ca5032a5c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 DIST patch-3.6.2.bz2 57709 SHA256 0a6e45dda40e3369d3c14d473651690f0c062f3acdcd69acd73b7b219b523b35 SHA512 54c7a4079656aad75596174829f8ec11eb9464473f6877c85828431bde0104874319ad76a7ac8d787a44e083a1afaec489833f03b23d0d7da1c451da54285db8 WHIRLPOOL 29330a88db84e47e9677a54b61d9e62367b4c2fcdcc047878efabd8fd29ea2487cda5c761f8c67221437b7c5adc35efdc3fcff9ece809997dd9b7e3548709805
 EBUILD buffalo_ls_chl2-sources-3.1.5.ebuild 601 SHA256 60d9be895ecfb5ae0c8de4941afde3316fcb68d7b7f654f72c6b3164e7404b06 SHA512 1be2d3fa049facbb950eb79f0977f20d57d726e52961c52e5fdf270a7a77c4d10e9127339ddf8d92e967ea2e317b4f65a9b9598957c17e7aafe408e4936fd7b2 WHIRLPOOL 0af719ccee491632bf1422c35e29e61401656f5c3ecd83bcf7e34040beba2bfc0755a0af0396a1f5bddf68d8d386b59da8c00d4a80e197b079ca7671c62e5b03
 EBUILD buffalo_ls_chl2-sources-3.1.6.ebuild 601 SHA256 3ed90201663875032d37c058afe840e37938ebcf5c0f8fe20bfd082f20819b96 SHA512 ae4d5cf76810910c7c211f8cfdda33d2fa281f1794211b0ee4566ee5e5b9cc358433d494d4b7c613a558e99b1ccbcb9db4bf1edc2e7eb79d14775cbfc0ea85fb WHIRLPOOL 2b7698c4e9ad27ee2591b0a5187c1b6f1a786c1626693ea23e444f6a93c1cf75e9ee3fc4dd53c29251e7fcf29ee4076b86f09f586e1d6c5532b7be4fffbd681e
 EBUILD buffalo_ls_chl2-sources-3.2.0.ebuild 601 SHA256 3ed90201663875032d37c058afe840e37938ebcf5c0f8fe20bfd082f20819b96 SHA512 ae4d5cf76810910c7c211f8cfdda33d2fa281f1794211b0ee4566ee5e5b9cc358433d494d4b7c613a558e99b1ccbcb9db4bf1edc2e7eb79d14775cbfc0ea85fb WHIRLPOOL 2b7698c4e9ad27ee2591b0a5187c1b6f1a786c1626693ea23e444f6a93c1cf75e9ee3fc4dd53c29251e7fcf29ee4076b86f09f586e1d6c5532b7be4fffbd681e
 EBUILD buffalo_ls_chl2-sources-3.5.4.ebuild 601 SHA256 5ee5dd1315f474f713fc8b8cc769557e27a32f77c2f566f0d9b46c420442070d SHA512 8fd5f4d566a51a1ba05d41a4b5dd8d2a25c527dddbe9bcff69456ac8596d03871361e53dd80e18348b6ab05345c33e9c4b09f32ecf808a5a94d3935e123ff700 WHIRLPOOL 8700b2edf8d0301c674e8bd2c46c3bc4218fdcc017727f9532d6f025222e53c9e49293b5ee90848f6fbcd685887b35e76498c58c1435e81837f3fdd62bf4b914
 EBUILD buffalo_ls_chl2-sources-3.6.2.ebuild 601 SHA256 1b57dca438539651bf2b25d9a23cf1463b0f23143598b5cdd298a186b99462bf SHA512 67f9741f9fe190f297bbb0875e51796f1fdd55f454659153fcd13934e22affd8e1213e71b1e12fba315d9d992981355a3360a37dfeb630352cb3c2da9fce2b44 WHIRLPOOL 47b2ffabf15cb585dd15135c36544abdc5375a3954f79fec243d6f35def58a72b4784e63ea09a2213cd22930bcbc77779f6ec8d2e0843f98c4748d7acb26cf42
 MISC ChangeLog 1551 SHA256 32222198ea5efa464f50e5527fb49618b00d7a8d79cd9dd819524b67e5214374 SHA512 6e4eba794bb98e5a9f5c4905bf623e1fc3e30da7bdfa7e7941fb3e607cfb244f0209ee23bbb8ff802565ab7a6a552d930a76be31f3f3256aea19d1914a6412f4 WHIRLPOOL 91da473e5b699efdbbfde9ce9cc94155c5c6951d41c78e2b4db78909df2f7378851a90288161bd06ba7916357dc57e50cedaca22a50c656ed06e5603d313ca56
 MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9
--- a/sys-kernel/buffalo_ls_chl2-sources/buffalo_ls_chl2-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_chl2-sources/buffalo_ls_chl2-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Sabayon Linux
 # Distributed under the terms of the GNU General Public License v2
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_chl2"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Chl V2 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_chl2-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_chl2-${PVR} )"
--- a/sys-kernel/buffalo_ls_chl2-sources/buffalo_ls_chl2-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_chl2-sources/buffalo_ls_chl2-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Sabayon Linux
 # Distributed under the terms of the GNU General Public License v2
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_chl2"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Chl V2 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_chl2-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_chl2-${PVR} )"
--- a/sys-kernel/buffalo_ls_chl2-sources/buffalo_ls_chl2-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_chl2-sources/buffalo_ls_chl2-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Sabayon Linux
 # Distributed under the terms of the GNU General Public License v2
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_chl2"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Chl V2 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_chl2-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_chl2-${PVR} )"
--- a/sys-kernel/buffalo_ls_hgl-sources/Manifest
+++ b/sys-kernel/buffalo_ls_hgl-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_hgl-3.1.5-arm.config 83380 SHA256 4e345252e64510125ac6ae736ffc7510875e132e31e03ead11f224b3b57e26f9
 DIST buffalo_ls_hgl-3.1.6-arm.config 83380 SHA256 4e345252e64510125ac6ae736ffc7510875e132e31e03ead11f224b3b57e26f9
 DIST buffalo_ls_hgl-3.2.0-arm.config 85707 SHA256 49f8783102e7b17d8035e18d8b330f6d05a2b52a4c1a3a0d62604b97e03503ed
 DIST buffalo_ls_hgl-3.5.4-arm.config 93709 SHA256 e775bf7a1b1ebd5aab9cc68cbb65a435bb8b9d1e19ad9db4971bf7e559ae098f SHA512 dae3c845c6e16623762b1ddae7a7cf72cae340dfe7c90ee0b588409377576f675264f5a569e9bdc34248cb872cbe06fa4c7dfc346481fb1f046612ebf308b454 WHIRLPOOL a7f4a0de10479bde730af9e27bca28c6fb123093416f4b89457217f0d0707e139cee574eeef3cb934fbc1e95ad2cbc9d7d6058525ed2d11bf44f1e7050577d23
 DIST buffalo_ls_hgl-fw_env-arm.config 363 SHA256 2b3e02d21a21f478739011d57b93c65a62a23be107c6df2fc16bd7df5e8e2ee7
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_hgl-sources-3.1.5.ebuild 611 SHA256 e6e33c56444b473f7acd8acc8cfb92b72d10fb100f4c58a4003d97c3702d8ee4 SHA512 50efd5c590eea3ae64fb7aada70004847988cfa82472ecef2e0ebb62df172866f399cbaa782ef66c55b4af2900746539914f897dafe41011b300fd24c03c4852 WHIRLPOOL 8d8d05ef89694a8c84db654a7bc5bf0f80ea3997e745d05ce0bd8db9ad7c551cf1eef7548e469598e40fca07508b0320b30c94e2833551823083abf568a96f5b
 EBUILD buffalo_ls_hgl-sources-3.1.6.ebuild 611 SHA256 8ff33aff2e71459b2cc681ec1f9694d574043f4a624c085e7c00a69e763101f0 SHA512 8cf2a99178e3bbf0a3dc7c1e1ab379b75ccd4db230d250a5eff38be1b40069d3938ca47f9c4d1d2eafddfc984ecf804da94273698ab77380454131c929b2b99e WHIRLPOOL 6b8257b3528202e60b5d53a736af3b2511cc9a1be843d016e53da907724b324257e3dbeb330904e035cb0c9b4c0b858f889d676d35ab0a9eae1b69952e0f7933
 EBUILD buffalo_ls_hgl-sources-3.2.0.ebuild 611 SHA256 8ff33aff2e71459b2cc681ec1f9694d574043f4a624c085e7c00a69e763101f0 SHA512 8cf2a99178e3bbf0a3dc7c1e1ab379b75ccd4db230d250a5eff38be1b40069d3938ca47f9c4d1d2eafddfc984ecf804da94273698ab77380454131c929b2b99e WHIRLPOOL 6b8257b3528202e60b5d53a736af3b2511cc9a1be843d016e53da907724b324257e3dbeb330904e035cb0c9b4c0b858f889d676d35ab0a9eae1b69952e0f7933
 EBUILD buffalo_ls_hgl-sources-3.5.4.ebuild 611 SHA256 4d33686f080bbc681adfcaf9d618861da4f53bada449c5a123bc3c3eb85e4dfd SHA512 a11f32eb6f4d63a8a5bb186ad856e064a0180029141999eeec15d3faab287b534b314e690d5bc21846a431ad0c426d5d9011496b83c09fc7e4786c9b34d9d923 WHIRLPOOL 513dccd84fd21bde32749aa4b254f3f945101a818e2609afe07b9a9c76a0c27182bad2bbd80aa9850cc5e50caa007d787ef38a562704fe0af31262d3c9d18e5f
 MISC ChangeLog 2900 SHA256 34141ea14fd5663ff85ab530c2521cf33e413c7a687b6f2c9a8e35a0576ea714 SHA512 7e3be3a2c011244d3b9bd966d1f0667d98175cf520b9a690467ec02b2ca031c569c23eb71ba22d5639e96176b4d9a0509dfbd199f6a3c7d5ee97ac3621c35784 WHIRLPOOL a24e5bd44281a597ae56c4a163d1101818cfdc5cb605479f2293132ce7d8a5d4c46567d57c27bd26f7ef1e06d482b3c0d3f700a4eb889c29999bf4473253d948
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_hgl-sources/buffalo_ls_hgl-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_hgl-sources/buffalo_ls_hgl-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_hgl"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation hgl Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_hgl-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_hgl-${PVR} )"
--- a/sys-kernel/buffalo_ls_hgl-sources/buffalo_ls_hgl-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_hgl-sources/buffalo_ls_hgl-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_hgl"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation hgl Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_hgl-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_hgl-${PVR} )"
--- a/sys-kernel/buffalo_ls_hgl-sources/buffalo_ls_hgl-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_hgl-sources/buffalo_ls_hgl-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_hgl"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation hgl Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_hgl-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_hgl-${PVR} )"
--- a/sys-kernel/buffalo_ls_live-sources/Manifest
+++ b/sys-kernel/buffalo_ls_live-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_live-3.1.5-arm.config 83343 SHA256 ba267a04d1bcb58861de23d8d637df32912d6ae7cb8a38e0ef4bee06c8f492ba
 DIST buffalo_ls_live-3.1.6-arm.config 83375 SHA256 f73fd457c341527d1b92787f8a52f10d7a31c295c0f0d35e9a95cf2d448f1d04
 DIST buffalo_ls_live-3.2.0-arm.config 85696 SHA256 7081c6b2cdafec987f6a6e0255391314e92bd26f0bfd63989b61a23b1043015f
 DIST buffalo_ls_live-3.5.4-arm.config 93709 SHA256 05d055aa311cbbdada9f2992cdda551a1269d3fcdeeffd2c885ab76d1c1f6fcd SHA512 9a6ea84c3674120445c20ab9569fba7ec37288b02d1e77ef3a8bc1fe6ba92d263220098b3ff534d7d671cfaece61365b693a63154b1ffa80bdd3aa030e446743 WHIRLPOOL 7485ae1cc3d7e00ad4827c8b30ca396a9ea65fc1b77cc296b84c88c34fb37413918390ab7cd26a66bd1838aeb63d6f07da4fe8be6ddee665df5af469d5917645
 DIST buffalo_ls_live-fw_env-arm.config 363 SHA256 2b3e02d21a21f478739011d57b93c65a62a23be107c6df2fc16bd7df5e8e2ee7
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_live-sources-3.1.5.ebuild 615 SHA256 2a56a4c2bdd6d614238b807b4b47040d374ba2c6b8f40cd10d8790157eac75f7 SHA512 a27f464db8dc65fa4cc84545a131e6a115e81bbebbcc703c8f74e248133a10158a3abf26b38261361efc146a680372f9e7c95cb2e16b51bd1003ebf755c36640 WHIRLPOOL b71bb1f842dd2167a0515162186b3fff616757c4132639a3f771df8cc9c542bc45801bcb02faf1faadb45d340d5eabd965b34abb889e1fefb6bacc8e37a2496f
 EBUILD buffalo_ls_live-sources-3.1.6.ebuild 615 SHA256 ddc4769b34903771f448927912bac56db8782698d1c65ba7f94e307033c6b55e SHA512 7ce3fcdcbacaabff514b2e0bfe521a6d80391d8d41d883df62222ab277bda6b3b0e16bf5a61a566323c4045243b2e7823f2047c957e1f5fe07eefb29cd0b3b59 WHIRLPOOL d8be2f2ef5ae7fdcddd2973ccd5d62063c24d5fa6bf98b3077231cc17f0f044357f7a5c1c07f59044549e84b1cf31016991ce890ba5ce588387bc182855d4741
 EBUILD buffalo_ls_live-sources-3.2.0.ebuild 615 SHA256 ddc4769b34903771f448927912bac56db8782698d1c65ba7f94e307033c6b55e SHA512 7ce3fcdcbacaabff514b2e0bfe521a6d80391d8d41d883df62222ab277bda6b3b0e16bf5a61a566323c4045243b2e7823f2047c957e1f5fe07eefb29cd0b3b59 WHIRLPOOL d8be2f2ef5ae7fdcddd2973ccd5d62063c24d5fa6bf98b3077231cc17f0f044357f7a5c1c07f59044549e84b1cf31016991ce890ba5ce588387bc182855d4741
 EBUILD buffalo_ls_live-sources-3.5.4.ebuild 615 SHA256 7c8b7a677363559add9435359d4ab0a440b000d964877b0e438025937360e7df SHA512 219cff3bc041cad5a254845f8d780c8f33ef757c1df1e2d68e6e83aae8ac79da90bfe5eefd0a5f72c19ea82f36905f8303a7c0f4eeebc47ad2f906fe6656e50b WHIRLPOOL 19abb446d2898a5f3a092e0b21c37781d76571e18e35376b2edd6a450dd39167b8159dd87c482b6567ecd13dd7db5a78cdd3cf8246c203f0783799a868232f87
 MISC ChangeLog 2797 SHA256 41056d10f7deb85582ef240f08d9f73ed3994eb819cc373ef3e384ccb5f0a509 SHA512 0eff9f95c8cc69a4785837ca9976e76c3c498e07b4a5d8e3c9906f461178269fd4908952489831d8e7e36c64c001232236dcc9342b60d6810b5aa71aa7a5d71c WHIRLPOOL a562a582081bb3144911cd1055595ef210082ce969f1bb5aebfa438283f3952653b864ab0e20016e8659af252952fa822596105503c60fffb00566b6d05b1204
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_live-sources/buffalo_ls_live-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_live-sources/buffalo_ls_live-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_live"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Live Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_live-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_live-${PVR} )"
--- a/sys-kernel/buffalo_ls_live-sources/buffalo_ls_live-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_live-sources/buffalo_ls_live-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_live"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Live Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_live-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_live-${PVR} )"
--- a/sys-kernel/buffalo_ls_live-sources/buffalo_ls_live-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_live-sources/buffalo_ls_live-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_live"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Live Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_live-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_live-${PVR} )"
--- a/sys-kernel/buffalo_ls_mini-sources/Manifest
+++ b/sys-kernel/buffalo_ls_mini-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_mini-3.1.5-arm.config 83478 SHA256 4e469560e1a7d4e1d0499e192ddccd0fc8385c5517a2dd753646cb01283d12a0
 DIST buffalo_ls_mini-3.1.6-arm.config 83478 SHA256 4e469560e1a7d4e1d0499e192ddccd0fc8385c5517a2dd753646cb01283d12a0
 DIST buffalo_ls_mini-3.2.0-arm.config 85707 SHA256 275cbf7e3380db7ba869017a49bd48caace3b5fdb0b5ceb863907d593a585984
 DIST buffalo_ls_mini-3.5.4-arm.config 93709 SHA256 02638f3ce18397bd778d621cfbd245cd78e72cb3a5230aaafdcafa06e0b8e13a SHA512 4bbe66e477e2401304440387825f7c4a1b3d4ecfde2b06dcb970dbfcbe796e6b2159c514ce282f5e73a4bd8c754f6d1d110ce50658cba3deeb7d2fe0ce69faaf WHIRLPOOL 5482e09e321193c2bc0d45ecfdd8bfc9f2b210e87c5ba403d16b0a799d4b6cec7ec5128250b57fc92c4dbc9eae295db9bf8967efdb553a2f045afbe085e8ecca
 DIST buffalo_ls_mini-fw_env-arm.config 298 SHA256 9084ffafc627891ec52d18395781e42f836e6fd23a5b1e9493c4c47db191fe17
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_mini-sources-3.1.5.ebuild 615 SHA256 c119e203a89991ddfa54d9aeea9c73ae2e7bb5703f27e472305c94ddfbfd4642 SHA512 340a2dd0fabeb8a4b8c3ab2de10d8fca7f1d0a3d5ea042b0b0750b37084a7b4ab700bd5d0c9ce2008b8c0c80c69b5b5c8aeaf77916bc2ae2fa52eb053311245a WHIRLPOOL 47c77211f09e1c6c4094663d15e3f1136a1e4f49bd164323130a187d20eb86eb8c6cc99e204de20da23f4d9858d68dcbf7dbdced7afae379225e95b652c904a1
 EBUILD buffalo_ls_mini-sources-3.1.6.ebuild 615 SHA256 847b59adbb2e994825d24c3b7db0a13519b1fbf3e6396b79f2079daddeec67e3 SHA512 7f05bf7526649595c7e496d5b74d54f0d2edfded5b05d8bf5d4d7dcd5ccae7bffac31113e265edfc34003a1c8c0234f240f8b57146f872c32bdcab46dc1f989b WHIRLPOOL 52e0019f90ab70d6e8584272d95e7d7dab6b07f22c74bcc7485c84398c8cf09ab36ab1acbdd106f96ed66fb11cff672cf2ddee0fcf909ce56816320216695905
 EBUILD buffalo_ls_mini-sources-3.2.0.ebuild 615 SHA256 847b59adbb2e994825d24c3b7db0a13519b1fbf3e6396b79f2079daddeec67e3 SHA512 7f05bf7526649595c7e496d5b74d54f0d2edfded5b05d8bf5d4d7dcd5ccae7bffac31113e265edfc34003a1c8c0234f240f8b57146f872c32bdcab46dc1f989b WHIRLPOOL 52e0019f90ab70d6e8584272d95e7d7dab6b07f22c74bcc7485c84398c8cf09ab36ab1acbdd106f96ed66fb11cff672cf2ddee0fcf909ce56816320216695905
 EBUILD buffalo_ls_mini-sources-3.5.4.ebuild 615 SHA256 4e79f6da627ee9d78d86e7316611c790d64b6688ff4a6a8f6a9707662375e56f SHA512 98a49f741370f89446ad85fe21d70def0e61db35c1ca49e181d52dff586ac43c444afe0c6b629f8836d45b703834e33ca611fb31632c62725dce67bda90fe81b WHIRLPOOL a917c92ce0da45ecc5a3f2015e208e8d5eb90f9ab764b39c886277f499b0eb3518d49d9111077666e3712362df8ead61bf5d42106fd4d721d5c653f7bc5e7aa4
 MISC ChangeLog 2903 SHA256 4a36c15895a6ef3a2268a0ee84e93ad4b3c101a1131324f6fd87052a23961d8f SHA512 1cdd863b843b8933174a079838b3e14edc1cd9360b8d5aaa466b59d18a5b478833235082a4b4edbc750f2dae9991f03de4f0a57a5ea8d4ca8e886f6afd25eceb WHIRLPOOL dd527f7373450e0fc098108b5058f028dea62a78c341006e96759c1bb32e880ae261f3a6fefc877440cb4ab14016f061aaf9928fa36da28a5ed8bafd9bc912dd
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_mini-sources/buffalo_ls_mini-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_mini-sources/buffalo_ls_mini-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_mini"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Mini Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_mini-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_mini-${PVR} )"
--- a/sys-kernel/buffalo_ls_mini-sources/buffalo_ls_mini-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_mini-sources/buffalo_ls_mini-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_mini"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Mini Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_mini-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_mini-${PVR} )"
--- a/sys-kernel/buffalo_ls_mini-sources/buffalo_ls_mini-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_mini-sources/buffalo_ls_mini-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_mini"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Mini Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_mini-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_mini-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro-sources/Manifest
+++ b/sys-kernel/buffalo_ls_pro-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_pro-3.1.5-arm.config 83343 SHA256 ba267a04d1bcb58861de23d8d637df32912d6ae7cb8a38e0ef4bee06c8f492ba
 DIST buffalo_ls_pro-3.1.6-arm.config 83376 SHA256 a0e36c043dff9b2ac57268e0668ca653ab286a2e166b12a7feb633f71eda0be7
 DIST buffalo_ls_pro-3.2.0-arm.config 85696 SHA256 7081c6b2cdafec987f6a6e0255391314e92bd26f0bfd63989b61a23b1043015f
 DIST buffalo_ls_pro-3.5.4-arm.config 93709 SHA256 05d055aa311cbbdada9f2992cdda551a1269d3fcdeeffd2c885ab76d1c1f6fcd SHA512 9a6ea84c3674120445c20ab9569fba7ec37288b02d1e77ef3a8bc1fe6ba92d263220098b3ff534d7d671cfaece61365b693a63154b1ffa80bdd3aa030e446743 WHIRLPOOL 7485ae1cc3d7e00ad4827c8b30ca396a9ea65fc1b77cc296b84c88c34fb37413918390ab7cd26a66bd1838aeb63d6f07da4fe8be6ddee665df5af469d5917645
 DIST buffalo_ls_pro-fw_env-arm.config 363 SHA256 2b3e02d21a21f478739011d57b93c65a62a23be107c6df2fc16bd7df5e8e2ee7
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_pro-sources-3.1.5.ebuild 611 SHA256 3a260da09e598dbb92790aa287d30da0e599c78fe4f6ceae20cb6f1e73337105 SHA512 6ca6b255ef3652649c32e7666446a6a82ec92c878993b8195c94a7738cac432c6ea8854d2b6c9cd6a86b02dea97e85f820c27b370194ee757209a8aa672cf09d WHIRLPOOL d4152bd6850414185666b7c9094de5706222feca0c03d122221eaead2334a1f66aa2dfbebd0bce897bae6365a6fbca5f4eebd931cd4ec8f919f3abea4c795623
 EBUILD buffalo_ls_pro-sources-3.1.6.ebuild 611 SHA256 d83314999d4bff021f5eb897aeda17418440a275b200bf2d772e993269dabb1e SHA512 1008d08aaa18fb988d1e79502ac437d715699172ea235e1ef20b10b903d20b679ce0444cb68793ca0450a4afbcd6b354258530641b65a5be9f3e645bc45d7fad WHIRLPOOL e5eca25d4eccf541ed0b8e4b809639390fdee3b876c57c0af22a02e36bcd054af25451d6d85dce0dc3545791fd6bdaae6468a97e10888d339ca084292c1f4991
 EBUILD buffalo_ls_pro-sources-3.2.0.ebuild 611 SHA256 d83314999d4bff021f5eb897aeda17418440a275b200bf2d772e993269dabb1e SHA512 1008d08aaa18fb988d1e79502ac437d715699172ea235e1ef20b10b903d20b679ce0444cb68793ca0450a4afbcd6b354258530641b65a5be9f3e645bc45d7fad WHIRLPOOL e5eca25d4eccf541ed0b8e4b809639390fdee3b876c57c0af22a02e36bcd054af25451d6d85dce0dc3545791fd6bdaae6468a97e10888d339ca084292c1f4991
 EBUILD buffalo_ls_pro-sources-3.5.4.ebuild 611 SHA256 0890446ea458375ec44805439c5eca6e4588849c550582491d39f4c6604702f3 SHA512 64563e832f8b3c7c12c1d3d6c95ade6686712e366ed661610f3f652b5d40f5f8ce72a303c7e403fbb048a5cb9d80cbb326e4d5ebbea0df631e1ac73af1684956 WHIRLPOOL cb492d83e68f5e22f331dcb7d591fce4a6d850a45381038b8f13adb65d8470d8adc49cce270109a7b05720c8eecf34827ed29a3d2a30ad8d3c65307a6b75b8ab
 MISC ChangeLog 2790 SHA256 7fa834b106743e6b0939847060e562a5df2288baea90514247fe2711520132b8 SHA512 d4412e807428928792a681964494562e18d9b75a2a23f131a0e44fc5c0fba9ad1a0f83e3318ce2c4c7f5d8df199859fc7db873279647c211c2a7f165aa9b6c5b WHIRLPOOL 57442d8d5c55b61b72ac089006e1e1367497fd124388e82c0e542b8a27768d65aada0a1c02396cdf213050fa0c2071d81bed6cffc1811f12854450b5fe791fe2
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_pro-sources/buffalo_ls_pro-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_pro-sources/buffalo_ls_pro-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro-sources/buffalo_ls_pro-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_pro-sources/buffalo_ls_pro-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro-sources/buffalo_ls_pro-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_pro-sources/buffalo_ls_pro-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro_duo_rev1-sources/Manifest
+++ b/sys-kernel/buffalo_ls_pro_duo_rev1-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_pro_duo_rev1-3.1.5-arm.config 83434 SHA256 3951bdf2f6abe27b57586ea6c9fcec0b44ae0a08deb14439b688eea311c982dd
 DIST buffalo_ls_pro_duo_rev1-3.1.6-arm.config 83434 SHA256 3951bdf2f6abe27b57586ea6c9fcec0b44ae0a08deb14439b688eea311c982dd
 DIST buffalo_ls_pro_duo_rev1-3.2.0-arm.config 85794 SHA256 ed8a8ae98dbea3fb81e7607e026d24d95d96a5adaef0686f3e3fc64544e94ab3
 DIST buffalo_ls_pro_duo_rev1-3.5.4-arm.config 93807 SHA256 e107fb6c696fd5d01ecb6fa01ad835300b02723c9478519e6d08310c01b941d9 SHA512 ec6243c8875ee13cfdfeb3cc3310dbf2a944c66313967e27f79fa8b9fdc80829aed80dc13e0a339837ca9d99d6f4d9d8694b44b7dcfcfbed2c65cdb5afa66a2d WHIRLPOOL 0b58066526c67b185465092ee57b5f6bd96f13f05d52136fe9c78c2310143689575930aee67d1c986cdeccc761209cc357e866b514b4947b3d4146f6035df2d7
 DIST buffalo_ls_pro_duo_rev1-fw_env-arm.config 363 SHA256 2b3e02d21a21f478739011d57b93c65a62a23be107c6df2fc16bd7df5e8e2ee7
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_pro_duo_rev1-sources-3.1.5.ebuild 653 SHA256 d9b0f8041eff40638d1e1ba73ae3de25a11e451d85f30dade3282a1c46124aa8 SHA512 909ce2475621c3d62533db1d32e99b97a2d7e18cdca8a6e3a5557a914d3a38b24b390d193bfe5cedd8cf71863c48a4b2d9705e92c6108a475913981726dc76a8 WHIRLPOOL 55bd6325790c8fe2edeb574527882ee26a5f70caabf0509ba57a5a13be1692a097c20349c9b6707b8455a4a131fb2d7d673cc103b7ab848c1049120bbfb54115
 EBUILD buffalo_ls_pro_duo_rev1-sources-3.1.6.ebuild 653 SHA256 eb5c091f07eda990159b2349a1772aef1660699459c763ee74b0a67f9494a59b SHA512 4dec13e8d695bd516e454c206692072d9f5278fb0da4edd9eb147353df069ab589004d542a87d52fbda8cfd4340c463ad9ed5213324186373638e6511a2333b3 WHIRLPOOL 46a5a151148dd0757bc0940827c38ead21dd8ced65ed2f71eeb9ca84bf82a01df2a7f2d79f1f1797c59c64603f60ffca033feb4468b76ae14d8244c177cc4fbb
 EBUILD buffalo_ls_pro_duo_rev1-sources-3.2.0.ebuild 653 SHA256 eb5c091f07eda990159b2349a1772aef1660699459c763ee74b0a67f9494a59b SHA512 4dec13e8d695bd516e454c206692072d9f5278fb0da4edd9eb147353df069ab589004d542a87d52fbda8cfd4340c463ad9ed5213324186373638e6511a2333b3 WHIRLPOOL 46a5a151148dd0757bc0940827c38ead21dd8ced65ed2f71eeb9ca84bf82a01df2a7f2d79f1f1797c59c64603f60ffca033feb4468b76ae14d8244c177cc4fbb
 EBUILD buffalo_ls_pro_duo_rev1-sources-3.5.4.ebuild 653 SHA256 7c3b888076e491d17c7d79b729d95d218a92d6d2682c9a8c8a401061238cefa2 SHA512 fadefedcb534b18842a2ba759a01fcc6fa996a50751192d9244d0e7bed9b71d80b8abcc6cb54edd7920e13ddc57ef28e54ca9809ea1677e26bf070e026636953 WHIRLPOOL 7c2fc95eddb83e88b240238656d4939f053a528b8cdf1daa98908f54bca3a1fba449b1986ad01976d350d3a4f61cf9c76f2855cb5769a7d37588149e59f823de
 MISC ChangeLog 2927 SHA256 57d5326004da5f73515d49e5a2235805477d4b26a2e6d54ad2202855d47a9730 SHA512 1fe3f4160d965e991ad84e380c67a698e79e59716d113150e66c74e1cb9510c1ec881708b240e0e8e69aea410a800e35f6a6d81f6f9f5c942a1fa5d29b59bd79 WHIRLPOOL 70d71bd315e114845335e9300ccc1d7ddad0a9af1877c3cc8ca85801a3512abf17444c830a141e2dd6a30c98e3cf2a5f3d415623bc7dc8f009fe63f67f41ea0f
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_pro_duo_rev1-sources/buffalo_ls_pro_duo_rev1-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_pro_duo_rev1-sources/buffalo_ls_pro_duo_rev1-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro_duo_rev1"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Duo Revision 1 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_duo_rev1-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_duo_rev1-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro_duo_rev1-sources/buffalo_ls_pro_duo_rev1-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_pro_duo_rev1-sources/buffalo_ls_pro_duo_rev1-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro_duo_rev1"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Duo Revision 1 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_duo_rev1-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_duo_rev1-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro_duo_rev1-sources/buffalo_ls_pro_duo_rev1-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_pro_duo_rev1-sources/buffalo_ls_pro_duo_rev1-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro_duo_rev1"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Duo Revision 1 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_duo_rev1-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_duo_rev1-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro_duo_rev2-sources/Manifest
+++ b/sys-kernel/buffalo_ls_pro_duo_rev2-sources/Manifest
@ -1,21 +1,7 @@
 DIST buffalo_ls_pro_duo_rev2-3.1.5-arm.config 83434 SHA256 68af66329ec8c2e6577272fede4b39c8a04d42ba909d395f83f5564ae388dede
 DIST buffalo_ls_pro_duo_rev2-3.1.6-arm.config 83434 SHA256 68af66329ec8c2e6577272fede4b39c8a04d42ba909d395f83f5564ae388dede
 DIST buffalo_ls_pro_duo_rev2-3.2.0-arm.config 85794 SHA256 9b184e187823ace3fe769b6e0650baa8ad933c8bf02af8f58440dc87d371f902
 DIST buffalo_ls_pro_duo_rev2-3.5.4-arm.config 93807 SHA256 f56370e3a248b3f9e998451b909dacfc0bef23bed50e64a7772750a2b26f5f7b SHA512 a4fefc8c9608438b1d4a4135437d6f559122139271dd3fdfab5e44fba004aa688eaab2248d52d2d9b823f5c5cd9d35f9d03185f1d53a995d24467d2377ee86f1 WHIRLPOOL 221f6f7171d55004928809aa870da1a6c1be66d7c70615ce3ce7b5ddc1ebf71b894eab40853d5f071c9ca57740f44d87501e66d44f77f86012268931147d7724
 DIST buffalo_ls_pro_duo_rev2-fw_env-arm.config 363 SHA256 2b3e02d21a21f478739011d57b93c65a62a23be107c6df2fc16bd7df5e8e2ee7
-DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359
+DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
-DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463
+DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 EBUILD buffalo_ls_pro_duo_rev2-sources-3.1.5.ebuild 653 SHA256 7dbd374972bcbb60314de2c4f7dea6b529c11e4920e2c450376aa5037a37470c SHA512 54ee437ba140d826079a295abd4e91d70549392ba5d5780eb38fee24529c8e89e40471f5acfc7122f8c952d3879469c87dafff0dcca1a688fe44e75a602a9e0f WHIRLPOOL c866c2560d158e07a0785e91090453908eaae4245b426b3fcb2e8143a7dac8ce19175b886f6b45a009c8cdda8efe45460850e86b6a4faa7b86739287b07ef533
 EBUILD buffalo_ls_pro_duo_rev2-sources-3.1.6.ebuild 653 SHA256 d641bc17ed4b0b1413522a2abc6015db50acdb12ac159d5aad3c38122f1d4f0e SHA512 44a985528438120b8bc24724f2417072d11383545517f6844c632b5940df2ade3ce105ec8197aab8e5168a7c674b99308718618284ebcdbae0b61dd7e75bef36 WHIRLPOOL 7badd4f0e7f7c052bd335791209edfa194d40c35a30343187fcca6e798f5616e1a8cf69fc3a96ba06ce2f89e964c91ee6b140deee829cce506237182b2ec5433
 EBUILD buffalo_ls_pro_duo_rev2-sources-3.2.0.ebuild 653 SHA256 d641bc17ed4b0b1413522a2abc6015db50acdb12ac159d5aad3c38122f1d4f0e SHA512 44a985528438120b8bc24724f2417072d11383545517f6844c632b5940df2ade3ce105ec8197aab8e5168a7c674b99308718618284ebcdbae0b61dd7e75bef36 WHIRLPOOL 7badd4f0e7f7c052bd335791209edfa194d40c35a30343187fcca6e798f5616e1a8cf69fc3a96ba06ce2f89e964c91ee6b140deee829cce506237182b2ec5433
 EBUILD buffalo_ls_pro_duo_rev2-sources-3.5.4.ebuild 653 SHA256 b0a25d4ab4f7e2b040011615f23685da0e35022645891129c1a8bf61408f990a SHA512 44c09c9c7070caf88353bdd5c8dd4b4000e696983f5ac963c3a3a2955f0af8bfcc970519879825092e1ed86f36d8081e268b1791f37bf8c80f49d62dcd399eb5 WHIRLPOOL d83f79948d73a31afe58d0726a5ec41f497c1fa292f9237598287a159e75befde09c41f1e7abbc9827af254da3d6393448de7391c672543a5c11081a76819051
 MISC ChangeLog 2927 SHA256 c9c8638520ad398d5dcc388a3d3b4cf9a4a5a6e00afc15732d104be1bf4f463a SHA512 e16c0fd824a073e431749c01cf85924097e9639a183c6a2783a47ec9e1db7e0e0d15d5ab720a64208269ed42d4847742e399c58173efa72d6d71b1401875b3f8 WHIRLPOOL 5ef5ba0a08335c3ef4647e250734ad78a3ce4a5dd81555f96f8dc72bebaf2fef7129eb00a119223203f51b08f54660b43797d17db80fcf4a22394cf128a9c9d5
 MISC metadata.xml 522 SHA256 5b317d16e88f3ac359d9ef03780b944d201534adb46265afd2b1fb38af21729d SHA512 50f8e96db2eefcca03c0f5bf7833fa5df0f54f0b7697c66e2fc6752f9686947a1f3fd6ff788835d8d240b0804e62833ff78a4e31b113ea3a7536ac37a7894494 WHIRLPOOL 9707aedea66dfbbf420f0681571c359a0a434364c2af8bacf658be7b45a67c99a5b12e2e290732ee3d900b56e364d794fee7466fc2fcde63d37b9c4b49de6b10
--- a/sys-kernel/buffalo_ls_pro_duo_rev2-sources/buffalo_ls_pro_duo_rev2-sources-3.1.5.ebuild
+++ b/sys-kernel/buffalo_ls_pro_duo_rev2-sources/buffalo_ls_pro_duo_rev2-sources-3.1.5.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="3"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro_duo_rev2"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Duo Revision 2 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_duo_rev2-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_duo_rev2-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro_duo_rev2-sources/buffalo_ls_pro_duo_rev2-sources-3.1.6.ebuild
+++ b/sys-kernel/buffalo_ls_pro_duo_rev2-sources/buffalo_ls_pro_duo_rev2-sources-3.1.6.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="6"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro_duo_rev2"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Duo Revision 2 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_duo_rev2-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_duo_rev2-${PVR} )"
--- a/sys-kernel/buffalo_ls_pro_duo_rev2-sources/buffalo_ls_pro_duo_rev2-sources-3.5.4.ebuild
+++ b/sys-kernel/buffalo_ls_pro_duo_rev2-sources/buffalo_ls_pro_duo_rev2-sources-3.5.4.ebuild
@ -1,22 +0,0 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 ETYPE="sources"
 K_WANT_GENPATCHES=""
 K_GENPATCHES_VER=""
 K_NASPATCHES_VER="4"
 K_KERNEL_PATCH_VER=""
 K_NASKERNEL_NAME="buffalo_ls_pro_duo_rev2"
 K_NASKERNEL_URI_CONFIG="yes"
 K_ONLY_SOURCES="1"
 inherit nas-kernel
 KEYWORDS="~arm"
 DESCRIPTION="Official Genlink Buffalo Linkstation Pro Duo Revision 2 Linux kernel sources"
 RESTRICT="mirror"
 IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_duo_rev2-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_duo_rev2-${PVR} )"
--- a/sys-kernel/buffalo_ls_xhl-sources/Manifest
+++ b/sys-kernel/buffalo_ls_xhl-sources/Manifest
@ -1,26 +1,12 @@
-DIST buffalo_ls_xhl-3.1.5-arm.config 77779 SHA256 2841d1ad132b3f2fb558415fee7c5fb3878f27bcf829ad856d3217436b73521f
+DIST buffalo_ls_xhl-3.2.0-arm.config 80267 SHA256 765ecbb7727853dfc6a679df848a154d92d8861b4fd05c5bb3764d6667be7360 SHA512 b21ec9be883a7f3ad03022773ced53fdbd6d9aeafb7aa48ae204b8fa00f8a7a4aed04ba221154978d9279906b20ed1aa277c18e3578bbbceac4e9d2091d97b86 WHIRLPOOL 5aa51d7a78b14e6845a32520348c9ee50290382f1558f5b0163a0a53054036f0f017fb70976b0792ce9a1b56a4af39316748ca5ade9ac2989d41209bdd1ada29
 DIST buffalo_ls_xhl-3.1.6-arm.config 77779 SHA256 2841d1ad132b3f2fb558415fee7c5fb3878f27bcf829ad856d3217436b73521f
 DIST buffalo_ls_xhl-3.2.0-arm.config 80267 SHA256 765ecbb7727853dfc6a679df848a154d92d8861b4fd05c5bb3764d6667be7360
 DIST buffalo_ls_xhl-3.5.4-arm.config 87644 SHA256 cb16488644ace81389fb2e7b6ed7a36251fbff2e8ce7e9efbcd6da057c708478 SHA512 4826a66cded0bdbd1a6def2e5a5d76fb8188f6c2dae69a8c48c26a02cb0c89ac569f1fbccd69f38fe21f1913fbddcaee8c3a22bc01e9ade995e4166a2cf14fa3 WHIRLPOOL f3d4b0822636c08dc9641f9ff039653bb489e1884fb18de6041ae4af0ccd9b6f20e99ff217998a07c8a0b5747110496daaebc27b935eaa8a4ae1298ef2b89da2
 DIST buffalo_ls_xhl-3.6.2-arm.config 90089 SHA256 b8a33d95941035bf5d3d839eec48e61552681efc494e4b5f6f754b3b1c3cc725 SHA512 04d8641a492dcb502e50e54cbf28ab527d614985a79a980c9f888d2b448b4280eff0b9d5a5840b86ca8f65f34f8b7c42abf7c70358495149cd06b4ce97fe239a WHIRLPOOL 7ea223a865645d50cd8d3915856ff10b557ca5818404496350fab9abb0e240033c641900f398d7203ecfa6007c07d802b320927639f96a3d6ea76910a345fd9a
-DIST buffalo_ls_xhl-fw_env-arm.config 363 SHA256 3bc4003b1731f906504e45b0c61634065efbc4f4da0aaa6f4b253a9900cc0be0
+DIST buffalo_ls_xhl-fw_env-arm.config 363 SHA256 3bc4003b1731f906504e45b0c61634065efbc4f4da0aaa6f4b253a9900cc0be0 SHA512 6421a3a72318ec3898d093af3f1e9d018f806fb425bb465b6e4c2aef1e2a971bedf4994a887e366145096210cc45b1d2660658640198781d076cf94cc49355da WHIRLPOOL 2bac919826241f2120ec31d1812113e5063b8f85e9426e0a1f8b7a826e4da47c7ade656428507f9a76a96cc2df19e8007f7b93b3a04241fb878a248f0356c79a
 DIST linux-3.1.tar.bz2 77190238 SHA256 2573d2378c754b0c602b57586e9311e5b38c5d1e6c137f02873833633a4b9359 SHA512 131b814325d888bb11ba552bc5bdd91ee2d8e139b06ac7ba94e716bcbbcc99ba30867eeea4aab580907916203bc526ae0bccda688151b250ba7943e193e50252 WHIRLPOOL d224dd52c7133e9768817319d0ad0d3797d426180b4d3d936d5189b500521ac4abe4abae7cc71f055d7e5194171f549b6fdb0221ae023cb35b16993741ad1e61
 DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
 DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b96788056f1ef5135c852fd23 SHA512 f6de5aaff351097dbe4b7186baea63004ef9efb73a85ccfd718c5856b282c22fb1431dce8588cb823eb75d1f09cd89f20e4936501e2c536f53ea4aa705e09ecc WHIRLPOOL 227c73e187370f2f5be34041c99ff2ff1bc99de4685d29801558a96d7d128c6f09c4a2ce81ce33cd87148c301e43319b42a8a77443e5db37f604fd97d101b7e7
 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251
 DIST nas-patches-3.1.5-3.tar.bz2 381168 SHA256 13fa0e86ea385b4e65344bfc5f6a051d62c0438ba53ecb2a1c14e5b6406e0406 SHA512 24f78b02f0d21057e18effb240fd0cc0b6964bc20b0c3b4ce743f5dac8555132176e3c259d602e2b4e6ac41c8cc0e9d63948773f397db4b1a6602ebf083ba333 WHIRLPOOL f1d8da4a31b5ed6029bc008d6a294f0eed9bd072e216dd5af5bfbf612d6311e96f723356e35911b99f8a7704b3f994f1ad9abfe71bf671cc55a8ba65dd2a2c5d
 DIST nas-patches-3.1.6-6.tar.bz2 388336 SHA256 63044d9f28eadb638120def4d52073b6cb18fb0529f18b753c53d0c59470b7a2 SHA512 557eb8a7ad489dfad48d7ae7d3de70c211e6ea5f56e75cfe0e826a8b8eee65b6c4bca54f4911692cab423cd3f636b0a1d6d07a0caf035ca1e4826517e1fda213 WHIRLPOOL cf62cf723eb99245fef8e6456637bba1b34670ed4414baa2eca2fe9be683d6081ab366447f0a4ce650eb03f1e6a62707fdf4c8914405cf8c67683615886cc9a6
 DIST nas-patches-3.2.0-6.tar.bz2 400558 SHA256 6cdaf1ef9fbc5c1f3472ba532e2ea7d50f29f944132bd81a5576c6bda5f3dd29 SHA512 82fe2661135b5e7cf624592d881a9a2e0c98d656b4f0a9a312bf6bdaa3bf5a1526da5f999c1ea73c75b59e94c29a189f2ce915187b9fb9bdb7bb959ff17b5dcb WHIRLPOOL 8c98444a998ed7c78d541381a087b00e18f50099689636f4c4e2ef021fe41c1738f0275e1677a6106680b25b59a7e08adcc0cd0faf5c0e60907da905e5c80fb1
 DIST nas-patches-3.5.4-4.tar.bz2 376762 SHA256 df0baa7783bd0023511a50154084495b8fffdf00407a31fb26e264abd98906f2 SHA512 62fca38aafba561ab808dc1d517022fa3c864cbb546b84240c8e358d2e2db30c8c6b5c41f4646d4a1db3b6675d3f16f47467fc3984698ad58cf90325de2d4c3b WHIRLPOOL e89f72ccae08e57f3f1147dc969d752af32f83fbcb06d00bd8379939bc89ed39491df44f4ba48d8540e0578a92c9d4da8fe4b3336e00693a46423a9cd6889b79
 DIST nas-patches-3.6.2-7.tar.bz2 1603216 SHA256 0aed7d7313a0918ab1b79e719452a3a8cc36b6281b88ec4ae23a7f4ca8a01210 SHA512 0017a5f37db7a41fff7c499928dc0e8ec8528cf605417831b9f61538fe0508aec947a311dfa58d8a3005f4abee413dcc569aae1606b9c51ef3d603b25d4f86ef WHIRLPOOL c47577384b018c1e96e89079af04fdee1fae8cc1b64b8ebec3c4eb2b23ce40e99e318c2aacfca2b5009facec67a5ed1b13d990f22f171d89c41fe621b3177b23
 DIST patch-3.1.5.bz2 148385 SHA256 474698393a39b792c02b7269010a8fd90fb38bfe7bd6f7bfc7dc5984afbce6ee SHA512 cdbdd824f2bb510cb563d327767a01bd66125949180879d15acef7b4d65b58b05d081f06adb4ba0d3c8692a320a366648f6a1d4bec606042b4ac4ae1cb4a51a0 WHIRLPOOL 83ace5eaa650e24d6dd1e6bea5070d44e9c6c22fc37e9702ef5b3b8b0c6fceb44e0fe6a4f9a164adb8fb0d74dd0358f8226f63aefa03195b6301309a552f6ce8
 DIST patch-3.1.6.bz2 163493 SHA256 33684faae341f1c48269caf17338c5dca35757d291761df580f2eed10bf8b47c SHA512 7c6e4e1662d63d285ef950f30fe50a8059bd16a587cbf60c0e4e4b5e0577f0eefa64517390fb3381a856c0b278b865c28b0556f781d13ea951d54c2ef76a76a4 WHIRLPOOL f2f2a4a92c578cdaad243f39310d9000563010f10edb5559170761e086d1fc3857dae7c7ed10968c72f10f0396b4e0e79e5cb3c86e542b3edc71837ca5032a5c
 DIST patch-3.5.4.bz2 116159 SHA256 3257da1e9cf7a5a66376c107adc6a74d445d1dd466646b40f8477b0d37b44db2 SHA512 e4a5a0da7cf4c35e46f61eb9488882ea3383ca953e4a8dd25d48bc9b603e68be97428eb1a0c05e8bd1baaa2e6ba12aac08693260e6bee3201fbb55e276a9b910 WHIRLPOOL e45566532013fec76ea747de2d269a28c2b3502120b742c05129e7bf70179cb207b4121ac13b117db46dc71304a82abc9a8a0447d3a89f612d35c781cb63179b
 DIST patch-3.6.2.bz2 57709 SHA256 0a6e45dda40e3369d3c14d473651690f0c062f3acdcd69acd73b7b219b523b35 SHA512 54c7a4079656aad75596174829f8ec11eb9464473f6877c85828431bde0104874319ad76a7ac8d787a44e083a1afaec489833f03b23d0d7da1c451da54285db8 WHIRLPOOL 29330a88db84e47e9677a54b61d9e62367b4c2fcdcc047878efabd8fd29ea2487cda5c761f8c67221437b7c5adc35efdc3fcff9ece809997dd9b7e3548709805
 EBUILD buffalo_ls_xhl-sources-3.1.5.ebuild 595 SHA256 eee93434c533899510dd915f9bd1117dc306a3bbea5ed576e3f347dc11e5a208 SHA512 c290b7a6812772b7049bd3be8dd0573eaa7b5526bfce1749749c4da4b749fa6a78e6a76af5ba28ea24bb827e1d8b16e85daac7948f5ece3aae514b321b4f5d7a WHIRLPOOL bf8531bdec35faacd358325f446d9c9a8cff25a8a7f692221b9e3d61c750e92671e0f654ae59452f84addeb48a8f22e3514380441a4bc05e161a01f44e56755d
 EBUILD buffalo_ls_xhl-sources-3.1.6.ebuild 595 SHA256 c5e59f4fda136367c4ca3d900abe91877869aed4bc4f04c218124ceb8b0e9116 SHA512 8f06e9fdad446660cc397dc8691c9123ef9700a33fb1e872e9944ffc5d0d46f9c7bbbb5427a3297a31c16c0248aaf332df04b9e948c4c8faa66e48deae1c39a5 WHIRLPOOL e3bfef4f302509cc3625f85552852b0129481ddd5145f7d75d4a0b24fa501544af057c2dca4f73945ad04840aba8f1677dafda506982c56101b6bf68ac64a0cb
 EBUILD buffalo_ls_xhl-sources-3.2.0.ebuild 595 SHA256 c5e59f4fda136367c4ca3d900abe91877869aed4bc4f04c218124ceb8b0e9116 SHA512 8f06e9fdad446660cc397dc8691c9123ef9700a33fb1e872e9944ffc5d0d46f9c7bbbb5427a3297a31c16c0248aaf332df04b9e948c4c8faa66e48deae1c39a5 WHIRLPOOL e3bfef4f302509cc3625f85552852b0129481ddd5145f7d75d4a0b24fa501544af057c2dca4f73945ad04840aba8f1677dafda506982c56101b6bf68ac64a0cb
 EBUILD buffalo_ls_xhl-sources-3.5.4.ebuild 595 SHA256 b0594cfc576ad6113e6376a1f0bfc950f9fca502942c4afae8d75bde364ecbd3 SHA512 05c22196b54bb137e4767a6282269f13e0b94f536236d3dc479c5599fb9aa737b23842c87449141c41ed7c973c473cac099eb152f55fca152daa12a31df1ba7b WHIRLPOOL df179ed3a540039e23ad24aadbd25e6b8aaad5f810a9d643e3f737376405b7352f634ec7d389484d7b9ecb3b2e7e3d875b4acdb13c71b3bebac88107cb9a3713
 EBUILD buffalo_ls_xhl-sources-3.6.2.ebuild 595 SHA256 ae65a8c0e0d64fc985d016901bc24ef334b54ca0691d4e1500467457fd3f289a SHA512 d2bc4bcad6866e6724a0cbda1e2146dcf820e84a9f4531d872477abbbba9db86e6103a33a6bdc5ec0a2f4494523b6606171ebaa8b3860a55d06c3495f3dea087 WHIRLPOOL c6897c06116350ab752bd2b8ce01b1335179530a88085b092cadc340160f64a4a55dd12c7c628067779c6631972eefa7891d995e8e577303e1679e1d2f93592b
 MISC ChangeLog 1454 SHA256 ce9c7a721d1782cf02770eebf14036fc7e0ccc769e030784c30f48c524fec0a4 SHA512 b257a148e7dd3c2789d3e9395e45c5be5fe778a9f71e4864b665ebbc505badf974f44c87289b439c1901b6de4632a51115f2b2a155cc0aa66138e67cdf1beca8 WHIRLPOOL f6542f8103ae25771e8ece86a7c62507c0579fb5fbb86db1ed11798496489b2b620142bf04e943a5afd2483b265eefb3ae98409ef5ec7355885edec2e0e609d4
 MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9
--- a/Show More
+++ b/Show More