remove unusuably old entries

2019-03-04 09:59:38 +11:00 · 2019-03-04 09:59:38 +11:00 · ad22763361
commit ad22763361
parent 674a128068
67 changed files with 0 additions and 2695 deletions
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@ -1,22 +0,0 @@
-AUX boost-1.48.0-disable_icu_rpath.patch 1073 SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4 SHA512 efb62b65dbcb52258dcca074997a0380dfc52f48161777a8b6f9672179247e534e098784dcbb574826f495981fd2189290c7fe733d943bba2b668bb62ef50087 WHIRLPOOL 6f9a142e15bf3674114f2b07c8708055888e74cda4c3c775ca5470e8f54c921aa12660a1f905a370ec5f44f16b73f05025d3ff1ccad557d379ff55ad3ad0a8f0
-AUX boost-1.48.0-disable_libboost_python3.patch 1509 SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e SHA512 5aa0eb72365a0674d7d654b924c3189501495c22cc1eb50dc1ce7aaee941ba418c17857475ebbcc4d8f8102100d889aa1c059e3782dbff9eb03ff101bea2ffbb WHIRLPOOL 5710ac3ecf1f6d18db0307f07c720d12646666ec83adde2b2464cb87c901d57088e98801720efb176420f9728967c8752382b15ca69f632b00852d51be412795
-AUX boost-1.48.0-mpi_python3.patch 2549 SHA256 9120a660469fba15554e790150e03a665ea5497e94a79469053506147bd7dad1 SHA512 7c8aa497ceba42319194dd6400ea8af883656c79e4f697d87c5e825cfdef5733bce91c3e930b504b264cae80f582c85f2c2b29d5f8db11ebcabeb744c888096e WHIRLPOOL 1b740f102467c787bd45813ecf085297171892c1126675f1abd501c11dc9a56506d0cb32222239f4e4bb1e6913533b3884acd2a749633f781c53a6529106264c
-AUX boost-1.48.0-no_strict_aliasing_python2.patch 741 SHA256 d11db74992a7a692f655b36c1cd78355fcec6703007fde522b6a82c88f171689 SHA512 cd06ba8bf5623a5ca590cbd024ba27fae14d1d2a193ccd4baf91b06c5d41b6442f40561fa49b5ba14deb0c156d5773fc4a15890a85b6cea35cab91d54e94aa6e WHIRLPOOL 1b5cce1374f56d702213d7479beb90d15413c90010442a37a46821f383afa371aac3de49e657e7623d6e9079d1e3b07353233aa40218b760042161effedd813a
-AUX boost-1.48.0-python_linking.patch 1278 SHA256 5bb937bd4423e039aa406ee4a366c61542a8067ec96b22dbcc48e8826bb7b1f8 SHA512 d588d9391c654a0c3cd49078933563705da4157cd79929ac2ff2021a2e86eec1b87ed85f5ec6d2028b76974abe7e947bd379d78aa60d97da9dc23a6f74c77ec2 WHIRLPOOL 879318dd228ca01841dd3ef0d8020810357c4699fbd1d9f164b0db07319b599634bd823f0e06dd462157d81550bc9f101506d0a7469ad2352d4b1b366bb7fb00
-AUX boost-1.48.0-respect_python-buildid.patch 1648 SHA256 996395941b5518dd2782cb18ed937273ccb256d5c5e64301b1d152dc81be39cd SHA512 b53432893fb390354dfd98a88a7905b523e528780c349e3d0da2b019255cbc58b3b987065fdef903d4959387994fdf240f7cd87c53f801e485a0811a2da56316 WHIRLPOOL 72ef562edf844944c9d7bf7931819522984dcffb7af43ef8c9d7a41fd0272ef1ebca99fffdd67654ab4564e8899aa6e0acafa27f72c8f7c06e582a0d211dfd91
-AUX boost-1.48.0-support_dots_in_python-buildid.patch 625 SHA256 da1a6c1b501f6c3bd152b2d13ec690adc2566b159f0e489723ea84865d43b88d SHA512 3a8c3efd11eba1097312dd3141f8846e23578a0386701348ebc77279a02fecf4b715de2231c998bd426b0b63f3f1875f5f47833835a4b41b8e0723b9b5b35399 WHIRLPOOL cf9ad2c82ff1c68ce4ac6a685875e53b00d5f88aa0c562007c4dbe73610811eeaf9ce93a706d0fad46aea4322fe10e9b0bc4a73659d8b98540ebf96bb5288adb
-AUX boost-1.51.0-respect_python-buildid.patch 1565 SHA256 a783cd262cfda7c0046a9a9f34dd91cdc48bc2442c4c466873e85ead818326bb SHA512 65a7456c63db5eeab862fdb6245ba3a26536e26b56be9ed7a502a3d5be91bc278cd4a22cf1c5a1d8917bdeaa6575cbf37a11bfc3e982272f56308117fd2b230e WHIRLPOOL fb430e9c5368540493e13fdadff94df426203c9e6776891a3fc421488266b39f7e5720e5f5d289665d62d753c9bce7a33198cf6e911d94961714c22d1452ac92
-AUX boost-1.51.0-support_dots_in_python-buildid.patch 609 SHA256 189299e2ef3cde98584e60a5bdd8606894c19bceb0c4d40b38f04aae0aed0edd SHA512 0bf1e4cae598a098b8c252bab1938b29dd5d3ea19d9355156b14add27238e9359ad39a73d3afecb031efebd801215804ecebc11ca8fa6ac2b7b3c2f5ff9bc32f WHIRLPOOL ffc318bc06c33263906be6d0e565ef4c2e3fde9f6224cc5413c02cbe446d9f286c69153f4aee6f588472b058b9b4a37110b0be696bd22362989f1b6a8c8fc13e
-AUX boost-1.52.0-locale-utf.patch 2062 SHA256 8212150730073ba5b08aa9808afcb45d5ce90109cfc1ba90d22a673418ea003c SHA512 641a56541efb51e7db66c6c9eac65f8e0e62b4ad2c1b792ea573ce86fc62cd94327be75d22b8fdb84128e792977a2b450681d729a85b143146dc79a007ecefc4 WHIRLPOOL 67cfd6bd4591c3dcc47ad06aaa634e9c1598e0214635a66a1e57fb933b025aebc05cf3ddadd7309fdab353daa7b7880e468874c958e641604d4a7e3fa986fd96
-AUX boost-1.52.0-threads.patch 2089 SHA256 b59323cefaf4f89078db62b1ece2a6e3b2cf7e8861996c0e366bee4d4638bdb3 SHA512 c6b43e9d8bebbeeb89681ec2bca61c2d656b8b5b1d508c5cd7e545f8ff3ca9b2b3bdf5f66b33ae043548d74b58a9d49096e3c971cd4a1487ef7ee90a9473a92d WHIRLPOOL cf75f6f740a22b001466018e9fb90a75c6912f1723486bda1e53ae2af5eeca5dedec7d430755a0a26cb433ba9d1b56aaa449ed543356ebf2ac4c67c62899ee2c
-AUX boost-1.52.0-tuple.patch 500 SHA256 dbf631c8c412ea12b3d63dd4b515e0d5f1383a13db18e13696bd33dee91645d7 SHA512 ed2790b35058a3bf91b49e5e1b61f1861e2ba8d8ec6f885e85d74d62e2182fd1768099660712a900e29a505fbf568f0235c748cca801ede836f67d2adbc6bcd1 WHIRLPOOL be88916331907ad528983e370619c9e734e122c7a1a0a2fb4a6df30f5ca9567884bfece928cab314ecdb425e6195a1b154a6c15722c6c860946ad356b4a4b502
-AUX boost-1.53.0-glibc-2.18-compat.patch 949 SHA256 54e5e0000bcfb249a14cee584e371c9f3aeeed8502d57541dd3b37396265cabd SHA512 dedc12603968d123acdb59da11ce309847ac3d49a2105e5d36e4151944f7271d8f333e58fc9e3d7097849d21b8e5b8527ba70842b88eabcde1bed2889ef84471 WHIRLPOOL a1bac4865b632277ed82591263c24795b8f8edd6571c69a178fd15a06f8a94554c0ac144e53c06c13ce5e9336ed62a52cf7c228af5bf62792a4a4635f13fd8d2
-AUX boost-1.53.0-library_status.patch 1907 SHA256 21a3137fcac21f734c7160264523f8699eb242a84a79dcc88cc937f0b1f87e67 SHA512 f5579a8650c24d2ace95e8d9aaff94325090577fa27fd7122309f5197373ff22352092671153c6e35057757fa07ef9c21ea5e0234fe1d5b467ef65cf5f2901c5 WHIRLPOOL 5a0962b007adbbfe85c33f03b9542d9ebf1ef649bf1d97f483cba5b0229cea0630c0ed7912bab8f04d8dd791b99cfd6e33e222d3a983e30852d7a10fd66a3dc7
-AUX boost-1.55.0-context-x32.patch 1077 SHA256 1da4ff48b98416cac601c52594d4c4da3fb89d0a3e8908f119f05cc8ae76f9c7 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73 WHIRLPOOL 0b7a3521a8ec513b833d0292fa3e3bcafc8232fa96d2e41afd25da8dc30bdb49ee4319c7c8555d95e7d3de55fc704d83e443ba49bf89d6961a3f5af73c024a71
-AUX boost-1.55.0-tools-c98-compat.patch 680 SHA256 08192ebf36a3087d3bce31d7b78c29c6e38bca6e5164744878783f648024beec SHA512 fc132898d9ef1a9fab607f277003f86080306fd0f30f89ab0916eb4c3217b390f15cfa00d1e410e79080d469714866a417ba72a3c0727189e8425cd72a1d6a47 WHIRLPOOL 17eb9e80ae33ef9fa8e4c442c511e35d1f5c2ac5251462931e9fbbd53bb29ef5adf699680729af71ef4c12ec87c6d83c821a8e30a03f7f1abedc2207c3125c1c
-AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332
-DIST boost_1_53_0.tar.bz2 55765258 SHA256 f88a041b01882b0c9c5c05b39603ec8383fb881f772f6f9e6e6fd0e0cddb9196 SHA512 8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522 WHIRLPOOL e8c5ed6b34dd5f68dc7e102a9e22b302616a65077d3f4af370ece6352b02a866e04294a4fc76bbd5555b6a4131f590e6455e6a74b5f12c4ffc2dd15af0bc8746
-DIST boost_1_55_0.tar.bz2 58146647 SHA256 fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 SHA512 dc606477f4c303e8f40de2586c16394b6d758e198b35bf3a7d3e576a2f49171aadc4f95e8d685fa731bc4e61e19869d5a24e1e816febfca9de078d66e096e041 WHIRLPOOL 6ae111d6a956651bd91914432b743faffeb466703191b05193db47f02fd3528a14ce200f26c1ab77bf2c68994eb5b135b0176f66a746964d334b4793ba113ad5
-EBUILD boost-1.53.0.ebuild 10240 SHA256 35ac5fe6e47677c7ba9a8a5d4b59f41f5186851b12d2a61da2c6fd8578ffb179 SHA512 c9f9c88190861ba5f9e7746afe5185fd16ae67519bf38ef8cd3f66e30ba70cc4c9f9ac4ba3c63b83fb8173a1c612366b53540c3b79c86833ba57523e85ddd892 WHIRLPOOL bdd02df4c1c8dbf698a145d68db6d9b6f69d4869e12622342fa50d301635894e04bb430f668936628e34089717db8daa616d323a1c331c33b1e181ff416b0b20
-EBUILD boost-1.55.0-r2.ebuild 11998 SHA256 f3f612cdebbed395801b0f2ecdf3a0d8ffefb974bb234d9042174ed8b6837f8a SHA512 690258a086296a3c32c324ab8ed8fd0c90f306a3f02385d881b9569378a976b551ef6af8e8806f7538b739389305c39742a30797aed1043a9265910b131aa2ce WHIRLPOOL f75fe2926e7e99fc7a10957983e94d61b99fb2c3385ab7180c2f1387febaee0b61ce551f66ddd74e15a601324126ec0e06379f9ac11802519955de0b300b3268
-MISC metadata.xml 1220 SHA256 12442e258455aa70d08879028a9bb0424d6a5ceea321984009ae7dd51af10c50 SHA512 163fa62be2cad395e8f9bb7779d105bd02be0e09ba4571c41accf707ec25b9ad0d15a62db90c2cc01660b3759235493c00d96f9b741a93fe857c4bea15ac52b9 WHIRLPOOL ae70da326b7b36689ee9a7f3c29921e9e4d85fd7f8b7863866ff9aa7a86eae2983fb12e23f7f0a0aac35a8c09572954ebf67212bb103bed4e15ee2e4ec764ba0
--- a/dev-libs/boost/boost-1.53.0.ebuild
+++ b/dev-libs/boost/boost-1.53.0.ebuild
@ -1,357 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0.ebuild,v 1.5 2013/07/10 11:54:02 pinkbyte Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
-
-inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-MAJOR_V="$(get_version_component_range 1-2)"
-SLOT="0/${MAJOR_V}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:= )
-	!icu? ( virtual/libiconv )
-	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
-	python? ( ${PYTHON_DEPS} )
-	app-arch/bzip2
-	sys-libs/zlib
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if use python; then
-		python_configuration="using python : : ${PYTHON} ;"
-	fi
-
-	cat > user-config.jam << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.48.0-mpi_python3.patch" \
-		"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
-		"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
-
-	# Avoid a patch for now
-	for file in libs/context/src/asm/*.S; do
-		cat - >> $file <<EOF
-
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-EOF
-	done
-}
-
-ejam() {
-	echo b2 "$@"
-	b2 "$@"
-}
-
-src_configure() {
-	OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2 --user-config=${S}/user-config.jam"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
-	append-cxxflags -std=gnu++98
-
-	use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
-	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
-	use mpi || OPTIONS+=" --without-mpi"
-	use python || OPTIONS+=" --without-python"
-	use nls || OPTIONS+=" --without-locale"
-
-	# Set the valid link options when requesting static libs
-	local used_static_libs
-	if [[ ${CHOST} == *-mingw* ]]; then
-		# The build currently dies with undefined references to set_tss_data 
-		# if threads are used with shared linking. Suggestions are to add
-		# BOOST_THREAD_USE_LIB to build flags, but it's been unsuccessful.
-		if use threads && ! use static-libs; then
-			die "this ebuild does not currently support shared linking and threads with mingw"
-		fi
-
-		used_static_libs="static"
-	else
-		used_static_libs="shared,static"
-	fi
-
-	OPTIONS+=" pch=off --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\" --layout=system threading=$(usex threads multi single) link=$(usex static-libs ${used_static_libs} shared) --without-context"
-
-	[[ ${CHOST} == *-mingw* ]] && OPTIONS+=" target-os=windows"
-	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
-}
-
-src_compile() {
-	export BOOST_ROOT="${S}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		ejam ${OPTIONS} \
-			$(use python && echo --python-buildid=${EPYTHON#python}) \
-			|| die "Building of Boost libraries failed"
-
-		if use python; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if use python; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if use tools; then
-		pushd tools > /dev/null || die
-
-		ejam ${OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd > /dev/null || die
-	fi
-}
-
-src_install () {
-	installation() {
-		create_user-config.jam
-
-		if use python; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-		fi
-
-		ejam ${OPTIONS} \
-			--includedir="${ED}usr/include" \
-			--libdir="${ED}usr/$(get_libdir)" \
-			$(use python && echo --python-buildid=${EPYTHON#python}) \
-			install || die "Installation of Boost libraries failed"
-
-		if use python; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if use mpi; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if use python; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	if ! use python; then
-		rm -r "${ED}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	rm -r "${ED}"/usr/include/boost/context || die
-
-	if use doc; then
-		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp,hpp \
-			*.{htm,html,png,css} \
-			-r doc
-		dohtml -A pdf,txt -r tools
-		insinto /usr/share/doc/${PF}/html
-		doins -r libs
-		doins -r more
-
-		# To avoid broken links
-		insinto /usr/share/doc/${PF}/html
-		doins LICENSE_1_0.txt
-
-		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
-	fi
-
-	pushd "${ED}usr/$(get_libdir)" > /dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd > /dev/null || die
-
-	if use tools; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do
-		[[ -L ${symlink} ]] && rm -f "${symlink}"
-	done
-}
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-src_test() { :; }
--- a/dev-libs/boost/boost-1.55.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.55.0-r2.ebuild
@ -1,412 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r2.ebuild,v 1.7 2014/11/12 08:44:52 pinkbyte Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~amd64-winnt"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
-	python? ( ${PYTHON_DEPS} )
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-# MPI stuff is not ported on multilib yet, disabling it for non-native ABIs
-mpi_needed() {
-	multilib_is_native_abi && use mpi
-}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if mpi_needed; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if python_bindings_needed; then
-		python_configuration="using python : : ${PYTHON} ;"
-	fi
-
-	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" ||
-		(
-			eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it."
-			die
-		)
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-1.51.0-respect_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.51.0-support_dots_in_python-buildid.patch" \
-		"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
-		"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
-		"${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
-		"${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
-		"${FILESDIR}/${PN}-1.52.0-threads.patch"
-
-	epatch_user
-
-	multilib_copy_sources
-}
-
-ejam() {
-	local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@"
-	echo b2 ${b2_opts}
-	b2 ${b2_opts}
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
-	append-cxxflags -std=gnu++98
-
-	use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
-	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
-	mpi_needed || OPTIONS+=" --without-mpi"
-	use nls || OPTIONS+=" --without-locale"
-	use context || OPTIONS+=" --without-context --without-coroutine"
-
-	local used_static_options
-	if [[ ${CHOST} == *-mingw* ]]; then
-		# The build currently dies with undefined references to set_tss_data 
-		# if threads are used with shared linking. Suggestions are to add
-		# BOOST_THREAD_USE_LIB to build flags, but it's been unsuccessful.
-		if use threads && ! use static-libs; then
-			die "this ebuild does not currently support shared linking and threads with mingw"
-		fi
-
-		use threads && OPTIONS+=" threadapi=win32"
-		OPTIONS+=" runtime-link=shared"
-
-		used_static_libs="static"
-	else
-		used_static_libs="shared,static"
-	fi
-
-	OPTIONS+=" pch=off"
-	OPTIONS+=" --boost-build=${EPREFIX}/usr/share/boost-build --prefix=\"${ED}usr\""
-	OPTIONS+=" --layout=system"
-	OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs ${used_static_libs} shared)"
-
-	[[ ${CHOST} == *-mingw* ]] && OPTIONS+=" target-os=windows"
-	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
-}
-
-multilib_src_compile() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			${OPTIONS} \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost libraries failed"
-
-		if python_bindings_needed; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if mpi_needed; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if tools_needed; then
-		pushd tools > /dev/null || die
-
-		ejam \
-			${OPTIONS} \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use python; then
-		rm -r "${ED}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine || die
-	fi
-
-	if use doc; then
-		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp,hpp \
-			*.{htm,html,png,css} \
-			-r doc
-		dohtml -A pdf,txt -r tools
-		insinto /usr/share/doc/${PF}/html
-		doins -r libs
-		doins -r more
-
-		# To avoid broken links
-		insinto /usr/share/doc/${PF}/html
-		doins LICENSE_1_0.txt
-
-		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	installation() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if mpi_needed; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			${OPTIONS} \
-			${PYTHON_OPTIONS} \
-			--includedir="${ED}usr/include" \
-			--libdir="${ED}usr/$(get_libdir)" \
-			install || die "Installation of Boost libraries failed"
-
-		if python_bindings_needed; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if mpi_needed; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED}usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	pushd "${ED}usr/$(get_libdir)" > /dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd > /dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}usr/include/boost" "${EROOT}usr/share/boostbook"; do
-		[[ -L ${symlink} ]] && rm -f "${symlink}"
-	done
-}
--- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
+++ b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
@ -1,29 +0,0 @@
--- libs/locale/build/Jamfile.v2
-+++ libs/locale/build/Jamfile.v2
-@@ -58,8 +58,8 @@
- 
- if $(ICU_LINK)
- {
-    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
-    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
-+    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
-+    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
- }
- else
- {
-@@ -117,7 +117,6 @@
-       <library>icuuc/<link>shared/<runtime-link>shared 
-       <library>icudt/<link>shared/<runtime-link>shared 
-       <library>icuin/<link>shared/<runtime-link>shared
-      <dll-path>$(ICU_PATH)/bin
-         <runtime-link>shared ;
- 
- 
-@@ -176,7 +175,6 @@
-       <library>icuuc_64/<link>shared/<runtime-link>shared 
-       <library>icudt_64/<link>shared/<runtime-link>shared 
-       <library>icuin_64/<link>shared/<runtime-link>shared
-      <dll-path>$(ICU_PATH)/bin64
-         <runtime-link>shared ;
-  
-     
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
+++ b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
@ -1,62 +0,0 @@
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -39,23 +39,6 @@
-     PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
- }
- 
-
-rule find-py3-version
-{
-    local versions = [ feature.values python ] ;
-    local py3ver ;
-    for local v in $(versions)
-    {
-        if $(v) >= 3.0
-        {
-            py3ver = $(v) ;
-        }
-    }
-    return $(py3ver) ;
-}
-
-py3-version = [ find-py3-version ] ;
-
- project boost/python
-   : source-location ../src
-   : requirements
-@@ -82,7 +65,7 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
-rule lib_boost_python ( is-py3 ? )
-+rule lib_boost_python
- {
- 
-     local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-@@ -91,7 +74,7 @@
-     {
-         python2 = true ;
-     }
-    lib [ cond $(is-py3) : boost_python3 : boost_python ]
-+    lib boost_python
-         : # sources
-         numeric.cpp
-         list.cpp
-@@ -148,7 +131,6 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
-            [ cond $(is-py3) : <python>$(py3-version) ]
-         :   # default build
-             <link>shared
-         :   # usage requirements
-@@ -160,9 +142,3 @@
- 
- lib_boost_python ;
- boost-install boost_python ;
-
-if $(py3-version)
-{
-    lib_boost_python yes ;
-    boost-install boost_python3 ;
-}
--- a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
+++ b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
@ -1,95 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/4657
-https://svn.boost.org/trac/boost/changeset/76290
-
--- libs/mpi/src/python/datatypes.cpp
-+++ libs/mpi/src/python/datatypes.cpp
-@@ -17,7 +17,9 @@
- 
- void export_datatypes()
- {
-+#if PY_MAJOR_VERSION < 3 
-   register_serialized(long(0), &PyInt_Type);
-+#endif
-   register_serialized(false, &PyBool_Type);
-   register_serialized(double(0.0), &PyFloat_Type);
- }
--- libs/mpi/src/python/py_environment.cpp
-+++ libs/mpi/src/python/py_environment.cpp
-@@ -11,6 +11,9 @@
-  *  This file reflects the Boost.MPI "environment" class into Python
-  *  methods at module level.
-  */
-+
-+#include <locale>
-+#include <string>
- #include <boost/python.hpp>
- #include <boost/mpi.hpp>
- 
-@@ -50,11 +53,64 @@
- 
-   // If anything changed, convert C-style argc/argv into Python argv
-   if (mpi_argv != my_argv)
-+  {
-+#if PY_MAJOR_VERSION >= 3
-+
-+    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+    /* We need a second copy, as Python might modify the first one. */
-+    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+
-+    if (!argv_copy || !argv_copy2) {
-+      fprintf(stderr, "out of memory\n");
-+      return false;
-+    }
-+
-+    std::locale mylocale;
-+    mbstate_t mystate;
-+
-+    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
-+      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
-+
-+    for (int i = 0; i < mpi_argc; i++) 
-+    {
-+      size_t length = strlen(mpi_argv[i]);
-+
-+      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
-+
-+      const char *from_next;
-+      wchar_t *to_next;
-+
-+      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
-+        myfacet.out(mystate,
-+            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
-+            dest, dest+length+1, to_next);
-+
-+      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
-+      {
-+        fprintf(stderr, "failure translating argv\n");
-+        return 1;
-+      }
-+
-+      argv_copy2[i] = argv_copy[i] = dest;
-+      if (!argv_copy[i])
-+          return false;
-+    }
-+
-+    PySys_SetArgv(mpi_argc, argv_copy);
-+
-+    for (int i = 0; i < mpi_argc; i++) {
-+        PyMem_Free(argv_copy2[i]);
-+    }
-+    PyMem_Free(argv_copy);
-+    PyMem_Free(argv_copy2);
-+#else
-     PySys_SetArgv(mpi_argc, mpi_argv);
-+#endif
-+  }
- 
-  for (int arg = 0; arg < my_argc; ++arg)
-    free(my_argv[arg]);
-  delete [] my_argv;
-+  for (int arg = 0; arg < mpi_argc; ++arg)
-+    free(mpi_argv[arg]);
-+  delete [] mpi_argv;
- 
-   return true;
- }
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
+++ b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
@ -1,23 +0,0 @@
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -85,6 +85,12 @@
- rule lib_boost_python ( is-py3 ? )
- {
- 
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
-     lib [ cond $(is-py3) : boost_python3 : boost_python ]
-         : # sources
-         numeric.cpp
-@@ -119,6 +125,7 @@
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-           
-             # On Windows, all code using Python has to link to the Python
-             # import library.
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch
+++ b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
@ -1,24 +0,0 @@
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -109,20 +109,7 @@
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-             [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-          
-            # On Windows, all code using Python has to link to the Python
-            # import library.
-            #
-            # On *nix we never link libboost_python to libpython.  When
-            # extending Python, all Python symbols are provided by the
-            # Python interpreter executable.  When embedding Python, the
-            # client executable is expected to explicitly link to
-            # /python//python (the target representing libpython) itself.
-            #
-            # python_for_extensions is a target defined by Boost.Build to
-            # provide the Python include paths, and on Windows, the Python
-            # import library, as usage requirements.
-            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
--- a/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch
+++ b/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch
@ -1,69 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/6286
-
--- boostcpp.jam
-+++ boostcpp.jam
-@@ -99,13 +99,6 @@
-     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" "_" ] ;
- }
- 
-# Python build id (only for Python libraries)
-python-id = [ option.get "python-buildid" ] ;
-if $(python-id)
-{
-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
-}
-
- ##############################################################################
- #
- # 1. The 'tag' function that adds decoration suitable to the properties if
--- libs/mpi/build/Jamfile.v2
-+++ libs/mpi/build/Jamfile.v2
-@@ -8,6 +8,8 @@
- #  Authors: Douglas Gregor
- #           Andrew Lumsdaine
- 
-+import option ;
-+import regex ;
- import mpi ;
- import indirect ;
- import python ;
-@@ -24,6 +26,13 @@
-     <tag>@$(__name__).tag
-   ;
- 
-+# Python build id (only for Python libraries)
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
-+}
-+
- rule tag ( name : type ? : property-set )
- {
-     local result = $(name) ;
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -2,6 +2,8 @@
- # Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
-+import option ;
-+import regex ;
- import os ;
- import indirect ;
- import modules ;
-@@ -30,6 +32,14 @@
-         ;
- }
- 
-+# Python build id (only for Python libraries)
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
-+}
-+
-+
- rule find-py3-version
- {
-     local versions = [ feature.values python ] ;
--- a/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch
+++ b/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch
@ -1,22 +0,0 @@
--- libs/mpi/build/Jamfile.v2
-+++ libs/mpi/build/Jamfile.v2
-@@ -30,7 +30,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
- }
- 
- rule tag ( name : type ? : property-set )
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -36,7 +36,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
- }
- 
- 
--- a/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
+++ b/dev-libs/boost/files/boost-1.51.0-respect_python-buildid.patch
@ -1,69 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/6286
-
--- boostcpp.jam
-+++ boostcpp.jam
-@@ -99,13 +99,6 @@
-     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" _ ] ;
- }
- 
-# Python build id (for Python libraries only).
-python-id = [ option.get "python-buildid" ] ;
-if $(python-id)
-{
-    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-}
-
- 
- ################################################################################
- #
--- libs/mpi/build/Jamfile.v2
-+++ libs/mpi/build/Jamfile.v2
-@@ -8,6 +8,8 @@
- #  Authors: Douglas Gregor
- #           Andrew Lumsdaine
- 
-+import option ;
-+import regex ;
- import mpi ;
- import indirect ;
- import python ;
-@@ -24,6 +26,13 @@
-     <tag>@$(__name__).tag
-   ;
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
- rule tag ( name : type ? : property-set )
- {
-     local result = $(name) ;
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -2,6 +2,8 @@
- # Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
-+import option ;
-+import regex ;
- import os ;
- import indirect ;
- import modules ;
-@@ -30,6 +32,14 @@
-         ;
- }
- 
-+# Python build id (for Python libraries only).
-+python-id = [ option.get "python-buildid" ] ;
-+if $(python-id)
-+{
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+}
-+
-+
- rule find-py3-version
- {
-     local versions = [ feature.values python ] ;
--- a/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
+++ b/dev-libs/boost/files/boost-1.51.0-support_dots_in_python-buildid.patch
@ -1,22 +0,0 @@
--- libs/mpi/build/Jamfile.v2
-+++ libs/mpi/build/Jamfile.v2
-@@ -30,7 +30,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
-    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- rule tag ( name : type ? : property-set )
--- libs/python/build/Jamfile.v2
-+++ libs/python/build/Jamfile.v2
-@@ -36,7 +36,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
-    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
--- a/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
+++ b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch
@ -1,52 +0,0 @@
-Index: boost/locale/utf.hpp
-===================================================================
--- boost/locale/utf.hpp	(revision 81589)
-+++ boost/locale/utf.hpp	(revision 81590)
-@@ -219,16 +219,22 @@
-                 if(BOOST_LOCALE_UNLIKELY(p==e))
-                     return incomplete;
-                 tmp = *p++;
-+                if (!is_trail(tmp))
-+                    return illegal;
-                 c = (c << 6) | ( tmp & 0x3F);
-             case 2:
-                 if(BOOST_LOCALE_UNLIKELY(p==e))
-                     return incomplete;
-                 tmp = *p++;
-+                if (!is_trail(tmp))
-+                    return illegal;
-                 c = (c << 6) | ( tmp & 0x3F);
-             case 1:
-                 if(BOOST_LOCALE_UNLIKELY(p==e))
-                     return incomplete;
-                 tmp = *p++;
-+                if (!is_trail(tmp))
-+                    return illegal;
-                 c = (c << 6) | ( tmp & 0x3F);
-             }
- 
-Index: libs/locale/test/test_codepage_converter.cpp
-===================================================================
--- libs/locale/test/test_codepage_converter.cpp	(revision 81589)
-+++ libs/locale/test/test_codepage_converter.cpp	(revision 81590)
-@@ -140,6 +140,20 @@
-         TEST_TO("\xf8\x90\x80\x80\x80",illegal);  // 400 0000
-         TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal);  // 7fff ffff
- 
-+        std::cout << "-- Invalid trail" << std::endl;
-+        TEST_TO("\xC2\x7F",illegal);
-+        TEST_TO("\xdf\x7F",illegal);
-+        TEST_TO("\xe0\x7F\x80",illegal);
-+        TEST_TO("\xef\xbf\x7F",illegal);
-+        TEST_TO("\xe0\x7F\x80",illegal);
-+        TEST_TO("\xef\xbf\x7F",illegal);
-+        TEST_TO("\xf0\x7F\x80\x80",illegal);
-+        TEST_TO("\xf4\x7f\xbf\xbf",illegal);
-+        TEST_TO("\xf0\x90\x7F\x80",illegal);
-+        TEST_TO("\xf4\x8f\x7F\xbf",illegal);
-+        TEST_TO("\xf0\x90\x80\x7F",illegal);
-+        TEST_TO("\xf4\x8f\xbf\x7F",illegal);
-+
-         std::cout << "-- Invalid length" << std::endl;
- 
-         /// Test that this actually works
--- a/dev-libs/boost/files/boost-1.52.0-threads.patch
+++ b/dev-libs/boost/files/boost-1.52.0-threads.patch
@ -1,63 +0,0 @@
-Index: /trunk/boostcpp.jam
-===================================================================
--- /trunk/boostcpp.jam	(revision 79301)
-+++ /trunk/boostcpp.jam	(revision 81000)
-@@ -210,6 +210,44 @@
- }
- 
-+rule filtered-target ( name : message + : sources + : requirements * )
-+{
-+    message $(name)-message : warning: $(message) ;
-+    alias $(name) : $(sources) : $(requirements) ;
-+    alias $(name) : $(name)-message ;
-+
-+    local p = [ project.current ] ;
-+    $(p).mark-target-as-explicit $(name) ;
-+    $(p).mark-target-as-explicit $(name)-message ;
-+}
-+
- rule declare_install_and_stage_proper_targets ( libraries * : headers * )
- {
-+    for local l in $(libraries)
-+    {
-+        if $(l) = locale
-+        {
-+            filtered-target $(l)-for-install :
-+                Skipping Boost.Locale library with threading=single. :
-+                libs/$(l)/build : <threading>multi ;
-+        }
-+        else if $(l) = wave
-+        {
-+            filtered-target $(l)-for-install :
-+                Skipping Boost.Wave library with threading=single. :
-+                libs/$(l)/build : <threading>multi ;
-+        }
-+        else if $(l) = thread
-+        {
-+            filtered-target $(l)-for-install :
-+                Skipping Boost.Thread library with threading=single. :
-+                libs/$(l)/build : <threading>multi ;
-+        }
-+        else
-+        {
-+            alias $(l)-for-install : libs/$(l)/build ; 
-+        }
-+    }
-+    local library-targets = $(libraries)-for-install ;
-+
-     install-requirements = <install-source-root>$(BOOST_ROOT)/boost ;
- 
-@@ -239,5 +277,5 @@
-         : $(install-requirements) <install-no-version-symlinks>on
-         :
-        : libs/$(libraries)/build
-+        : $(libraries)-for-install
-         : $(headers)
-         ;
-@@ -246,5 +284,5 @@
-     # Install just library.
-     install stage-proper
-        : libs/$(libraries)/build
-+        : $(libraries)-for-install
-         : <location>$(stage-locate)/lib
-           <install-dependencies>on <install-type>LIB
--- a/dev-libs/boost/files/boost-1.52.0-tuple.patch
+++ b/dev-libs/boost/files/boost-1.52.0-tuple.patch
@ -1,11 +0,0 @@
--- boost/signals2/detail/variadic_slot_invoker.hpp.org	2012-11-20 09:15:55.000000000 +0400
-+++ boost/signals2/detail/variadic_slot_invoker.hpp	2012-11-20 09:19:56.000000000 +0400
-@@ -20,7 +20,7 @@
- // if compiler has std::tuple use it instead of boost::tuple
- // because boost::tuple does not have variadic template support at present.
- #ifdef BOOST_NO_CXX11_HDR_TUPLE
-#include <boost/tuple.hpp>
-+#include <boost/tuple/tuple.hpp>
- #define BOOST_SIGNALS2_TUPLE boost::tuple
- #else
- #include <tuple>
--- a/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch
+++ b/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch
@ -1,18 +0,0 @@
-Patch for compatibility with glibc 2.18
-Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=482372
-Upstream fix: https://svn.boost.org/trac/boost/changeset/84950
-
--- boost_1_53_0/boost/cstdint.hpp	2012-12-11 22:42:26.000000000 +0800
-+++ boost_1_53_0.fix/boost/cstdint.hpp	2013-08-25 20:48:53.683000000 +0800
-@@ -41,7 +41,10 @@
- // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H)					\
-+  && (!defined(__GLIBC__)					\
-+      || defined(__GLIBC_HAVE_LONG_LONG)			\
-+      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
- 
- // The following #include is an implementation artifact; not part of interface.
- # ifdef __hpux
--- a/dev-libs/boost/files/boost-1.53.0-library_status.patch
+++ b/dev-libs/boost/files/boost-1.53.0-library_status.patch
@ -1,57 +0,0 @@
--- tools_orig/regression/src/library_status.cpp	2012-12-11 15:42:26.000000000 +0100
-+++ tools/regression/src/library_status.cpp	2013-07-11 16:15:54.000000000 +0200
-@@ -171,16 +171,17 @@
-     //  find_element  ------------------------------------------------------------//
- 
-+    struct element_equal {
-+        const string & m_name;
-+       element_equal(const string & name) :
-+           m_name(name)
-+       {}
-+       bool operator()(const xml::element_ptr & xep) const {
-+          return xep.get()->name == m_name;
-+       }
-+    };
-+
-     xml::element_list::const_iterator find_element(
-         const xml::element & root, const string & name 
-     ){
-        struct element_equal {
-            const string & m_name;
-            element_equal(const string & name) :
-                m_name(name)
-            {}
-            bool operator()(const xml::element_ptr & xep) const {
-                return xep.get()->name == m_name;
-            }
-        };
-         return std::find_if(
-             root.elements.begin(), 
-@@ -203,17 +204,18 @@
-     //  attribute_value  ----------------------------------------------------------//
- 
-+    struct attribute_equal {
-+       const string & m_name;
-+       attribute_equal(const string & name) :
-+       m_name(name)
-+       {}
-+       bool operator()(const xml::attribute & a) const {
-+           return a.name == m_name;
-+       }
-+    };
-+
-     const string & attribute_value( 
-         const xml::element & element,
-         const string & attribute_name 
-     ){
-        struct attribute_equal {
-            const string & m_name;
-            attribute_equal(const string & name) :
-                m_name(name)
-            {}
-            bool operator()(const xml::attribute & a) const {
-                return a.name == m_name;
-            }
-        };
-         xml::attribute_list::const_iterator itr;
-         itr = std::find_if(
--- a/dev-libs/boost/files/boost-1.55.0-context-x32.patch
+++ b/dev-libs/boost/files/boost-1.55.0-context-x32.patch
@ -1,42 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/9445
-
-hack to fix x32 builds
-
--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
-+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
-@@ -31,6 +31,10 @@
-  *                                                                  *
-  * *****************************************************************/
- 
-+#ifdef __x86_64__
-+#include "jump_x86_64_sysv_elf_gas.S"
-+#else
-+
- .text
- .globl jump_fcontext
- .align 2
-@@ -73,3 +77,5 @@ jump_fcontext:
- 
- /* Mark that we don't need executable stack.  */
- .section .note.GNU-stack,"",%progbits
-+
-+#endif
--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
-+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
-@@ -31,6 +31,10 @@
-  *                                                                  *
-  * *****************************************************************/
- 
-+#ifdef __x86_64__
-+#include "make_x86_64_sysv_elf_gas.S"
-+#else
-+
- .text
- .globl make_fcontext
- .align 2
-@@ -78,3 +82,5 @@ finish:
- 
- /* Mark that we don't need executable stack.  */
- .section .note.GNU-stack,"",%progbits
-+
-+#endif
--- a/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch
+++ b/dev-libs/boost/files/boost-1.55.0-tools-c98-compat.patch
@ -1,17 +0,0 @@
-Make tools compiled successfully with forced C++98
-
-Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=503468
-
-diff --git a/tools/regression/src/compiler_status.cpp b/tools/regression/src/compiler_status.cpp
-index 63f8134..3f3374a 100644
--- a/tools/regression/src/compiler_status.cpp
-+++ b/tools/regression/src/compiler_status.cpp
-@@ -128,7 +128,7 @@ namespace
-         string ln(line);
-         if (ln.find("Revision: ") != string::npos)
-         {
-          for(auto itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr)
-+          for(string::iterator itr = ln.begin()+10; itr != ln.end() && isdigit(*itr); ++itr)
-             rev += *itr;
-         }
-       }
--- a/dev-libs/boost/files/remove-toolset-1.48.0.patch
+++ b/dev-libs/boost/files/remove-toolset-1.48.0.patch
@ -1,11 +0,0 @@
--- boostcpp.jam
-+++ boostcpp.jam
-@@ -377,7 +377,7 @@
-         if $(layout) = versioned
-         {
-             result = [ common.format-name
-                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-+                <base> <threading> <runtime> -$(BOOST_VERSION_TAG)
-                 -$(BUILD_ID)
-                 : $(name) : $(type) : $(property-set) ] ;
-         }        
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>cpp</herd>
-  <use>
-    <flag name='tools'>
-      Build and install the boost tools (bcp, quickbook, inspect,
-      wave)
-    </flag>
-    <flag name='debug' restrict='&lt;dev-libs/boost-1.50.0-r3'>
-      Build and install debug versions of the Boost libraries. These
-      libraries are not used by default, and should not be used unless
-      you're developing against Boost.
-    </flag>
-    <flag name='debug' restrict='&gt;dev-libs/boost-1.52.0-r2'>
-      Build and install only the debug version of the Boost
-      libraries. Only enable this flag if you're developing against
-      boost.
-    </flag>
-    <flag name='threads'>
-      Build multi-thread-compatible libraries instead of
-      single-threaded only.
-    </flag>
-    <flag name='nls'>
-      Build libboost_locale. This library requires compatible C
-      library interfaces, which might not be provided by uClibc or
-      other embedded libraries.
-    </flag>
-    <flag name='doc'>
-      Install the full API documentation documentation. This takes
-      over 200MB of extra disk space.
-    </flag>
-  </use>
-</pkgmetadata>
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@ -1,3 +0,0 @@
-DIST Scrapy-0.16.2.tar.gz 675402 SHA256 8c74a37e5bcc836d1a4ee58104e8bcfe51b7af5ed2595d865d665bb725833fa1 SHA512 40d55230af764207452e2ac4b3b45037a14dc210a896863bac54ba0e2bc0e0606f56c93ca0de95f7a08e69782e69fc996d052378aa7b9d8193d5e8d7864e3670 WHIRLPOOL 0b3b3b39b2769caa3ddfc6f78c6047d78293340a6f80a2eb6266e78440630d3396798a4c1c540b83998a7488a8bd30bca73dc927bc58e07c20c96866112d42d2
-EBUILD scrapy-0.16.2.ebuild 1708 SHA256 5b76cf836e558e3fa711561c7228f5a0a7b86dd089c67b7268709a39114165f2 SHA512 569f93ca68920fe60fe114adddc05889d25e6f8f135f452664fb5cf2f14b19d3f7dad9a301630c7dbe3676182e7efa47015299961e1a463c8bcdd1716f1cd82d WHIRLPOOL 13fed208f0c4bd593c0a2fb5eccaf77eda52885bf7c6a32cc5e17c30f527fa931dc7098edf3bea4daf62ce1541e314b7396f436f7f3954765dbbe1a73b68617e
-MISC metadata.xml 415 SHA256 6cbf7bc902a788f3aca1fc94cb2451399e088a2f696f1d1a724c296505b54655 SHA512 9320286bb847c00d744e558da90f14ed9c2dc853bcadb32152b977fd4b28d2b6228aab5ed91a6ea23ad77a33d1c4713d7b7c17b8a33a8c1981267a2b9b30521a WHIRLPOOL e348fd491bfe49ede0792d9e88a8ba2caafdcd637a5403e19459c7774072cd197301fd7e95f204ebff20c02bbf8beb1516fc15990ae0a36e9439cac7d9871df0
--- a/dev-python/scrapy/files/.gitkeep
+++ b/dev-python/scrapy/files/.gitkeep
--- a/dev-python/scrapy/metadata.xml
+++ b/dev-python/scrapy/metadata.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>python</herd>
-<maintainer>
-  <email>maksbotan@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="boto">Add support for Amazon S3 via
-  <pkg>dev-python/boto</pkg></flag>
-  <flag name="ibl">Use Instace Based Learning alrogirithm for automatic
-  extraction</flag>
-</use>
-</pkgmetadata>
--- a/dev-python/scrapy/scrapy-0.16.2.ebuild
+++ b/dev-python/scrapy/scrapy-0.16.2.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.4.ebuild,v 1.3 2012/08/09 06:22:27 patrick Exp $
-
-EAPI="5"
-
-PYTHON_USE_WITH="sqlite(+)"
-PYTHON_COMPAT=(python{2_6,2_7})
-inherit distutils-r1
-
-MY_PN="Scrapy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A high-level Python Screen Scraping framework"
-HOMEPAGE="http://scrapy.org http://pypi.python.org/pypi/Scrapy/"
-SRC_URI="mirror://pypi/S/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boto doc examples ibl test ssl"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-python/django
-		net-ftp/vsftpd
-	)"
-RDEPEND="dev-libs/libxml2[python]
-	boto? ( dev-python/boto )
-	dev-python/imaging
-	dev-python/lxml
-	ibl? ( dev-python/numpy )
-	ssl? ( dev-python/pyopenssl )
-	dev-python/setuptools
-	dev-python/simplejson
-	dev-python/twisted
-	dev-python/twisted-conch
-	dev-python/twisted-mail
-	dev-python/twisted-web
-	>=dev-python/w3lib-1.1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		emake -C docs html || die "emake html failed"
-	fi
-}
-
-src_test() {
-	testing() {
-		# PYTHOPATH should be build-$PYTHON_ABI/lib, but causes a test fail.
-		# Not all content is copied across to build-$PYTHON_ABI/lib, and
-		# PYTHONPATH again requires an abs path.
-		echo PYTHONPATH="${PWD}" bin/runtests.sh
-		PYTHONPATH="${PWD}"/ bin/runtests.sh
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r "${S}"/docs/build/html/
-	fi
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins -r "${S}"/examples/*
-	fi
-}
--- a/licenses/BSD
+++ b/licenses/BSD
@ -1,26 +0,0 @@
-Copyright (c) <YEAR>, <OWNER>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the <ORGANIZATION> nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@ -1,4 +0,0 @@
-AUX 2.6.0-GFX_radeon.patch 786 SHA256 ed6642c409bc32b4ee98cd371ea3d403ce293eabf2d06aad9d9913166e62ed89 SHA512 dd449990c97ac4b40a33acbbda9a81e92b454ca5fecd2a9a54c48c7a647bd3a74f1088d173dea8883f7ce072c554a306b03fa1ea6bd24be65080662145b32cd1 WHIRLPOOL d65a6b5221edc43867229172292edbc97c3009bc61cd406113930c12a4781fdd2c81cb6617cc99fd10257b0cfb11896456704557d9e2336cb4388177d0efa27e
-AUX freeglut-2.4.0-bsd-usb-joystick.patch 755 SHA256 52ada965b1dc6abbb9ce0bbc00bf91452c6717b74016d21e0a10df24a0ffe83c SHA512 7aa28f277864357e9b2bb6e7fcd801bb9dd6e131fec8989aca26990cf59b60c3465030ea5068ca01cb7f46bf406c0f3fce2327affb7f288ee3026b5717717561 WHIRLPOOL 91710af0b3c06f36b65f51045e12f444329b4954268012422d0c6eafefc0a4f5f25f4b01b348256fdbce9956f766ee91773fc3cf8e28e0f9941ccd9b92930fb9
-DIST freeglut-2.8.1.tar.gz 1005343 SHA256 dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a SHA512 935fddfa197c5f0ec74c5f2005fe5a0ebfd39f4a402cc79363da7cfe2e8576263130e44bd7e4f6c07ea53d3137bd7ca8ee8db85c0a09f25508fcf1b9ed07052e WHIRLPOOL f191f870fa85b867f17ac3b69d18be386dd020b5f9c0fbc58814718986760570aa93cf4b2790daf944587d95a60408892fe68bd56f0dcc3f0f154c8a1ae33256
-EBUILD freeglut-2.8.1-r1.ebuild 1509 SHA256 186f67c2a8885dd014e4cd2acc19d9997f7e439f170f6b9d0d9237b294cc99f5 SHA512 9d9c3e81c865f7523e801499b2f90cb49ba1769a5b50242207c5e4a572950d68dbeacf0d09478399740783efb7cbe70657188a9f5c10e0f44f2890a3d9a8c7bd WHIRLPOOL f0eb54b318e286300565a24a31a7d5d7b98e9117ea9a1383c74b7da70dfaee917bae5ac3bc875f337f23836d8d71131918b72e6e734ae2b18c8ffb2ca8bc8438
--- a/media-libs/freeglut/files/2.6.0-GFX_radeon.patch
+++ b/media-libs/freeglut/files/2.6.0-GFX_radeon.patch
@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===================================================================
--- src/freeglut_window.c	(Revision 832)
-+++ src/freeglut_window.c	(Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
-     if ( window )
-     {
-        glXMakeContextCurrent(
-+        glXMakeCurrent(
-             fgDisplay.Display,
-             window->Window.Handle,
-            window->Window.Handle,
-             window->Window.Context
-         );
- 
-@@ -932,10 +932,9 @@
-     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
-                      &fgDisplay.DeleteWindow, 1 );
- 
-    glXMakeContextCurrent(
-+    glXMakeCurrent(
-         fgDisplay.Display,
-         window->Window.Handle,
-        window->Window.Handle,
-         window->Window.Context
-     );
- 
--- a/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
+++ b/media-libs/freeglut/files/freeglut-2.4.0-bsd-usb-joystick.patch
@ -1,16 +0,0 @@
-We disable BSD usb joystick support until upstream has a better support for it
-so that it can at least build. For now it builds but does not link to libusbhid
-so that libglut.so has undefined references to hid_* symbols and causes linking
-errors later on in the build process.
-
--- freeglut-2.4.0/src/freeglut_joystick.c.old	2008-08-08 15:26:15 +0000
-+++ freeglut-2.4.0/src/freeglut_joystick.c	2008-08-08 15:26:32 +0000
-@@ -78,7 +78,7 @@
- #    include <errno.h>
- #    if defined(__FreeBSD__) || defined(__NetBSD__)
- /* XXX The below hack is done until freeglut's autoconf is updated. */
-#        define HAVE_USB_JS    1
-+#        undef HAVE_USB_JS
- 
- #        if defined(__FreeBSD__) && __FreeBSD_version >= 500000
- #            include <sys/joystick.h>
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.1-r1.ebuild,v 1.11 2014/06/18 19:28:55 mgorny Exp $
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~amd64-winnt"
-IUSE="debug static-libs"
-
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	!amd64-winnt? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!amd64-winnt? (
-		>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	)"
-
-PATCHES=(
-	# Please read the comments in the patch before thinking about dropping it
-	# yet again...
-	"${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
-)
-
-HTML_DOCS=( doc/. )
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(usex amd64-winnt "--without-x" '')
-}
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@ -1,6 +0,0 @@
-AUX ftgl-2.1.3_rc5-ft2_pkgconfig.patch 320 SHA256 a49fefcc439ab272be62a854074ddade5058e6bfecadbdbb94d582f3dd63a673 SHA512 9992b3f8c61860200a12a3c6a158281ccdc60dadde1b736f67c6ca4bf8d6c21fed4dcb16c2628d9f7f97b2a7fe7fbfe2bf593a4460079d5074061deecea5cdf1 WHIRLPOOL f9c2b4491d9154b6a623056eaef422b8d512db5a7e92c9b7af28e6f562a71b348094c5d6c6052b1e5a732d86cd3dcaccfad0a1e4eac24fd4b662b3271586cf4c
-AUX ftgl-2.1.3_rc5-gentoo.patch 1399 SHA256 1c5d8e3e0d37db1174bc00e9876c306fbda1491ec6216c5bd3f3e2856d629f58 SHA512 6dc2ef3467bf57a1fc62fcb512d3e5235f086d1f837768a7ddd1af5dbf0a91104e706e3ef8c875ef0fa38d2f8f934c874ff570f5fa2066abc74d4af15f30a0cd WHIRLPOOL d5a2fe4a71194eeaf65f4715cd5058fa9867f995e2696f5834a2f5370135ef35103c199938a238be1f09cfa8fbaf5f002bda8b375ba9cb8acc0da2f78e36dd80
-AUX ftgl-2.1.3_rc5-underlink.patch 349 SHA256 9a3540ff4705476f22718a5614aa3a7f64b8e748839e92d1bcbc8a29364ca590 SHA512 aa7a33577a7096e68b47d6e623f99511b54d277ed334e0a2aff6e69e3d915f575e943a556aa22c5f4fe5d884eb6b4425f2b0ecb0aea95f9a36799ad65c1b7399 WHIRLPOOL a35ae3e743778e1fb05853271d5e689347c5634ef0612bae2c6a6a03179fa3711e6ca37d7ec58a3cb70a031510065cf879db2935d29ef3c433639f82f502070c
-AUX ftgl-2.1.3_rc5-win32_gl.patch 1610 SHA256 beb9ebf923a8b46d51e1b1fe6e9c82c4677ed220fc2040a20fa814975f2a4ca4 SHA512 33172b79e020d7af6c1da0763eb9556e9358e7ed1d34daa4fc1859f6b9888dbb9ec265e9d89140956faae93e2647526a900cc79a5f9cf96e757a3eeb0bd381e2 WHIRLPOOL 9e4e2aed0553912fc318123e08db09344982c733bfbe0359b98930d862a8cfb1da5fc30597e06e6f23f50c52b35153c8610d62d2266a9a85c676d7a85322c7b3
-DIST ftgl-2.1.3-rc5.tar.bz2 707854 SHA256 521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59 SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4 WHIRLPOOL 330e19923e51739d336c3c44345e1f8ae6907606be0635c55536409c7bb0caea6a61ede49b793c25c1542f60575cdf04f656e9b6436e8f8a43dcfea784e0056c
-EBUILD ftgl-2.1.3_rc5.ebuild 1444 SHA256 d55ce52e278601e7770acd7ba521aa9f74cf29d99798c4bda7c54602b84fa06c SHA512 989760c99ece66ab90a9d352b5d04d8c176fc8d803ac9524a664f094356adbd38d512a62d8636ebd258ad0a13d8fb0fc03c4501b2f7f4665540d85b1fe05e88f WHIRLPOOL 99547cfd67719adcb3556c9a6c284214ecd1acfbbecd97af6db464fd518532d5b0e903a9e091d2235c7688886497e1b3cb344187623b954a853c56d43551dff0
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-ft2_pkgconfig.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-ft2_pkgconfig.patch
@ -1,14 +0,0 @@
--- configure.ac.old
-+++ configure.ac	2014-12-03 15:58:23.955998467 +1100
-@@ -41,8 +41,9 @@
- 
- AC_PATH_X
- 
-AC_CHECK_FT2([9.0.3],[],
-             [AC_MSG_ERROR([FreeType2 is required to compile this library])])
-+PKG_CHECK_MODULES([FT2], [freetype2 >= 9.0.3])
-+AC_SUBST(FT2_CFLAGS)
-+AC_SUBST(FT2_LIBS)
- 
- AC_PATH_XTRA
- 
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
@ -1,42 +0,0 @@
--- configure.ac.old    2008-11-21 14:41:15.000000000 +0100
-+++ configure.ac        2008-11-21 14:44:19.000000000 +0100
-@@ -64,19 +64,11 @@
- CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
- 
- # Build HTML documentatin?
-AC_PATH_PROG(DOXYGEN, doxygen, no)
-+DOXYGEN="no"
- AM_CONDITIONAL(HAVE_DOXYGEN, test "x$DOXYGEN" != "xno")
- 
- # Build PDF documentation?
-AC_PATH_PROG(LATEX, pdflatex, no)
-AC_PATH_PROG(KPSEWHICH, kpsewhich, no)
-AC_PATH_PROG(DVIPS, dvips, no)
-AC_PATH_PROG(CONVERT, convert, no)
-AC_PATH_PROG(EPSTOPDF, epstopdf, no)
-if test "${DVIPS}" = "no" -o "${KPSEWHICH}" = "no" -o "${EPSTOPDF}" = "no" \
-     -o "${CONVERT}" = "no"; then
-   LATEX="no"
-fi
- if test "x${LATEX}" != "xno"; then
-   AC_MSG_CHECKING(for a4.sty and a4wide.sty)
-   if "${KPSEWHICH}" a4.sty >/dev/null 2>&1; then
--- Makefile.am.old	2008-11-24 22:35:16.000000000 +0100
-+++ Makefile.am	2008-11-24 22:36:32.000000000 +0100
-@@ -24,16 +24,6 @@
- 	m4 \
- 	$(NULL)
- 
-# Print out an informative summary.
-all-local:
-	@$(ECHO) "Done."
-	@$(ECHO)
-	@if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \
-	  $(ECHO) "---" ;\
-	  $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
-	fi
-	@$(ECHO)
-
- # Upload documentation
- DOC = docs/html docs/latex/ftgl.pdf
- HOST = ftgl.sf.net
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
@ -1,11 +0,0 @@
--- demo/Makefile.am.old	2011-05-20 11:13:18.822445466 +0200
-+++ demo/Makefile.am	2011-05-20 11:13:28.271042994 +0200
-@@ -17,7 +17,7 @@
-     $(NULL)
- c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
- c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
-c_demo_LDADD = ../src/libftgl.la
-+c_demo_LDADD = ../src/libftgl.la -lm
- 
- FTGLDemo_SOURCES = \
- 	FTGLDemo.cpp \
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-win32_gl.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-win32_gl.patch
@ -1,51 +0,0 @@
--- m4/gl.m4.old
-+++ m4/gl.m4	2014-12-03 15:41:30.154998588 +1100
-@@ -7,9 +7,9 @@
- AC_REQUIRE([AC_PATH_X])
- AC_REQUIRE([AC_PATH_XTRA])
- 
-AC_ARG_WITH([--with-gl-inc],
-+AC_ARG_WITH([gl-inc],
-     AC_HELP_STRING([--with-gl-inc=DIR],[Directory where GL/gl.h is installed]))
-AC_ARG_WITH([--with-gl-lib],
-+AC_ARG_WITH([gl-lib],
-     AC_HELP_STRING([--with-gl-lib=DIR],[Directory where OpenGL libraries are installed]))
- 
- AC_LANG_SAVE
-@@ -48,16 +48,18 @@
- # -Xlinker is used because libtool is busted prior to 1.6 wrt frameworks
- AC_TRY_LINK([#include <OpenGL/gl.h>], [glBegin(GL_POINTS)],
-     [FRAMEWORK_OPENGL="-Xlinker -framework -Xlinker OpenGL" ; ac_cv_search_glBegin="-Xlinker -framework -Xlinker OpenGL" ; AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
-with_gl_lib="$FRAMEWORK_OPENGL"
-AC_SUBST(FRAMEWORK_OPENGL)
-LIBS="$PRELIBS"
-+if test "x$FRAMEWORK_OPENGL" != "x"; then
-+    with_gl_lib="$FRAMEWORK_OPENGL"
-+    AC_SUBST(FRAMEWORK_OPENGL)
-+    LIBS="$PRELIBS"
-+fi
- 
- AC_MSG_CHECKING([for GL library])
- if test "x$with_gl_lib" != "x" ; then
-     if test -d "$with_gl_lib" ; then
-         LIBS="-L$with_gl_lib -lGL"
-     else
-        LIBS="$with_gl_lib"
-+        LIBS="-l$with_gl_lib"
-     fi
- else
-     LIBS="-lGL"
-@@ -111,6 +113,13 @@
-         AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
-     fi
- fi
-+
-+if test "x$HAVE_GLU" != "xyes" ; then
-+    # Test win32 libraries
-+    LIBS="-lglu32 $GL_LIBS"
-+    AC_LINK_IFELSE([AC_LANG_CALL([], [gluNewTess])], [HAVE_GLU=yes], [HAVE_GLU=no])
-+fi
-+
- if test "x$HAVE_GLU" = xyes ; then
-     AC_MSG_RESULT([yes])
-     GL_LIBS="$LIBS"
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.19 2013/04/27 06:55:20 patrick Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic autotools
-
-MY_PV=${PV/_/-}
-MY_PV2=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-MY_P2=${PN}-${MY_PV2}
-
-DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
-HOMEPAGE="http://ftgl.wiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=media-libs/freetype-2.0.9
-	virtual/opengl
-	virtual/glu
-	media-libs/freeglut"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P2}
-
-DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README TODO docs/projects_using_ftgl.txt"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-ft2_pkgconfig.patch \
-		"${FILESDIR}"/${P}-win32_gl.patch
-
-#	AT_M4DIR=m4 eautoreconf
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	strip-flags # ftgl is sensitive - bug #112820
-	econf \
-		$(use_enable static-libs static) \
-		$(usex amd64-winnt "--with-gl-lib=opengl32" '')
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/usr/share/doc/ftgl
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@ -1,5 +0,0 @@
-DIST glew-1.10.0.tgz 567605 SHA256 99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca WHIRLPOOL 7c931d990b667fc5da79b0b0c11f76693adbd75c730252d5fd1129ff5d54690222a0f0efc0d2abe0535edcde7f72d76bad6de40d02c5a48f0bc4804a248b7d72
-DIST glew-1.11.0.tgz 601430 SHA256 69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6 SHA512 ab7fa5027b069adb7ce2f0ec9dc4e7f30d852e4212c68759873f060e32cc2be04cef66748a7e8696240ed6e3efbf4f0a2aa94640723facf83123c4cc6d955308 WHIRLPOOL 0190203051e8eb5fb887b3a013928072aabf3c418faf9e5bd86ae2d60c7dd788b5694de60ab40fe5a616dcf61e6b8b24fc09a8fef8aa1fb90e42e8b87ab65ee3
-EBUILD glew-1.10.0-r1.ebuild 1956 SHA256 09f25247fc640bf260fd396bbcf5396da8e1d14e1aecec0c677279fcd46446a4 SHA512 f0f646a8ec28d7cbf772792a3c2e9f5b4604968cc0f0186789869e278ce45a4ee1ba23cc9a8d45c9257ce755ca642dafb7ec641e563908afadc66a45cf52f703 WHIRLPOOL 05993aa3ab896590886cf6ce762779f90d0f3830832093478f670a9f5439c693f98ec8c6dc12ffc43c580ee234b219eb40e51b3cf4fce9d0656bcc20d9feb573
-EBUILD glew-1.11.0.ebuild 2316 SHA256 081e639136b0084ea9c8d11b1204cf69d88d8e474e0d3c061f2814357b55e8d0 SHA512 bc627b5da424a02df66e093323fd5024fe960ce69a5a94a895204ffad999100a0b588e60c5875e854406edebbd94fe7d1938f4feebab4b3bc8705974b67ceabd WHIRLPOOL 99d04587b713497959d6b11c708641c089ddc1e122957a4a42d78af0a158979c8349e4676f16cb66d648bde849d65261767f1abb8bc7b6af2c7cd3ba1560aa5e
-MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
--- a/media-libs/glew/glew-1.10.0-r1.ebuild
+++ b/media-libs/glew/glew-1.10.0-r1.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.10.0-r1.ebuild,v 1.1 2013/07/23 23:48:01 radhermit Exp $
-
-EAPI=5
-inherit multilib toolchain-funcs versionator
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc static-libs"
-
-RDEPEND="virtual/glu
-	!x86-winnt? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXmu
-	)"
-DEPEND=${RDEPEND}
-
-pkg_setup() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-
-	[[ ${CHOST} == *-mingw* ]] && myglewopts+=(SYSTEM='mingw')
-}
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-}
-
-src_compile(){
-	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
-}
-
-src_install() {
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc TODO.txt
-	use doc && dohtml doc/*
-}
--- a/media-libs/glew/glew-1.11.0.ebuild
+++ b/media-libs/glew/glew-1.11.0.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.11.0.ebuild,v 1.1 2014/09/26 23:39:58 radhermit Exp $
-
-EAPI=5
-inherit multilib multilib-minimal toolchain-funcs versionator
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris amd64-winnt"
-IUSE="doc static-libs"
-
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	!amd64-winnt? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND=${RDEPEND}
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:-s::' \
-		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
-		-e '/^.PHONY: .*\.pc$/d' \
-		Makefile || die
-
-	if ! use static-libs ; then
-		sed -i \
-			-e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
-			-e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
-			-e '/INSTALL.*LIB.STATIC/d' \
-			Makefile || die
-	fi
-
-	# don't do stupid Solaris specific stuff that won't work in Prefix
-	cp config/Makefile.linux config/Makefile.solaris || die
-	# and let freebsd be built as on linux too
-	cp config/Makefile.linux config/Makefile.freebsd || die
-
-	multilib_copy_sources
-}
-
-set_opts() {
-	myglewopts=(
-		AR="$(tc-getAR)"
-		STRIP=true
-		CC="$(tc-getCC)"
-		LD="$(tc-getCC) ${LDFLAGS}"
-		M_ARCH=""
-		LDFLAGS.EXTRA=""
-		POPT="${CFLAGS}"
-	)
-
-	# support MinGW targets (bug #523444)
-	[[ ${CHOST} == *-mingw* ]] && myglewopts+=( SYSTEM=mingw )
-}
-
-multilib_src_compile() {
-	set_opts
-	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
-}
-
-multilib_src_install() {
-	set_opts
-	emake \
-		GLEW_DEST="${ED}/usr" \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		"${myglewopts[@]}" \
-		install.all
-
-	dodoc TODO.txt
-	use doc && dohtml doc/*
-}
--- a/media-libs/glew/metadata.xml
+++ b/media-libs/glew/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-</pkgmetadata>
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@ -1,9 +0,0 @@
-AUX glfw-2.6-dyn.patch 963 SHA256 bb91028d524ea357407bc91d4b09db0568e237954109f8fa5db2973ec449fbdd SHA512 1716466639351ee89cc69c156708e7ccdabb558caf38273d666c601d4bda0f4592f458b8b3ed70b0d022f176ef422be60304ca5df8ee177eeb28c16267d02c87 WHIRLPOOL 32b0b2ce0718a47356efe5219dda8fade0f7f28d30004be7441eab82e042dcd618c2c00d5b3af22991c4d59bfa64be81da40d9423ba7a85c31326a42f4a1fe04
-AUX glfw-2.6-ldflags.patch 467 SHA256 b484dc94e838d696056d0008fb5e3d40a531a41408b3aa006d8ad955f1b5c67b SHA512 8b1b1e98c01f6d7ff4e0265bf89a431176a285e1b529392ac47327bfb18d6ff674136649b0ae4c981c9287c84ca557c0a9bc997a278aaa008d84a2a7cdc36411 WHIRLPOOL 96c15b29aa9edcbb51c0f03c6c7e55ef0411a6883904e46feb1016074da254459941e6f16a89bd57295d1e1d4b78e0f2cdc330bd3da0be68c4b18cc82874ac7d
-AUX glfw-2.7.7-dyn.patch 1021 SHA256 dc5d666357c996ace5a649fba817f943e9ec2764d7a5b0c78445060da330c868 SHA512 388ea7941dc60fa94e6527e0e6f2d4b027bfe260893b329d5cc5854336a126a4ebb7392b862f0158c08ebc88ef4737b68e2091cbd1706075c04a55e51c28bbfb WHIRLPOOL 91e71a9461b418990b0a8c0478b206157ecba15f2dd89ee715f910eece462f1711648a907d7b9803c3c1311da4343f32ae4ca597464359b659c45beed424d6ec
-AUX glfw-2.7.7-pkgconfig.patch 1144 SHA256 e080c095839dc365d1a54974ea38164d7dacb7371277674619ab102086f67422 SHA512 3083e333e45ffd1cb427be63f37cf896ec629b24904400ba63333f1ab3f9e7664b1c63f60a7b547867bb9f4924e17754851089bffd2de4af00d9eaecbe27883f WHIRLPOOL 171927efed27b78b5293020af843b22484b4fc19b392017dc2bee67a9004336f6eb6ab4408bfaf53ec071057e86b70ae77d3a28d8dda0bb570d57d5b56c85746
-DIST glfw-2.7.7.tar.bz2 927805 SHA256 422e755979524a1da28e4addcae723b7132998ca15e89be41bf34964d9360aa2 SHA512 1b51b9d88c8eed9da8084421949b561a4779410a6369ffdf482c2d8a166bab8c58bbb087ef6f32180d3fe9430988549be5c183b338dd0e1191b2c4b4a7b55379 WHIRLPOOL 646d38fd3ea88e8aa19dcbfa8f8b933adc530ea946cd51c3e03971ed6cdb294dadf5020a876ba298c378896179a4a7ba0129b858fc7f1273a574fe1c2c388a77
-DIST glfw-3.0.4.tar.bz2 424887 SHA256 4f09d70b9e341c8613873cadb51d9e40a67982b5bb919e024783cec7ac09efc0 SHA512 2f80354d4c73d2cfb0014589629d4b204ce731c3528c365c83799f2ff195dda0cb5e200d520c0555f078307d97229551f0f056b8adf1b22643e20dec7a03ec36 WHIRLPOOL 9868f111d447230dc2593c4a662b2afd1d8372491ddc84b2817ade7d47d7aa86d42627a5954424e6db3dc7869eec645df36b140a51b21b581740d19329513a1a
-EBUILD glfw-2.7.7.ebuild 2914 SHA256 0af71ee58e1384aa73af49156c91d0f65c077df5d060e50d13c89952094f11c9 SHA512 a02eeddd8d611b3cf09d001f9c1e0bba83cca01f1ff140b9fe67705622e247fa03fc66dbf562b410cff228304fc5ef162eae899bb6002567c0d255f19ec15551 WHIRLPOOL e0a29e7aeb0fa52c1d6e4988b8ead553c8d5d3dc8d36808fe7d568d418c9937792a2d6ad964382518ddccec1ebdfd8b47c85e3ec3d02e9372b3b8e569b55c667
-EBUILD glfw-3.0.4.ebuild 933 SHA256 673cf67312de294b44226e92561be742dfae834cda7c013f1e2a39f7a7298fda SHA512 94dedafe9a5fe2aecda9e2fdcab729dd144ed28ffc00ad0be0cf5e762ea047dbf2c7affb756c07278eb55d80e58e08c73a60abd4cf5d14149e296d2f2305e9bd WHIRLPOOL f9190d70e8dcabeb3f2765aeb5ff7f05e737c7f8f192e41878226c0b15d2a2b184b6443976aa6f824381d4e71073b2fe8efc940e97708e8e62ad7c245e3e7e14
-MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
--- a/media-libs/glfw/files/glfw-2.6-dyn.patch
+++ b/media-libs/glfw/files/glfw-2.6-dyn.patch
@ -1,22 +0,0 @@
--- lib/x11/Makefile.x11.in.old	2007-11-11 07:56:34.000000000 +0100
-+++ lib/x11/Makefile.x11.in	2007-11-11 08:00:22.000000000 +0100
-@@ -8,7 +8,7 @@
- ##########################################################################
- # Default: Build GLFW static library
- ##########################################################################
-default: libglfw.a libglfw.so
-+default: libglfw.a libglfw.so.2.6
- 
- 
- ##########################################################################
-@@ -104,8 +104,8 @@
- ##########################################################################
- # Rule for building shared library
- ##########################################################################
-libglfw.so: $(SHARED_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
-+libglfw.so.2.6: $(SHARED_OBJS)
-+	$(CC) $(LDFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS) -Wl,-soname=$@
- 
- 
- ##########################################################################
--- a/media-libs/glfw/files/glfw-2.6-ldflags.patch
+++ b/media-libs/glfw/files/glfw-2.6-ldflags.patch
@ -1,21 +0,0 @@
--- compile.sh.old	2010-09-13 13:51:19.000000000 +0200
-+++ compile.sh	2010-09-13 13:51:34.000000000 +0200
-@@ -85,7 +85,7 @@
- case "x`uname 2> /dev/null`" in
- xLinux)
-   CFLAGS="$CFLAGS -Dlinux"
-  LDFLAGS="-shared"
-+  LDFLAGS="${LDFLAGS} -shared"
-   echo " Linux" 1>&6
-   ;;
- xDarwin)
--- compile.sh.old	2010-09-13 13:58:07.000000000 +0200
-+++ compile.sh	2010-09-13 13:58:20.000000000 +0200
-@@ -65,7 +65,6 @@
- 
- CFLAGS=
- LFLAGS=
-LDFLAGS=
- INCS=
- LIBS="-lGL -lX11"
- 
--- a/media-libs/glfw/files/glfw-2.7.7-dyn.patch
+++ b/media-libs/glfw/files/glfw-2.7.7-dyn.patch
@ -1,31 +0,0 @@
--- lib/x11/Makefile.x11.in
-+++ lib/x11/Makefile.x11.in
-@@ -8,7 +8,7 @@
- ##########################################################################
- # Default: Build GLFW static library
- ##########################################################################
-all: libglfw.a libglfw.so
-+all: libglfw.a libglfw.so.2.7.7
- 
- 
- ##########################################################################
-@@ -112,7 +112,7 @@
- ##########################################################################
- # Rule for building shared library
- ##########################################################################
-libglfw.so: $(SHARED_OBJS)
-+libglfw.so.2.7.7: $(SHARED_OBJS)
- 	$(CC) $(SOFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
- 
- 
--- compile.sh
-+++ compile.sh
-@@ -88,7 +88,7 @@
- case "x`uname 2> /dev/null`" in
- xLinux)
-   GLFW_LIB_CFLAGS="$GLFW_LIB_CFLAGS -D_GLFW_USE_LINUX_JOYSTICKS"
-  SOFLAGS="-shared -Wl,-soname,libglfw.so"
-+  SOFLAGS="-shared -Wl,-soname,libglfw.so.2.7.7"
-   echo "Linux" 1>&6
-   ;;
- xDarwin)
--- a/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch
+++ b/media-libs/glfw/files/glfw-2.7.7-pkgconfig.patch
@ -1,37 +0,0 @@
-support libsuffix, fix version
-
--- lib/x11/Makefile.x11.in
-+++ lib/x11/Makefile.x11.in
-@@ -3,6 +3,7 @@
- # Installation prefix (default to /usr/local)
- ##########################################################################
- PREFIX ?= /usr/local
-+LIBDIR ?= lib
- 
- 
- ##########################################################################
-@@ -99,7 +100,7 @@
- # Rule for building libglfw.pc
- ##########################################################################
- libglfw.pc: libglfw.pc.in
-	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
-+	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' -e 's,\@LIBDIR@,$(LIBDIR),' libglfw.pc.in > libglfw.pc
- 
- 
- ##########################################################################
--- compile.sh
-+++ compile.sh
-@@ -734,11 +734,11 @@
- prefix=@PREFIX@
- exec_prefix=\${prefix}
- includedir=\${prefix}/include
-libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/@LIBDIR@
- 
- Name: GLFW
- Description: A portable framework for OpenGL development
-Version: 2.7.4
-+Version: 2.7.7
- URL: http://www.glfw.org/
- Requires.private: gl x11 $PKG_LIBS
- Libs: -L\${libdir} -lglfw $LFLAGS_THREAD $LFLAGS_CLOCK
--- a/media-libs/glfw/glfw-2.7.7.ebuild
+++ b/media-libs/glfw/glfw-2.7.7.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.7.7.ebuild,v 1.2 2013/02/04 20:28:40 mr_bones_ Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="http://glfw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-winnt"
-IUSE="examples static-libs"
-
-DEPEND="!x86-winnt?  (
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	virtual/glu
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" \
-		readme.html || die
-
-	epatch "${FILESDIR}"/${P}-{dyn,pkgconfig}.patch
-
-	# find key paths for our CHOST
-	case ${CHOST} in
-		*-mingw*)
-			# TODO: makefile could be set based on CBUILD
-			libdir="win32"
-			makefile="Makefile.win32.cross-mgw"
-		  	;;
-
-		*)
-			libdir="x11"
-			makefile="Makefile.x11.in"
-	esac
-
-	# respect ldflags
-	sed -i \
-		-e "s/\$(LFLAGS)/\$(LDFLAGS) \$(LFLAGS)/" \
-		{lib/$libdir,examples}/$makefile || die
-
-	# respect cflags in linking command
-	# build system is messing up CFLAGS variable, so sed is the easy way to go
-	sed -i \
-		-e "/^libglfw.so/{n;s/\$(CC)/\$(CC) ${CFLAGS}/;}" \
-		lib/$libdir/$makefile || die
-
-	if use !static-libs ; then
-		sed -i \
-			-e '/^all:/s/libglfw.a//' \
-			lib/$libdir/$makefile || die
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} != *-mingw* ]] && sh ./compile.sh
-}
-
-src_compile() {
-	makefile="${makefile%.in}"
-
-	local env="AR=$(tc-getAR) CC=$(tc-getCC) PREFIX=/usr LIBDIR=$(get_libdir)"
-	if [[ ${CHOST} == *-mingw* ]]; then
-		env="$env TARGET= DLLTOOL=${CHOST}-dlltool"
-	fi
-
-	emake -C lib/$libdir $env -f $makefile all libglfw.pc
-	use examples && emake -C examples CC=$(tc-getCC) -f $makefile all
-}
-
-src_install() {
-	local dynlib
-	if [[ ${CHOST} = *-mingw* ]]; then
-		dynlib="glfw.dll"
-	else
-		dynlib="libglfw.so.2.7.7"
-	fi
-
-	use static-libs && dolib.a lib/$libdir/libglfw.a
-	dolib.so "lib/$libdir/$dynlib"
-	[[ ${CHOST} != *-mingw* ]] && dosym $dynlib /usr/$(get_libdir)/${dynlib%.$PV}
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins lib/$libdir/libglfw.pc
-	doheader -r include/GL
-	dohtml -r readme.html
-	insinto /usr/share/doc/${PF}/pdf
-	doins docs/*.pdf
-	dodoc docs/readme.txt
-
-	if use examples; then
-		local f
-		local MY_EXAMPLES="boing gears listmodes mipmaps
-			mtbench mthello particles pong3d splitview
-			triangle wave"
-		local MY_PICS="mipmaps.tga pong3d_field.tga pong3d_instr.tga
-			pong3d_menu.tga pong3d_title.tga
-			pong3d_winner1.tga pong3d_winner2.tga"
-
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-
-		doins examples/$makefile
-		for f in $MY_EXAMPLES; do
-			doins examples/${f}.c
-		done
-		for f in $MY_PICS; do
-			doins examples/${f}
-		done
-
-		insopts -m0755
-		for f in $MY_EXAMPLES; do
-			doins examples/${f}${exesuffix}
-		done
-	fi
-}
--- a/media-libs/glfw/glfw-3.0.4.ebuild
+++ b/media-libs/glfw/glfw-3.0.4.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-3.0.4.ebuild,v 1.1 2014/08/29 19:52:26 mr_bones_ Exp $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="http://www.glfw.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 amd64-winnt"
-IUSE="egl examples"
-
-RDEPEND="!amd64-winnt? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/glu"
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use egl GLFW_USE_EGL)
-		$(cmake-utils_use examples GLFW_BUILD_EXAMPLES)
-		-DBUILD_SHARED_LIBS=1
-	"
-
-	case $CHOST in
-	"x86_64-w64-mingw32")
-		mycmakeargs = "${mycmakeargs} -DCMAKE_TOOLCHAIN_FILE=CMake/${CHOST}.cmake"
-		;;
-
-	*)
-		;;
-	esac
-
-	cmake-utils_src_configure
-}
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-</pkgmetadata>
--- a/media-libs/opengl-windows/Manifest
+++ b/media-libs/opengl-windows/Manifest
@ -1,2 +0,0 @@
-EBUILD opengl-windows-6.1.ebuild 472 SHA256 dcb4276bfd254734c4b16b59b3373d82f9cf5e076ef6bedc823dc2892e23c687 SHA512 a393f7f17ae9d4e675af23ba1fc6c57572b8b67bc8a46359d1cc6c3ea1b16dbbc3896235f9fcbdb9cfc8407f775dd74d9ba700739feb06aa6d75cbd4232102fc WHIRLPOOL 9dbe3228f941dc407216099eb84f7a18536a33656c3bed2634d3ab395c3132174bb37f657fb4133f0018a632fc905ddb00bdffc6db7d01a2caf41752cfdf5625
-MISC metadata.xml 161 SHA256 eac14dbe95ed36c1455585d4c47b5f4ce921e4d5cc459f2f49c703926f4a91c0 SHA512 997f3c37368ef884169524d7a8123d77255807934e02650823be61ac10db031b553ec3f2f0cb479032468b32d9c196573bffcbc143ae005263d6acd7a5935e36 WHIRLPOOL 4538c8452ca577cc356b6a0cb2d22f8e87b86af9eb3d1da0a4905238e0bad28522fd1eb8843b2ab4817c210bb70efb03df4b06f77586497885c5c3a86f9d2915
--- a/media-libs/opengl-windows/metadata.xml
+++ b/media-libs/opengl-windows/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>prefix</herd>
-</pkgmetadata>
--- a/media-libs/opengl-windows/opengl-windows-6.1.ebuild
+++ b/media-libs/opengl-windows/opengl-windows-6.1.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengl-apple/opengl-apple-5.ebuild,v 1.1 2013/07/20 18:44:01 grobian Exp $
-
-inherit prefix
-
-DESCRIPTION="Meta dependency for Windows OpenGL"
-# homepage and license from mingw64-runtime
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-LICENSE="BSD"
-KEYWORDS="-* ~x86-winnt ~amd64-winnt"
-SLOT=0
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
--- a/virtual/glu/Manifest
+++ b/virtual/glu/Manifest
@ -1,3 +0,0 @@
-EBUILD glu-9.0-r1.ebuild 698 SHA256 d260863a4a928877302840ca9c3ed89f271ea61474d843ec0336277007ca428c SHA512 e53a5fd8240c496f38bbc6cb5e4adb2a2d64aed41178c20418ceffd83ab042ef5d894a2bc47cc6f99cff2baf0ddc2596efb4c5c6a115081ab5ee16e14e2532d4 WHIRLPOOL a8fb7344e9a98fa687fd412ef1578b79b5480aae35c295396f67686a1bed3b8fbe2c0ec85ad252c8958d171681945433641f3e9795780c52f456c75bd0a5fcd5
-EBUILD glu-9.0.ebuild 625 SHA256 c084d1eae8d7f6704e31584aa7971d33af5b33d61bd0e9ff65d9a1c15c260226 SHA512 2b66bbc0eafb73fd37301e148c3e5ba46beca37572a39a9e29cf84dbed60e051d0ff41c5fae66bd68940c2c205418eb6f97d62b4fa9d09acd4cafbaa480f7709 WHIRLPOOL a263d8d8dc854ed563130a9e4a475cb3ed3819b7380fd217572d331ddaeaa9628493175f6e3ae129e3885f3a2a6c8ccae718a4b196843de97ea1bdab7c77eed9
-MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
--- a/virtual/glu/glu-9.0-r1.ebuild
+++ b/virtual/glu/glu-9.0-r1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0-r1.ebuild,v 1.12 2014/06/18 20:54:58 mgorny Exp $
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for OpenGL utility library"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-winnt"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}]
-		media-libs/opengl-apple
-		media-libs/opengl-windows
-	)"
-DEPEND=""
--- a/virtual/glu/glu-9.0.ebuild
+++ b/virtual/glu/glu-9.0.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.12 2013/03/03 11:51:43 vapier Exp $
-
-DESCRIPTION="Virtual for OpenGL utility library"
-HOMEPAGE=""
-SRC_URI=""
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="|| ( media-libs/glu <media-libs/mesa-9 media-libs/opengl-apple media-libs/opengl-windows )"
-DEPEND=""
--- a/virtual/glu/metadata.xml
+++ b/virtual/glu/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
--- a/virtual/opengl/Manifest
+++ b/virtual/opengl/Manifest
@ -1,3 +0,0 @@
-EBUILD opengl-7.0-r1.ebuild 688 SHA256 f63ce78aca8ebb7d1a1592c7f18fb1952a856c6360e844f0be224b33829a789c SHA512 c8951eb29563a20495331f590522b149afb0055d132bd66bfee21cb6a365073d9e447d57d0af11503552c950144a3f1fdf98c06f9fb4b109008275d5d86c8946 WHIRLPOOL f42623334243fdc3600c46769eabec134bdda8448c3fc560cd003af84cf9797a4e6b50f383f65dd8113f202ace024f4c81528588a04554dad370fbfba815275b
-EBUILD opengl-7.0.ebuild 599 SHA256 43a96a471f8fd52b2bf1ff18f67e755383001ea492481dd045da1bfe27de1124 SHA512 318e78cec09a9c62eb38a5ba817940d99d57b9f2032fcb53e958aa3038862e446794e570392a74e2dbd4402a1a2e94c7ad0cc22eb4c84dc972d1d9604888dcc5 WHIRLPOOL df0b4b78c99f8d7eda3647fea5cf133f2753f6cbefcd0848f49cdc896e95d91f4301c73fa7de068dd5fa03b3393ea8f68972124801a79bc6d2caf6b09a8ccced
-MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
--- a/virtual/opengl/metadata.xml
+++ b/virtual/opengl/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
--- a/virtual/opengl/opengl-7.0-r1.ebuild
+++ b/virtual/opengl/opengl-7.0-r1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/opengl/opengl-7.0-r1.ebuild,v 1.12 2014/06/18 20:57:27 mgorny Exp $
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual for OpenGL implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-winnt"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
-		media-libs/opengl-apple
-		media-libs/opengl-windows
-	)"
-DEPEND=""
--- a/virtual/opengl/opengl-7.0.ebuild
+++ b/virtual/opengl/opengl-7.0.ebuild
@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/opengl/opengl-7.0.ebuild,v 1.16 2013/03/03 10:13:32 vapier Exp $
-
-DESCRIPTION="Virtual for OpenGL implementation"
-HOMEPAGE=""
-SRC_URI=""
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="|| ( media-libs/mesa media-libs/opengl-apple media-libs/opengl-windows )"
-DEPEND=""
--- a/www-apps/piwik/Manifest
+++ b/www-apps/piwik/Manifest
@ -1,5 +0,0 @@
-DIST piwik-1.12.tar.gz 6822406 SHA256 b008dd452541af8051cdcf262a333937ba5c86af34e070932d378d256f03fba2 SHA512 a486078bb0e2a5b8069a83e0cd855d4a19ad161e383deac99b85884a2b1f7495650b0226077210505cc413426e8c2386e49b4542d3e9d866168abc018e5adab4 WHIRLPOOL afb33951c752cb40f7a21e48e79d815d370e5efdf2bb883ad2ae5ee1156306f2149445f5ba646f52926d473ead412a92168a5716d57f82752ea4cd0a7c4f5a31
-DIST piwik-2.0.tar.gz 7249723 SHA256 22d9d49dd2a8e6ae7070e262aa1a6ac974d1333e740f70014614dda21abef958 SHA512 f9e6dd7e76751a825509d158271929f6fbabccd0d4f05ee8dba7c3a2c9043872d128dc7f67b2028d475d7f964fd165884cbcdbeb7a3f527520c93cb6e9701e75 WHIRLPOOL 3771ac720b2c44fa1c2241c6f0ec746971d06cd78e829e88989b5d68a8e6853e3aad058ca8555b69e99cb361fb5f28fda99b6dc8e4555a6d6305e956512a84b8
-EBUILD piwik-1.12.ebuild 1153 SHA256 2670a04a14f4bab32454c101855f66d64cf5e7c209511f5b1927c7c8f47eaf64 SHA512 ec9a541827eed77f6e68b7c8209d270c2b13a590db53d49ee5445ca0d504dbb9fca5af3cf09cab01632a4f2180951b1237742ee3a560e3047a224c20d14a0786 WHIRLPOOL 9d980e85aa2576be36d1e17316ddd77b934021bfac252837b6b63033fe4a9964a119f93480c5cfac2c34f1621e761e8c1d11465b340e3032cfd65fac4e1046b9
-EBUILD piwik-2.0.ebuild 1153 SHA256 2670a04a14f4bab32454c101855f66d64cf5e7c209511f5b1927c7c8f47eaf64 SHA512 ec9a541827eed77f6e68b7c8209d270c2b13a590db53d49ee5445ca0d504dbb9fca5af3cf09cab01632a4f2180951b1237742ee3a560e3047a224c20d14a0786 WHIRLPOOL 9d980e85aa2576be36d1e17316ddd77b934021bfac252837b6b63033fe4a9964a119f93480c5cfac2c34f1621e761e8c1d11465b340e3032cfd65fac4e1046b9
-MISC metadata.xml 162 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 SHA512 550d0f517601255e5c9b120a03f1dad37a1a75bdaadad486ddbd2380a7f0dd884970400574455d34d3ba6e800d9fd21467dfb7f89ba27a0aa8a65e7a265534e3 WHIRLPOOL d50adcb067d0290aa7dfe5aebd0e8abf4939ece7afbf284920d08f2bf04f9306f0062a78cacb7572a12735ac41545440fcf138beda81cc53774950bdde495dcb
--- a/www-apps/piwik/metadata.xml
+++ b/www-apps/piwik/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>web-apps</herd>
-</pkgmetadata>
--- a/www-apps/piwik/piwik-1.12.ebuild
+++ b/www-apps/piwik/piwik-1.12.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit webapp depend.php
-
-DESCRIPTION="Piwik is a downloadable, open source (GPL licensed) real time web analytics software program."
-HOMEPAGE="http://www.piwik.org/"
-SRC_URI="http://builds.piwik.org/piwik-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="gd geoip"
-
-DEPEND=""
-RDEPEND="dev-lang/php[pdo,ctype,xml] || ( <dev-lang/php-5.3[spl,reflection] >=dev-lang/php-5.3 )
-		 dev-lang/php[iconv,zlib]
-		 gd? ( dev-lang/php[gd] )
-		 geoip? ( dev-php/pecl-geoip )"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	dodir "${MY_HTDOCSDIR}/"{tmp,config}
-	doins -r piwik/*
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}/"{tmp,config}
-	webapp_configfile "${MY_HTDOCSDIR}/config/"{global.ini.php,manifest.inc.php}
-	webapp_src_install
-	fperms -R 0660 "${MY_HTDOCSDIR}/"{tmp,config}
-}
-
-pkg_postinst() {
-	elog "Install and upgrade instructions can be found here:"
-	elog "  http://piwik.org/docs/installation-optimization/"
-	webapp_pkg_postinst
-}
--- a/www-apps/piwik/piwik-2.0.ebuild
+++ b/www-apps/piwik/piwik-2.0.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit webapp depend.php
-
-DESCRIPTION="Piwik is a downloadable, open source (GPL licensed) real time web analytics software program."
-HOMEPAGE="http://www.piwik.org/"
-SRC_URI="http://builds.piwik.org/piwik-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="gd geoip"
-
-DEPEND=""
-RDEPEND="dev-lang/php[pdo,ctype,xml] || ( <dev-lang/php-5.3[spl,reflection] >=dev-lang/php-5.3 )
-		 dev-lang/php[iconv,zlib]
-		 gd? ( dev-lang/php[gd] )
-		 geoip? ( dev-php/pecl-geoip )"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	dodir "${MY_HTDOCSDIR}/"{tmp,config}
-	doins -r piwik/*
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}/"{tmp,config}
-	webapp_configfile "${MY_HTDOCSDIR}/config/"{global.ini.php,manifest.inc.php}
-	webapp_src_install
-	fperms -R 0660 "${MY_HTDOCSDIR}/"{tmp,config}
-}
-
-pkg_postinst() {
-	elog "Install and upgrade instructions can be found here:"
-	elog "  http://piwik.org/docs/installation-optimization/"
-	webapp_pkg_postinst
-}
--- a/www-misc/fcgiwrap/ChangeLog
+++ b/www-misc/fcgiwrap/ChangeLog
@ -1,51 +0,0 @@
-# ChangeLog for www-misc/fcgiwrap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/fcgiwrap/ChangeLog,v 1.11 2012/07/25 15:10:21 darkside Exp $
-
-  25 Jul 2012; Jeremy Olexa <darkside@gentoo.org> -fcgiwrap-1.0.3.ebuild,
-  fcgiwrap-1.0.3-r1.ebuild, fcgiwrap-9999.ebuild:
-  Fix fetch failure, cannot do a SRC_URI arrow from mirror://gentoo. Remove old
-  version
-
-  16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  fcgiwrap-1.0.3-r1.ebuild:
-  x86 stable wrt bug #400525
-
-  10 Feb 2012; Agostino Sarubbo <ago@gentoo.org> fcgiwrap-1.0.3-r1.ebuild:
-  Stable for amd64, wrt bug #400525
-
-  04 Oct 2011; Andreas Schuerch <nativemad@gentoo.org> fcgiwrap-1.0.3.ebuild:
-  x86 stable, bug 384475
-
-*fcgiwrap-1.0.3-r1 (01 Oct 2011)
-
-  01 Oct 2011; Peter Volkov <pva@gentoo.org> -fcgiwrap-1.0.2-r1.ebuild,
-  +fcgiwrap-1.0.3-r1.ebuild, fcgiwrap-9999.ebuild:
-  Bump EAPI, use emake in src_install, bug #385081 thank Nikoli for this job.
-
-  30 Sep 2011; Steve Dibb <beandog@gentoo.org> fcgiwrap-1.0.3.ebuild:
-  amd64 stable, bug 384475
-
-  21 Sep 2011; Michał Górny <mgorny@gentoo.org> fcgiwrap-9999.ebuild:
-  Migrate to git-2.
-
-  15 Sep 2010; Peter Volkov <pva@gentoo.org> fcgiwrap-1.0.3.ebuild:
-  Use gentoo mirrors for sources as upstream link disappears with time.
-
-*fcgiwrap-1.0.3 (15 Sep 2010)
-
-  15 Sep 2010; Peter Volkov <pva@gentoo.org> +fcgiwrap-1.0.3.ebuild:
-  Version bump, respect LDFLAGS, #336810 thank Diego E. 'Flameeyes' Pettenò
-  for report and Nikoli for the job.
-
-  13 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
-  metadata.xml:
-  Fix herd tag in metadata.xml
-
-*fcgiwrap-9999 (29 Jun 2010)
-*fcgiwrap-1.0.2-r1 (29 Jun 2010)
-
-  29 Jun 2010; Peter Volkov <pva@gentoo.org> +fcgiwrap-1.0.2-r1.ebuild,
-  +fcgiwrap-9999.ebuild, +metadata.xml:
-  Initial import, bug #325413, thank Nikoli for this job.
-
--- a/www-misc/fcgiwrap/Manifest
+++ b/www-misc/fcgiwrap/Manifest
@ -1,4 +0,0 @@
-DIST fcgiwrap-1.0.3.tar.gz 8846 SHA256 26578d698f006f6aecc83fa9608aa0fd04dd586dab75324114ff9b5d87869e66 SHA512 795e8849f57864877933bab63b23e3dc19f71780dd696484c4f9e39cf4b9362f7c0f923fce808fd7ee1aabed989eca40ed7031732c5e369cf731ab380a2a0195 WHIRLPOOL 1705ae8b17d19140d54114eef6ba211ecc45c9c9ef2109139c4e31107d761082f76f98f6b9233b5b4d01261f2433060afb99040afa500d981c8570f418dd6992
-EBUILD fcgiwrap-1.0.3-r2.ebuild 1065 SHA256 580ec4341044a431135aaf7e1be332c1bb73579e7547e6e5e416b1de536dc17a SHA512 1a964f65549e1956c7a9b10f5cbf0b625f571e2ab945188149f3ef827e3004eb3fc3cf348838afc2f0d97861086ca75fc8dad6c0c7b61941afa2efd5a32150b4 WHIRLPOOL 0aa7f14fddf1b304a053cbeceb5c84de15e18031facb4050b361575ad5623757e802f5d9745b9ab749ce9667a0a50c0c2e868c40d3215ee562970e7864603b73
-MISC ChangeLog 1886 SHA256 28c08f3da0c1b6a60456b6eef5ef14467d8cb90348189fbe1e06774e46ecc137 SHA512 dde394f093814c4762062bcb32352af874d569cf4e19f4d50b90d7011f7ecce3aa3a63c2cac05e3da61dd606b6302a104b17ce74a9c574d9f232e0c469a55e3b WHIRLPOOL d86469b24adf0b9d3b01815f86daa51a16c2ca85e3527abee4822f2d8e3615e62625c8fed731b3b184b2ff569f10910b12f32433df888b0b983f15050f454d6a
-MISC metadata.xml 518 SHA256 e9a7881014ae1016b582277c0f020e4af2edacf665ea595746a8ef38ae88e860 SHA512 9de74058bb68b29e076ae50f35854e1a861c66dedd55f0db28761ed5e48ec7b62b97b4b0539c014bfaa33422d58afae89ea446eb411e4e52a98306c3314d8343 WHIRLPOOL da54cb56134f9025b73ff8035899049b574cc1e09145e2beb408c10d14017ff3b7f541b0ba37cb20ac88a512352b5db807bf8d16b42b409679ab175dc7a1d739
--- a/www-misc/fcgiwrap/fcgiwrap-1.0.3-r2.ebuild
+++ b/www-misc/fcgiwrap/fcgiwrap-1.0.3-r2.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/fcgiwrap/fcgiwrap-1.0.3-r1.ebuild,v 1.4 2012/07/25 15:10:21 darkside Exp $
-
-EAPI="4"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS=""
-inherit autotools ${VCS_ECLASS}
-
-DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
-HOMEPAGE="http://nginx.localdomain.pl/wiki/FcgiWrap"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/gnosek/${PN}.git"
-
-	KEYWORDS=""
-else
-	MY_REV="58ec209"
-	#SRC_URI="http://download.github.com/gnosek-${P}-4-g${MY_REV}.tar.gz"
-	SRC_URI="mirror://gentoo/${P}.tar.gz"
-	S="${WORKDIR}/gnosek-${PN}-${MY_REV}"
-
-	KEYWORDS="amd64 x86"
-fi
-
-DEPEND="dev-libs/fcgi"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.rst )
-
-src_prepare() {
-	sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
-		-i Makefile.in || die "sed failed"
-
-	eautoreconf
-}
-
-pkg_postinst() {
-	einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
-}
--- a/www-misc/fcgiwrap/metadata.xml
+++ b/www-misc/fcgiwrap/metadata.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
-<maintainer>
-	<email>nikoli@lavabit.com</email>
-	<name>Nikoli</name>
-</maintainer>
-<longdescription lang="en">
-	fcgiwrap is a simple server for running CGI applications over FastCGI. It
-	hopes to provide clean CGI support to Nginx (and other web servers that may
-	need it). 
-</longdescription>
-</pkgmetadata>