';
-+ const HTML_SEARCH_SEPARATOR = '
';
-+ const HTML_SEARCH_SUMMARY_START = '
';
-+ const HTML_SEARCH_SUMMARY_END = '
';
- // replace all spaces for "+"
- keyWord = strReplace(keyWord, " ", "+");
- // init search results object
-@@ -110,7 +188,7 @@
- var http = new Http();
- var html = http.downloadWebpage(strFormat(URL_SEARCH, keyWord, pageIndex, searchResults.getUserLanguage()));
- // get the search summary
-- var summary = copyBetween(html, '
', '
');
-+ var summary = copyBetween(html, HTML_SEARCH_SUMMARY_START, HTML_SEARCH_SUMMARY_END);
- searchResults.setSummary(cleanSummary(summary));
- // get results html block
- var htmlResults = copyBetween(html, HTML_SEARCH_START, HTML_SEARCH_FINISH);
-@@ -148,14 +226,17 @@
- var tmp, videoUrl, imageUrl, title, description, duration, rating;
- // get video url
- videoUrl = VIDEO_URL + copyBetween(html, 'href="', '"');
-- // get title and image url
-+ // get image url
- tmp = copyBetween(html, '
') ;
-- title = copyBetween(tmp, 'title="', '"');
- imageUrl = copyBetween(tmp, 'src="', '"');
- if (strIndexOf(imageUrl, "default.jpg") == -1) // if is not a "default.jpg"...
- imageUrl = copyBetween(tmp, 'thumb="', '"');
-+ imageUrl = "http:" + imageUrl;
-+ // get video title
-+ title = copyBetween(html, 'dir="ltr" title="', '"');
- // get video description
-- description = copyBetween(html, 'class="video-description">', '
');
-+ description = copyBetween(html, '
', ''));
- // get rating
diff --git a/media-video/xvideoservicethief/metadata.xml b/media-video/xvideoservicethief/metadata.xml
deleted file mode 100644
index d5044b7a4cef..000000000000
--- a/media-video/xvideoservicethief/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- hwoarang@gentoo.org
- Markos Chandras
-
-
- media-video@gentoo.org
- Gentoo Video project
-
-
- xviservicethief
-
-
diff --git a/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild b/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild
deleted file mode 100644
index c153bc9c62d1..000000000000
--- a/media-video/xvideoservicethief/xvideoservicethief-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-LANGS="br ca cs da de es fr gl hu it ja ko nl pl ro ru sv"
-
-inherit eutils qt4-r2 versionator
-
-MY_PV=$(replace_all_version_separators '_')
-MY_P="xVST_${MY_PV}_src"
-
-DESCRIPTION="Download (and convert) videos from various Web Video Services"
-HOMEPAGE="http://xviservicethief.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xviservicethief/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc"
-
-DEPEND="app-arch/unzip
- >=dev-qt/qtgui-4.5.3:4
- >=dev-qt/qtwebkit-4.5.3:4
- doc? ( app-doc/doxygen )"
-RDEPEND=">=dev-qt/qtgui-4.5.3:4
- virtual/ffmpeg
- media-video/flvstreamer"
-
-RES_NAME="xVST"
-
-S="${WORKDIR}"
-
-src_prepare() {
- # fix translations
- mv "${S}"/resources/translations/${RES_NAME}_cz.ts \
- "${S}"/resources/translations/${RES_NAME}_cs.ts ||die
- mv "${S}"/resources/translations/${RES_NAME}_jp.ts \
- "${S}"/resources/translations/${RES_NAME}_ja.ts || die
- mv "${S}"/resources/translations/${RES_NAME}_du.ts \
- "${S}"/resources/translations/${RES_NAME}_nl.ts || die
- mv "${S}"/resources/translations/${RES_NAME}_kr.ts \
- "${S}"/resources/translations/${RES_NAME}_ko.ts || die
- # fix plugins, language path
- sed -i -e "s/getApplicationPath()\ +\ \"/\"\/usr\/share\/${PN}/g" \
- "${S}"/src/options.cpp || die "failed to fix paths"
- epatch "${FILESDIR}"/${P}-youtube-api.patch
- # bug 427066
- epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_compile() {
- local lang=
- emake || die "emake failed"
- for lang in "${S}"/resources/translations/*.ts; do
- lrelease ${lang}
- done
-}
-
-src_install() {
- dobin bin/xvst || die "dobin failed"
- local dest=/usr/share/${PN}/plugins
- dodir ${dest}
- find resources/services -name '*.js' -exec cp -dpR {} "${D}"${dest} \;
- newicon resources/images/InformationLogo.png xvst.png
- make_desktop_entry /usr/bin/xvst xVideoServiceThief xvst 'Qt;AudioVideo;Video'
- if use doc; then
- cd "${S}/documentation/source"
- sed -i "/OUTPUT_DIRECTORY/s:G\:.*:docs:" Doxyfile
- doxygen Doxyfile
- dohtml -r docs/html/* || die "dohtml failed"
- fi
-
- #install translations
- insinto /usr/share/${PN}/languages/
- local lang= tlang=
- for lang in ${LINGUAS}; do
- for tlang in ${LANGS}; do
- [[ ${lang} == ${tlang} ]] && doins "${S}"/resources/translations/xVST_${tlang}.qm
- done
- done
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 16ff45c89bf3..8b462d2c0214 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2016 06:40:41 +0000
+Sat, 01 Oct 2016 13:40:38 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 16ff45c89bf3..8b462d2c0214 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2016 06:40:41 +0000
+Sat, 01 Oct 2016 13:40:38 +0000
diff --git a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1 b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
deleted file mode 100644
index 0440edb4dc35..000000000000
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=sys-apps/sed >=virtual/jdk-1.5 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=389 Server Management Console (jar and help files)
-EAPI=5
-HOMEPAGE=http://port389.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-PDEPEND=net-nds/389-admin
-RDEPEND=|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.1
-SRC_URI=http://directory.fedoraproject.org/sources/389-admin-console-1.1.8.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=edad47bcf1a9ae35fbcc2d7b4b3d554c
diff --git a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1 b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
deleted file mode 100644
index 88132ca053d8..000000000000
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=sys-apps/sed >=virtual/jdk-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java based remote management console used for Managing 389-admin 389-ds
-EAPI=5
-HOMEPAGE=http://port389.org/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=http://directory.fedoraproject.org/sources/389-ds-console-1.2.6.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=40a800d981de104b50b90bb65c1a2b92
diff --git a/metadata/md5-cache/app-admin/logrotate-3.10.0 b/metadata/md5-cache/app-admin/logrotate-3.10.0
index f18cb714a113..cd8e4beecd74 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.10.0
+++ b/metadata/md5-cache/app-admin/logrotate-3.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Rotates, compresses, and mails system logs
EAPI=6
HOMEPAGE=https://github.com/logrotate/logrotate
IUSE=acl +cron selinux
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )
SLOT=0
SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.10.0/logrotate-3.10.0.tar.gz -> logrotate-3.10.0.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=edc90b1bc94e4bb6caed3bca5797ca4a
+_md5_=e6026656cc6473b01e4cd22a66422bb8
diff --git a/metadata/md5-cache/app-admin/logstash-forwarder-0.4.0-r1 b/metadata/md5-cache/app-admin/logstash-forwarder-0.4.0-r1
deleted file mode 100644
index 036f8ae5ba5f..000000000000
--- a/metadata/md5-cache/app-admin/logstash-forwarder-0.4.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=dev-lang/go:=
-DESCRIPTION=Collects logs locally in preparation for processing elsewhere
-EAPI=5
-HOMEPAGE=https://github.com/elastic/logstash-forwarder
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/elastic/logstash-forwarder/archive/v0.4.0.tar.gz -> logstash-forwarder-0.4.0.tar.gz
-_eclasses_=user 80aaa71614ced86f02ee1a513821dc87
-_md5_=1dd656246f7c7f456b9d9df8dd3f0d99
diff --git a/metadata/md5-cache/app-admin/sysstat-11.4.0 b/metadata/md5-cache/app-admin/sysstat-11.4.0
index bee899974b50..7e9a38842dca 100644
--- a/metadata/md5-cache/app-admin/sysstat-11.4.0
+++ b/metadata/md5-cache/app-admin/sysstat-11.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=System performance tools for Linux
EAPI=5
HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
IUSE=debug isag nls lm_sensors selinux static
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2
RDEPEND=isag? ( dev-lang/tk:0 dev-vcs/rcs sci-visualization/gnuplot ) nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
SLOT=0
SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.4.0.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=982efee76d41b215d2551afdc61982d4
+_md5_=3209ffddfc3b1197db4a0eaf989a8150
diff --git a/metadata/md5-cache/app-arch/alien-8.95 b/metadata/md5-cache/app-arch/alien-8.95
index 335e56ce894f..3a5f56b67cd2 100644
--- a/metadata/md5-cache/app-arch/alien-8.95
+++ b/metadata/md5-cache/app-arch/alien-8.95
@@ -4,10 +4,10 @@ DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file
EAPI=5
HOMEPAGE=http://kitenet.net/programs/alien
IUSE=+bzip2
-KEYWORDS=alpha amd64 ~hppa ppc ppc64 ~x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 ~x86
LICENSE=LGPL-2.1
RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce toolchain-funcs 6198c04daba0e1307bd844df7d37f423 unpacker 45d07319df5f40ee6af58418b0f930be
-_md5_=3f00cdc49e853a66642655a71959c1be
+_md5_=83273494234186b8b0f41b12f9c1a9ff
diff --git a/metadata/md5-cache/app-arch/threadzip-1.2-r1 b/metadata/md5-cache/app-arch/threadzip-1.2-r1
deleted file mode 100644
index 8f402ee2fdbb..000000000000
--- a/metadata/md5-cache/app-arch/threadzip-1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=threaded compressor logic for zlib/lzma
-EAPI=5
-HOMEPAGE=https://code.google.com/p/threadzip/
-IUSE=lzma python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=lzma? ( dev-python/pylzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
-SLOT=0
-SRC_URI=https://threadzip.googlecode.com/files/threadzip-1.2.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=abfaa2eedcbcd1faca44e3b910045331
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20150119 b/metadata/md5-cache/app-benchmarks/ltp-20150119
deleted file mode 100644
index 53c04ee42bea..000000000000
--- a/metadata/md5-cache/app-benchmarks/ltp-20150119
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A testsuite for the linux kernel
-EAPI=5
-HOMEPAGE=http://linux-test-project.github.io/
-IUSE=expect perl pm open-posix python rt
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linux-test-project/ltp/archive/20150119.tar.gz -> ltp-20150119.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=d032a5fe3c6fa875a8fa1a52b45560a8
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20150420 b/metadata/md5-cache/app-benchmarks/ltp-20150420
deleted file mode 100644
index bcbe21df4d62..000000000000
--- a/metadata/md5-cache/app-benchmarks/ltp-20150420
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A testsuite for the linux kernel
-EAPI=5
-HOMEPAGE=http://linux-test-project.github.io/
-IUSE=expect perl pm open-posix python rt
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linux-test-project/ltp/archive/20150420.tar.gz -> ltp-20150420.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=2e81ff8f2659307700ccfbf0d8b3cf5e
diff --git a/metadata/md5-cache/app-benchmarks/ltp-20150903 b/metadata/md5-cache/app-benchmarks/ltp-20150903
deleted file mode 100644
index 5fda0f63a472..000000000000
--- a/metadata/md5-cache/app-benchmarks/ltp-20150903
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=expect? ( dev-tcltk/expect ) perl? ( dev-lang/perl ) python? ( dev-lang/python ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A testsuite for the linux kernel
-EAPI=5
-HOMEPAGE=http://linux-test-project.github.io/
-IUSE=expect perl pm open-posix python rt
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/linux-test-project/ltp/archive/20150903.tar.gz -> ltp-20150903.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=913f3bb79229f8fc74d32ae2e33f43c5
diff --git a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.4 b/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.4
deleted file mode 100644
index df99ff90babe..000000000000
--- a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=The comprehensive, cross-platform testing and benchmark suite
-EAPI=5
-HOMEPAGE=http://www.phoronix-test-suite.com
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
-SLOT=0
-SRC_URI=http://www.phoronix-test-suite.com/download.php?file=phoronix-test-suite-4.8.4 -> phoronix-test-suite-4.8.4.tar.gz
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=1037c0dd5fcfbeae53891958899eb7f6
diff --git a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.5 b/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.5
deleted file mode 100644
index 448f964da939..000000000000
--- a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-4.8.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Phoronix's comprehensive, cross-platform testing and benchmark suite
-EAPI=4
-HOMEPAGE=http://www.phoronix-test-suite.com
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
-SLOT=0
-SRC_URI=http://www.phoronix-test-suite.com/download.php?file=phoronix-test-suite-4.8.5 -> phoronix-test-suite-4.8.5.tar.gz
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=fbae583c2adc0f88ded097a3b33a5d01
diff --git a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-6.2.1 b/metadata/md5-cache/app-benchmarks/phoronix-test-suite-6.2.1
deleted file mode 100644
index ead7ce4b5981..000000000000
--- a/metadata/md5-cache/app-benchmarks/phoronix-test-suite-6.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Phoronix's comprehensive, cross-platform testing and benchmark suite
-EAPI=4
-HOMEPAGE=http://www.phoronix-test-suite.com
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php[cli,curl,gd,json,posix,pcntl,truetype,zip]
-SLOT=0
-SRC_URI=http://www.phoronix-test-suite.com/download.php?file=phoronix-test-suite-6.2.1 -> phoronix-test-suite-6.2.1.tar.gz
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=05f34bee6dae8f4ec950e00c3fd3f1ec
diff --git a/metadata/md5-cache/app-benchmarks/piozone-1.0-r3 b/metadata/md5-cache/app-benchmarks/piozone-1.0-r3
deleted file mode 100644
index c0dfbad6754e..000000000000
--- a/metadata/md5-cache/app-benchmarks/piozone-1.0-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A hard-disk benchmarking tool
-EAPI=2
-HOMEPAGE=http://www.lysator.liu.se/~pen/piozone/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=4da79f39d7d9b590e720dc07b34f1672
diff --git a/metadata/md5-cache/app-cdr/gnomebaker-0.6.4-r1 b/metadata/md5-cache/app-cdr/gnomebaker-0.6.4-r1
deleted file mode 100644
index 060458a85391..000000000000
--- a/metadata/md5-cache/app-cdr/gnomebaker-0.6.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-cdr/cdrdao dev-libs/libxml2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 >=media-libs/gstreamer-0.10:0.10 virtual/cdrtools x11-libs/cairo x11-libs/gtk+:2 dvdr? ( app-cdr/dvd+rw-tools ) libnotify? ( x11-libs/libnotify ) app-text/rarian dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GnomeBaker is a GTK2/Gnome cd burning application
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/gnomebaker
-IUSE=dvdr flac libnotify mp3 vorbis
-KEYWORDS=amd64 ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-cdr/cdrdao dev-libs/libxml2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 >=media-libs/gstreamer-0.10:0.10 virtual/cdrtools x11-libs/cairo x11-libs/gtk+:2 dvdr? ( app-cdr/dvd+rw-tools ) libnotify? ( x11-libs/libnotify ) >=media-libs/gst-plugins-good-0.10:0.10 flac? ( >=media-plugins/gst-plugins-flac-0.10:0.10 ) mp3? ( >=media-plugins/gst-plugins-mad-0.10:0.10 ) vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10:0.10 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnomebaker/gnomebaker-0.6.4.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9a2caf8e0b90e392702600c35a60ade4
diff --git a/metadata/md5-cache/app-cdr/mybashburn-1.0.2 b/metadata/md5-cache/app-cdr/mybashburn-1.0.2
deleted file mode 100644
index 56e1b5b15209..000000000000
--- a/metadata/md5-cache/app-cdr/mybashburn-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Command-line burning interface of data and music CDs and DVDs
-EAPI=0
-HOMEPAGE=http://mybashburn.sourceforge.net/
-IUSE=dvdr flac mp3 normalize vorbis
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-util/dialog app-cdr/cdrdao app-cdr/cdrkit virtual/eject dvdr? ( app-cdr/dvd+rw-tools ) mp3? ( media-sound/lame media-sound/mpg123 ) flac? ( media-libs/flac ) vorbis? ( media-sound/vorbis-tools ) normalize? ( media-sound/normalize )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/mybashburn/mybashburn-1.0.2.tar.bz2
-_md5_=51c0f5a6baa07b61d17aa8ac63853e0f
diff --git a/metadata/md5-cache/app-dicts/myspell-es-0.6 b/metadata/md5-cache/app-dicts/myspell-es-0.6
deleted file mode 100644
index 56b08eb907bc..000000000000
--- a/metadata/md5-cache/app-dicts/myspell-es-0.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Spanish dictionaries for myspell/hunspell
-EAPI=4
-HOMEPAGE=http://rla-es.forja.rediris.es/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-3 LGPL-3 MPL-1.1
-SLOT=0
-SRC_URI=http://forja.rediris.es/frs/download.php/2618/es_ANY.oxt -> es_ANY-0.6.oxt http://forja.rediris.es/frs/download.php/2619/es_AR.oxt -> es_AR-0.6.oxt http://forja.rediris.es/frs/download.php/2620/es_BO.oxt -> es_BO-0.6.oxt http://forja.rediris.es/frs/download.php/2621/es_CL.oxt -> es_CL-0.6.oxt http://forja.rediris.es/frs/download.php/2622/es_CO.oxt -> es_CO-0.6.oxt http://forja.rediris.es/frs/download.php/2623/es_CR.oxt -> es_CR-0.6.oxt http://forja.rediris.es/frs/download.php/2624/es_CU.oxt -> es_CU-0.6.oxt http://forja.rediris.es/frs/download.php/2625/es_DO.oxt -> es_DO-0.6.oxt http://forja.rediris.es/frs/download.php/2626/es_EC.oxt -> es_EC-0.6.oxt http://forja.rediris.es/frs/download.php/2627/es_ES.oxt -> es_ES-0.6.oxt http://forja.rediris.es/frs/download.php/2628/es_GT.oxt -> es_GT-0.6.oxt http://forja.rediris.es/frs/download.php/2629/es_HN.oxt -> es_HN-0.6.oxt http://forja.rediris.es/frs/download.php/2630/es_MX.oxt -> es_MX-0.6.oxt http://forja.rediris.es/frs/download.php/2631/es_NI.oxt -> es_NI-0.6.oxt http://forja.rediris.es/frs/download.php/2632/es_PA.oxt -> es_PA-0.6.oxt http://forja.rediris.es/frs/download.php/2633/es_PE.oxt -> es_PE-0.6.oxt http://forja.rediris.es/frs/download.php/2634/es_PR.oxt -> es_PR-0.6.oxt http://forja.rediris.es/frs/download.php/2635/es_SV.oxt -> es_SV-0.6.oxt http://forja.rediris.es/frs/download.php/2636/es_UY.oxt -> es_UY-0.6.oxt http://forja.rediris.es/frs/download.php/2637/es_VE.oxt -> es_VE-0.6.oxt
-_eclasses_=myspell-r2 d7e8733370dd6a9a1a3b64fdda0146d2
-_md5_=e07c9b9c1ee15897e9f32d703ed965d6
diff --git a/metadata/md5-cache/app-dicts/myspell-es-0.7 b/metadata/md5-cache/app-dicts/myspell-es-0.7
index 72cceb9e6874..d6b8a9e1d1b2 100644
--- a/metadata/md5-cache/app-dicts/myspell-es-0.7
+++ b/metadata/md5-cache/app-dicts/myspell-es-0.7
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
DESCRIPTION=Spanish dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://rla-es.forja.rediris.es/
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-3 LGPL-3 MPL-1.1
SLOT=0
SRC_URI=http://forja.rediris.es/frs/download.php/2933/es_ANY.oxt -> es_ANY-0.7.oxt http://forja.rediris.es/frs/download.php/2934/es_VE.oxt -> es_VE-0.7.oxt http://forja.rediris.es/frs/download.php/2935/es_UY.oxt -> es_UY-0.7.oxt http://forja.rediris.es/frs/download.php/2936/es_SV.oxt -> es_SV-0.7.oxt http://forja.rediris.es/frs/download.php/2937/es_PY.oxt -> es_PY-0.7.oxt http://forja.rediris.es/frs/download.php/2938/es_PR.oxt -> es_PR-0.7.oxt http://forja.rediris.es/frs/download.php/2939/es_PE.oxt -> es_PE-0.7.oxt http://forja.rediris.es/frs/download.php/2940/es_PA.oxt -> es_PA-0.7.oxt http://forja.rediris.es/frs/download.php/2941/es_NI.oxt -> es_NI-0.7.oxt http://forja.rediris.es/frs/download.php/2942/es_MX.oxt -> es_MX-0.7.oxt http://forja.rediris.es/frs/download.php/2943/es_HN.oxt -> es_HN-0.7.oxt http://forja.rediris.es/frs/download.php/2944/es_GT.oxt -> es_GT-0.7.oxt http://forja.rediris.es/frs/download.php/2945/es_ES.oxt -> es_ES-0.7.oxt http://forja.rediris.es/frs/download.php/2946/es_EC.oxt -> es_EC-0.7.oxt http://forja.rediris.es/frs/download.php/2947/es_DO.oxt -> es_DO-0.7.oxt http://forja.rediris.es/frs/download.php/2948/es_CU.oxt -> es_CU-0.7.oxt http://forja.rediris.es/frs/download.php/2949/es_CR.oxt -> es_CR-0.7.oxt http://forja.rediris.es/frs/download.php/2950/es_CO.oxt -> es_CO-0.7.oxt http://forja.rediris.es/frs/download.php/2951/es_CL.oxt -> es_CL-0.7.oxt http://forja.rediris.es/frs/download.php/2952/es_BO.oxt -> es_BO-0.7.oxt http://forja.rediris.es/frs/download.php/2953/es_AR.oxt -> es_AR-0.7.oxt
_eclasses_=myspell-r2 d7e8733370dd6a9a1a3b64fdda0146d2
-_md5_=0d86feda1a480a717d5c432389908557
+_md5_=8614219734a07d917c06147aeda459ce
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r3 b/metadata/md5-cache/app-editors/emacs-24.5-r3
index 18f66d5811d0..6ad965d53323 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r3
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r3
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
EAPI=6
HOMEPAGE=https://www.gnu.org/software/emacs/
IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-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
+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
LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !=dev-libs/libbsd-0.7.0 )
SLOT=0
SRC_URI=http://homepage.boetes.org/software/mg/mg-20160421.tar.gz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=e95529e2a0968b77640be9c75e971e92
+_md5_=e36623e46cbf016e64b524e91200eeff
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.2 b/metadata/md5-cache/app-eselect/eselect-php-0.9.2
index eebac02380d0..6f04ca4db222 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.2
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.2
@@ -4,10 +4,10 @@ DESCRIPTION=PHP eselect module
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
IUSE=fpm apache2
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
SLOT=0
SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.2.tar.xz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=2e8eba36c336a3c3938c751be56ee4e4
+_md5_=37d793fafebe8ff70a33b7540ddda20c
diff --git a/metadata/md5-cache/app-i18n/scim-skk-0.5.2-r1 b/metadata/md5-cache/app-i18n/scim-skk-0.5.2-r1
deleted file mode 100644
index 45f64ae5d951..000000000000
--- a/metadata/md5-cache/app-i18n/scim-skk-0.5.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=|| ( >=app-i18n/scim-1.2 >=app-i18n/scim-cvs-1.2 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=Japanese input method SKK IMEngine for SCIM
-EAPI=0
-HOMEPAGE=http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMSKK
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-i18n/scim-1.2 >=app-i18n/scim-cvs-1.2 ) || ( app-i18n/skk-jisyo virtual/skkserv ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/scim-imengine/18121/scim-skk-0.5.2.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=dc079ca1e42309be9d4b03829dd83798
diff --git a/metadata/md5-cache/app-i18n/unicode-data-9.0.0 b/metadata/md5-cache/app-i18n/unicode-data-9.0.0
index a9c2e1338186..6a86945ae36b 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-9.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-9.0.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
DESCRIPTION=Unicode data from unicode.org
EAPI=6
HOMEPAGE=http://www.unicode.org/ucd/
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=unicode
SLOT=0
SRC_URI=http://www.unicode.org/Public/zipped/9.0.0/UCD.zip -> unicode-data-9.0.0-UCD.zip http://www.unicode.org/Public/zipped/9.0.0/Unihan.zip -> unicode-data-9.0.0-Unihan.zip
-_md5_=d7067c21215dd52f4c60ba6db2d9aea2
+_md5_=b3aa4a04b09a35ce17f9970abc820f43
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r1 b/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r2
similarity index 94%
rename from metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r1
rename to metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r2
index 8f4b27d744cd..3bc7c5f255f8 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r1
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r2
@@ -4,10 +4,10 @@ DESCRIPTION=DDCControl allows control of monitor parameters via DDC
EAPI=5
HOMEPAGE=http://ddccontrol.sourceforge.net/
IUSE=doc gtk nls +pci static-libs video_cards_fglrx
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils ) video_cards_fglrx? ( x11-libs/amd-adl-sdk )
SLOT=0
SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/9d89d8c0b959a4da62ecc50fb2aeb23142d4bfb4.tar.gz -> ddccontrol-0.4.2_p20140105.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=b572128742a2e6ccda6ae28199816142
+_md5_=2e78546b6f3633be4d3c5e4e81d37717
diff --git a/metadata/md5-cache/app-misc/ddccontrol-db-20061014_p20121105 b/metadata/md5-cache/app-misc/ddccontrol-db-20061014_p20121105
index d0e7eaf383d6..5f58c3825855 100644
--- a/metadata/md5-cache/app-misc/ddccontrol-db-20061014_p20121105
+++ b/metadata/md5-cache/app-misc/ddccontrol-db-20061014_p20121105
@@ -4,10 +4,10 @@ DESCRIPTION=DDCControl monitor database
EAPI=5
HOMEPAGE=http://ddccontrol.sourceforge.net/
IUSE=nls
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=nls? ( sys-devel/gettext )
SLOT=0
SRC_URI=https://github.com/ddccontrol/ddccontrol-db/archive/130da80af5cd5d2897ffeed63362262262c6944f.tar.gz -> ddccontrol-db-20061014_p20121105.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=97d0ff952b14b3bfeb2b301cf02b00fd
+_md5_=dab2eebe7af46ea638a2fcc0abbe8e30
diff --git a/metadata/md5-cache/app-misc/run-mailcap-3.39_p1 b/metadata/md5-cache/app-misc/run-mailcap-3.39_p1
deleted file mode 100644
index d99832d1c090..000000000000
--- a/metadata/md5-cache/app-misc/run-mailcap-3.39_p1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Execute programs via entries in the mailcap file
-EAPI=0
-HOMEPAGE=http://packages.debian.org/unstable/net/mime-support
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=freedist
-RDEPEND=>=dev-lang/perl-5.6 app-misc/mime-types
-SLOT=0
-SRC_URI=mirror://debian/pool/main/m/mime-support/mime-support_3.39-1.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=f94bb30ed83ad02364119e70cdb401b4
diff --git a/metadata/md5-cache/app-misc/run-mailcap-3.52_p1 b/metadata/md5-cache/app-misc/run-mailcap-3.52_p1
deleted file mode 100644
index 169797a775e5..000000000000
--- a/metadata/md5-cache/app-misc/run-mailcap-3.52_p1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Execute programs via entries in the mailcap file
-EAPI=4
-HOMEPAGE=http://packages.debian.org/unstable/net/mime-support
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=freedist
-RDEPEND=>=dev-lang/perl-5.6 app-misc/mime-types
-SLOT=0
-SRC_URI=mirror://debian/pool/main/m/mime-support/mime-support_3.52-1.tar.gz
-_md5_=29ea0cc90f7a052ac737be4af063f414
diff --git a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1 b/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
deleted file mode 100644
index 2a2ea164e602..000000000000
--- a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/java-gnome:4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=View the time at locations around the world
-EAPI=5
-HOMEPAGE=http://research.operationaldynamics.com/projects/slashtime/
-IUSE=elibc_FreeBSD source
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/java-gnome:4.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://research.operationaldynamics.com/projects/slashtime/dist/slashtime-0.5.13.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=48354fa451676c51aa4ee87164f55e33
diff --git a/metadata/md5-cache/app-mobilephone/obex-data-server-0.4.6 b/metadata/md5-cache/app-mobilephone/obex-data-server-0.4.6
deleted file mode 100644
index afb98eb94dc8..000000000000
--- a/metadata/md5-cache/app-mobilephone/obex-data-server-0.4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/pkgconfig dev-libs/glib:2 >=dev-libs/dbus-glib-0.7 sys-apps/dbus >=net-wireless/bluez-4.31 =dev-libs/dbus-glib-0.7 sys-apps/dbus >=net-wireless/bluez-4.31 =app-pda/jpilot-0.99.9 >=app-pda/pilot-link-0.12.3 >=x11-libs/gtk+-2.8.19:2 >=dev-libs/libmal-0.44 virtual/pkgconfig
-DESCRIPTION=Syncmal plugin for jpilot
-EAPI=2
-HOMEPAGE=http://www.jlogday.com/code/syncmal/index.html
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2 MPL-1.0
-RDEPEND=>=app-pda/jpilot-0.99.9 >=app-pda/pilot-link-0.12.3 >=x11-libs/gtk+-2.8.19:2 >=dev-libs/libmal-0.44
-SLOT=0
-SRC_URI=http://www.jlogday.com/code/syncmal/jpilot-syncmal-0.81.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=6730bf3a937a2f1f8998ec3acaf3e29d
diff --git a/metadata/md5-cache/app-pda/synce-sync-engine-0.15.1-r3 b/metadata/md5-cache/app-pda/synce-sync-engine-0.15.1-r3
deleted file mode 100644
index 02b810261d27..000000000000
--- a/metadata/md5-cache/app-pda/synce-sync-engine-0.15.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=app-pda/synce-core[python] >=dev-libs/librra-0.16[python] >=dev-libs/librtfcomp-1.2[python] dev-libs/libxml2[python] dev-libs/libxslt[python] dev-python/dbus-python dev-python/pygobject:2 =dev-lang/python-2.7*
-DESCRIPTION=A synchronization engine for SynCE
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/synce/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-pda/synce-core[python] >=dev-libs/librra-0.16[python] >=dev-libs/librtfcomp-1.2[python] dev-libs/libxml2[python] dev-libs/libxslt[python] dev-python/dbus-python dev-python/pygobject:2 =dev-lang/python-2.7*
-SLOT=0
-SRC_URI=mirror://sourceforge/synce/synce-sync-engine-0.15.1.tar.gz
-_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=f7b08fd09655b0165a76d4239ef24508
diff --git a/metadata/md5-cache/app-portage/eix-0.31.7-r1 b/metadata/md5-cache/app-portage/eix-0.31.7-r1
index 6967cb6ef186..191a21019629 100644
--- a/metadata/md5-cache/app-portage/eix-0.31.7-r1
+++ b/metadata/md5-cache/app-portage/eix-0.31.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlay
EAPI=6
HOMEPAGE=https://github.com/vaeth/eix/
IUSE=debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools linguas_de linguas_ru
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-shells/push
SLOT=0
SRC_URI=https://github.com/vaeth/eix/releases/download/v0.31.7/eix-0.31.7.tar.xz
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 l10n e26ea0642846685782f1813642e7ff0f multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=0ab0b63ec125551c30044d6e222c7c71
+_md5_=40179011edf3b4d0097ea508bbd479c3
diff --git a/metadata/md5-cache/app-text/lodgeit-0.3_p20120507 b/metadata/md5-cache/app-text/lodgeit-0.3_p20120507
deleted file mode 100644
index 26333df75e89..000000000000
--- a/metadata/md5-cache/app-text/lodgeit-0.3_p20120507
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Command-line interface to paste.pocoo.org
-EAPI=4
-HOMEPAGE=http://paste.pocoo.org/
-IUSE=vim
-KEYWORDS=amd64 x86
-LICENSE=BSD MIT
-RDEPEND=vim? ( || ( app-editors/vim[python] app-editors/gvim[python] ) ) =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/skrattaren/lodgeit-script-gentoo/raw/03a5e8a6d1d4/scripts/lodgeit.py -> lodgeit-0.3_p20120507.py vim? ( http://www.vim.org/scripts/download_script.php?src_id=8848 -> lodgeit-0.3_p20120507.vim )
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8184cb3a52cd27c034253fb7f8a23802
diff --git a/metadata/md5-cache/app-text/lodgeit-0.3_p20120618-r1 b/metadata/md5-cache/app-text/lodgeit-0.3_p20120618-r1
deleted file mode 100644
index acb78b3959cc..000000000000
--- a/metadata/md5-cache/app-text/lodgeit-0.3_p20120618-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND==dev-lang/python-2*
-DESCRIPTION=Command-line interface to paste.pocoo.org
-EAPI=4
-HOMEPAGE=http://paste.pocoo.org/
-IUSE=vim
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD MIT
-RDEPEND=vim? ( || ( app-editors/vim[python] app-editors/gvim[python] ) ) =dev-lang/python-2*
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/skrattaren/lodgeit-script-gentoo/raw/1ca55b8189de/scripts/lodgeit.py -> lodgeit-0.3_p20120618.py vim? ( http://www.vim.org/scripts/download_script.php?src_id=8848 -> lodgeit-0.3_p20120618.vim )
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=16bbfda9df1ef5d4208d43bc5c444b26
diff --git a/metadata/md5-cache/app-text/notecase-1.9.8-r1 b/metadata/md5-cache/app-text/notecase-1.9.8-r1
deleted file mode 100644
index 5c35da257564..000000000000
--- a/metadata/md5-cache/app-text/notecase-1.9.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=sys-libs/zlib:0 >=x11-libs/gtk+-2.6:2 x11-libs/libX11:0 virtual/pkgconfig:*
-DESCRIPTION=Hierarchical note manager written using GTK+ and C++
-EAPI=5
-HOMEPAGE=http://notecase.sourceforge.net/
-IUSE=gnome nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib:0 >=x11-libs/gtk+-2.6:2 x11-libs/libX11:0
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/notecase/notecase-1.9.8_src.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=d0a09738279fa3609cb1611bd5063c9f
diff --git a/metadata/md5-cache/app-text/poppler-0.45.0 b/metadata/md5-cache/app-text/poppler-0.45.0
index dca0759ca52f..cde813d0688b 100644
--- a/metadata/md5-cache/app-text/poppler-0.45.0
+++ b/metadata/md5-cache/app-text/poppler-0.45.0
@@ -4,7 +4,7 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
EAPI=6
HOMEPAGE=https://poppler.freedesktop.org/
IUSE=cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) cairo-qt? ( >=x11-libs/cairo-1.10.0 ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
REQUIRED_USE=cairo-qt? ( qt4 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0/62
SRC_URI=https://poppler.freedesktop.org/poppler-0.45.0.tar.xz
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1b7a8bdf7bfe419e0eab0c109d8e65e4
+_md5_=2707773a9381953e258dbd8ca05a69d3
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.28 b/metadata/md5-cache/app-text/wgetpaste-2.28
index 0e9c3d0531b2..7180316eccb7 100644
--- a/metadata/md5-cache/app-text/wgetpaste-2.28
+++ b/metadata/md5-cache/app-text/wgetpaste-2.28
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Command-line interface to various pastebins
EAPI=5
HOMEPAGE=http://wgetpaste.zlin.dk/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=net-misc/wget
SLOT=0
SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.28.tar.bz2
-_md5_=38fafc4e3de2551dfe5c71f6a35caaa2
+_md5_=798c9581f8d97456c085191fa3c3e754
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
new file mode 100644
index 000000000000..97ba4c5776d3
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=app-misc/tmux app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: tmux support for vim
+EAPI=6
+HOMEPAGE=https://github.com/tmux-plugins/vim-tmux
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=vim.org
+RDEPEND=app-misc/tmux app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.zip -> vim-tmux-3.0.0.zip
+_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5
+_md5_=d0daf5cd871129cfb9cb5499a4134954
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006 b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
deleted file mode 100644
index 5c61a492833a..000000000000
--- a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND==dev-lang/gnat-gpl-3.4.6.2006* doc? ( virtual/latex-base app-text/texi2html ) >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=The Ada Semantic Interface Specification (tools tied to compiler)
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=doc nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/gnat-gpl-3.4.6.2006* app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=3.4
-SRC_URI=mirror://gentoo/asis-gpl-2006.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cd0a260421a5749aeb7072de8f0595b6
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
deleted file mode 100644
index 8da07248f065..000000000000
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2007* doc? ( virtual/latex-base app-text/texi2html ) >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=doc nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=4.1
-SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b95a129c6931f7d877a348e8bf74c692
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
deleted file mode 100644
index 901c134bf47c..000000000000
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2007* doc? ( virtual/latex-base app-text/texi2html ) >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=doc nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=4.1
-SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=52a4f69caeaa857dab5772c2307f3bd6
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
deleted file mode 100644
index b66fbc25b5a8..000000000000
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2008* doc? ( virtual/latex-base app-text/texi2html ) >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=doc nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=4.1
-SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=72765e51bd9dbd4bc97b25793cf9b96d
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
deleted file mode 100644
index e31ec407b905..000000000000
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND==dev-lang/gnat-gpl-4.1.3.2008* doc? ( virtual/latex-base app-text/texi2html ) >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=doc nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=4.1-2008
-SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c23e59611e78022e429599e4405b3aa
diff --git a/metadata/md5-cache/dev-games/simgear-2016.1.1 b/metadata/md5-cache/dev-games/simgear-2016.3.1
similarity index 61%
rename from metadata/md5-cache/dev-games/simgear-2016.1.1
rename to metadata/md5-cache/dev-games/simgear-2016.3.1
index b64aec7186db..78711e760036 100644
--- a/metadata/md5-cache/dev-games/simgear-2016.1.1
+++ b/metadata/md5-cache/dev-games/simgear-2016.3.1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal sys-libs/zlib virtual/opengl curl? ( net-misc/curl ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) >=dev-libs/boost-1.44 sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=Development library for simulation games
EAPI=6
HOMEPAGE=http://www.simgear.org/
-IUSE=curl debug subversion test
+IUSE=+dns debug subversion test
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal sys-libs/zlib virtual/opengl curl? ( net-misc/curl ) subversion? ( dev-vcs/subversion )
+RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) subversion? ( dev-vcs/subversion )
SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/simgear-2016.1.1.tar.bz2
+SRC_URI=mirror://sourceforge/flightgear/simgear-2016.3.1.tar.bz2
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4f836c35c2388fe12af55b5f9f070ec3
+_md5_=283d0dad27557c125765b4dc42f453a3
diff --git a/metadata/md5-cache/dev-games/simgear-9999 b/metadata/md5-cache/dev-games/simgear-9999
index 14d421303add..550c85d0c9ad 100644
--- a/metadata/md5-cache/dev-games/simgear-9999
+++ b/metadata/md5-cache/dev-games/simgear-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) subversion? ( dev-vcs/subversion )
SLOT=0
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a644aef73ce1b8130d40909b53272a0d
+_md5_=a021ce4a7fad32b190da83e32e44737d
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
deleted file mode 100644
index 95887fc39efa..000000000000
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
-EAPI=0
-HOMEPAGE=https://libre2.adacore.com/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=3.4
-SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.5/gcc-core-3.4.5.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.5.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0c14218a4a371ad42fb3dafda3d7f5ca
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
deleted file mode 100644
index 5b51ce04df04..000000000000
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
-EAPI=0
-HOMEPAGE=https://libre2.adacore.com/
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=3.4
-SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.6.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.6.1.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-3.4-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ad7cea2dcdf12f9de90238046c2bbd77
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
deleted file mode 100644
index 9d7db180a0ae..000000000000
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/blas virtual/lapack app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=4.1
-SRC_URI=https://dev.gentoo.org/~george/src/gcc-branch-4.1.3.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip https://dev.gentoo.org/~george/src/gnat-gpl-4.1.3.2007.tar.bz2 x86? ( https://dev.gentoo.org/~george/src/gnatboot-4.1-i386.tar.bz2 ) ppc? ( https://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( https://dev.gentoo.org/~george/src/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a0e10f7319fd53de2bdf5f604654fb91
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
deleted file mode 100644
index b5bbe0764553..000000000000
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip !=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 sys-devel/gnuconfig app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl ) >=app-eselect/eselect-gnat-1.3-r1 >=sys-libs/glibc-2.12 >=sys-devel/binutils-2.23 sys-devel/bc >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext )
-DESCRIPTION=GNAT Ada Compiler - AdaCore GPL version
-EAPI=0
-HOMEPAGE=https://libre.adacore.com/
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/blas virtual/lapack app-eselect/eselect-gnat virtual/libiconv nls? ( virtual/libintl )
-SLOT=4.1
-SRC_URI=https://dev.gentoo.org/~george/src/gnat-gpl-4.1.3.2008.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip x86? ( https://dev.gentoo.org/~george/src/gnatboot-4.1-i386.tar.bz2 ) ppc? ( https://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( https://dev.gentoo.org/~george/src/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 8632fcd33a047954f007dee9a137bdcc gnatbuild d597b04fed8c40bab46c23ae2e7de68d gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8d3c544aeb50498f2dcdfb5dda0fd0a5
diff --git a/metadata/md5-cache/dev-lang/io-2011.09.12-r2 b/metadata/md5-cache/dev-lang/io-2011.09.12-r2
deleted file mode 100644
index fbe96b9cbb52..000000000000
--- a/metadata/md5-cache/dev-lang/io-2011.09.12-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=clutter? ( media-libs/clutter ) dbi? ( dev-db/libdbi ) editline? ( dev-libs/libedit ) image? ( virtual/jpeg media-libs/tiff media-libs/libpng ) xmpp? ( net-libs/loudmouth ) libffi? ( virtual/libffi ) libxml2? ( dev-libs/libxml2 ) lzo? ( dev-libs/lzo ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql[server] ) readline? ( sys-libs/readline ) sndfile? ( media-libs/libsndfile ) sqlite? ( >=dev-db/sqlite-3.0.0 ) theora? ( media-libs/libtheora ) truetype? ( media-libs/freetype ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Io is a small, prototype-based programming language
-EAPI=4
-HOMEPAGE=http://www.iolanguage.com
-IUSE=cgi clutter dbi doc editline google gui http image libffi libxml2 lzo md5sum ncurses ogg opengl postgres pcre python readline sha1 sndfile sockets sqlite syslog theora threads truetype twitter vorbis xmpp zlib
-KEYWORDS=~x86 ~amd64
-LICENSE=BSD
-REQUIRED_USE=vorbis? ( ogg )
-SLOT=0
-SRC_URI=mirror://gentoo/io-2011.09.12.tar.gz https://dev.gentoo.org/~araujo/snapshots/io-2011.09.12.tar.gz
-_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=61f89c141274bbc36483e19bfc3b7dd7
diff --git a/metadata/md5-cache/dev-lang/io-2011.09.12-r3 b/metadata/md5-cache/dev-lang/io-2011.09.12-r3
deleted file mode 100644
index 6d530dd69238..000000000000
--- a/metadata/md5-cache/dev-lang/io-2011.09.12-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=clutter? ( media-libs/clutter ) dbi? ( dev-db/libdbi ) editline? ( dev-libs/libedit ) image? ( virtual/jpeg media-libs/tiff media-libs/libpng ) xmpp? ( net-libs/loudmouth ) libffi? ( virtual/libffi ) libxml2? ( dev-libs/libxml2 ) lzo? ( dev-libs/lzo ) ncurses? ( sys-libs/ncurses ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql[server] ) readline? ( sys-libs/readline ) sndfile? ( media-libs/libsndfile ) sqlite? ( >=dev-db/sqlite-3.0.0 ) theora? ( media-libs/libtheora ) truetype? ( media-libs/freetype ) vorbis? ( media-libs/libvorbis ) zlib? ( sys-libs/zlib ) sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=Io is a small, prototype-based programming language
-EAPI=6
-HOMEPAGE=http://www.iolanguage.com
-IUSE=cgi clutter dbi doc editline google gui http image libffi libxml2 lzo md5sum ncurses ogg opengl postgres pcre python readline sha1 sndfile sockets sqlite syslog theora threads truetype twitter vorbis xmpp zlib
-KEYWORDS=~x86 ~amd64
-LICENSE=BSD
-REQUIRED_USE=vorbis? ( ogg )
-SLOT=0
-SRC_URI=mirror://gentoo/io-2011.09.12.tar.gz https://dev.gentoo.org/~araujo/snapshots/io-2011.09.12.tar.gz
-_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=82f0c2ecde4ef532300b67058dde2a2d
diff --git a/metadata/md5-cache/dev-lang/nim-0.15.0 b/metadata/md5-cache/dev-lang/nim-0.15.0
new file mode 100644
index 000000000000..137d9fb95387
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-0.15.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=readline? ( sys-libs/readline:0= )
+DESCRIPTION=compiled, garbage-collected systems programming language
+EAPI=6
+HOMEPAGE=http://nim-lang.org/
+IUSE=doc +readline test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=http://nim-lang.org/download/nim-0.15.0.tar.xz
+_md5_=76ff48626325ddcc80b8949b8c1719be
diff --git a/metadata/md5-cache/dev-libs/check-0.10.0-r1 b/metadata/md5-cache/dev-libs/check-0.10.0-r1
index 37c790726c06..089a4a5ce6d2 100644
--- a/metadata/md5-cache/dev-libs/check-0.10.0-r1
+++ b/metadata/md5-cache/dev-libs/check-0.10.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/check/
IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=mirror://sourceforge/check/check-0.10.0.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=fce9e813d811bb5f376c5308bd5bb25d
+_md5_=62ce0d3676f3cd1e62b9beb64bfd1c30
diff --git a/metadata/md5-cache/dev-libs/gmime-2.6.20-r2 b/metadata/md5-cache/dev-libs/gmime-2.6.20-r2
index 4cc6a0fafa7b..d91888f7e602 100644
--- a/metadata/md5-cache/dev-libs/gmime-2.6.20-r2
+++ b/metadata/md5-cache/dev-libs/gmime-2.6.20-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for creating and parsing messages using MIME
EAPI=5
HOMEPAGE=http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/
IUSE=doc mono smime static-libs vala
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/glib-2.18:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/glib-sharp-2.4.0:2 ) smime? ( >=app-crypt/gpgme-1.1.6 )
SLOT=2.6
SRC_URI=mirror://gnome/sources/gmime/2.6/gmime-2.6.20.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 mono-env 10809200679bcceefebac9e72bebb6e6 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 vala 764817a25b405b65269d8619e203a52f versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7b58077970ce5b8c06bd09fb9fde758d
+_md5_=0e7b4c1d629df372896a0e2012509164
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.3.1-r200 b/metadata/md5-cache/dev-libs/keybinder-0.3.1-r200
index 3e190477d192..982cdd106ee5 100644
--- a/metadata/md5-cache/dev-libs/keybinder-0.3.1-r200
+++ b/metadata/md5-cache/dev-libs/keybinder-0.3.1-r200
@@ -4,11 +4,11 @@ DESCRIPTION=A library for registering global keyboard shortcuts
EAPI=5
HOMEPAGE=https://github.com/engla/keybinder
IUSE=+introspection lua python python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender introspection? ( dev-libs/gobject-introspection ) lua? ( >=dev-lang/lua-5.1 ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.3:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/engla/keybinder/releases/download/v0.3.1/keybinder-0.3.1.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ece88bab575c67bf3cdf281686908a7b
+_md5_=391e55314f91ece2b08dff6692dc2919
diff --git a/metadata/md5-cache/dev-libs/keybinder-0.3.1-r300 b/metadata/md5-cache/dev-libs/keybinder-0.3.1-r300
index cd0725b3bb94..5f9a2a935c5d 100644
--- a/metadata/md5-cache/dev-libs/keybinder-0.3.1-r300
+++ b/metadata/md5-cache/dev-libs/keybinder-0.3.1-r300
@@ -4,10 +4,10 @@ DESCRIPTION=A library for registering global keyboard shortcuts
EAPI=5
HOMEPAGE=https://github.com/engla/keybinder
IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 x86
LICENSE=MIT
RDEPEND=x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender introspection? ( dev-libs/gobject-introspection )
SLOT=3
SRC_URI=https://github.com/engla/keybinder/releases/download/keybinder-3.0-v0.3.1/keybinder-3.0-0.3.1.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=4d6f38d0b576be6e7a72e376b96148b8
+_md5_=418293a5ed84b93e5a8734118164d8f1
diff --git a/metadata/md5-cache/dev-libs/libmal-0.44.1 b/metadata/md5-cache/dev-libs/libmal-0.44.1
deleted file mode 100644
index c697724f99e5..000000000000
--- a/metadata/md5-cache/dev-libs/libmal-0.44.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=app-pda/pilot-link-0.12.3
-DESCRIPTION=convenience library of the functions malsync distribution
-EAPI=4
-HOMEPAGE=http://www.jlogday.com/code/libmal/index.html
-IUSE=static-libs
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 x86
-LICENSE=MPL-1.0
-RDEPEND=>=app-pda/pilot-link-0.12.3
-SLOT=0
-SRC_URI=http://www.jlogday.com/code/libmal/libmal-0.44.1.tar.gz
-_md5_=8e73c52be7e9eb579386b3091243b06f
diff --git a/metadata/md5-cache/dev-libs/librelp-1.2.12 b/metadata/md5-cache/dev-libs/librelp-1.2.12
index f5b0ad4f8646..dd83367e505d 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.2.12
+++ b/metadata/md5-cache/dev-libs/librelp-1.2.12
@@ -4,10 +4,10 @@ DESCRIPTION=An easy to use library for the RELP protocol
EAPI=6
HOMEPAGE=http://www.librelp.com/
IUSE=debug doc +ssl static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~sparc ~x86
LICENSE=GPL-3+ doc? ( FDL-1.3 )
RDEPEND=ssl? ( >=net-libs/gnutls-3.3.17.1:0= )
SLOT=0/0.2.0
SRC_URI=http://download.rsyslog.com/librelp/librelp-1.2.12.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ada27ea4c63a7cb3812aa2ad5e813df3
+_md5_=a42b298fcccdbd140572725ac7ecd7cd
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.4 b/metadata/md5-cache/dev-libs/librevenge-0.0.4
index d3eb46398dc5..9b90e235c54c 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=A helper library for REVerse ENGineered formats filters
EAPI=5
HOMEPAGE=http://sf.net/p/libwpd/librevenge
IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc64 x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ppc64 x86 ~x86-fbsd
LICENSE=|| ( MPL-2.0 LGPL-2.1 )
RDEPEND=dev-libs/boost:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=http://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=6e61cecc94e4940bda804db037313a60
+_md5_=8fd81af6106efeff93b8ef2d308bb4d7
diff --git a/metadata/md5-cache/dev-libs/log4c-1.2.1 b/metadata/md5-cache/dev-libs/log4c-1.2.1
deleted file mode 100644
index 9b0be64a9719..000000000000
--- a/metadata/md5-cache/dev-libs/log4c-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=media-gfx/graphviz expat? ( dev-libs/expat ) doc? ( app-doc/doxygen )
-DESCRIPTION=Log4c is a library of C for flexible logging to files, syslog and other destinations
-EAPI=2
-HOMEPAGE=http://log4c.sourceforge.net/
-IUSE=debug doc examples +expat
-KEYWORDS=~amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=media-gfx/graphviz expat? ( dev-libs/expat )
-SLOT=0
-SRC_URI=mirror://sourceforge/log4c/log4c-1.2.1.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=519091abf5d697e22b6cb8dbcaf327e5
diff --git a/metadata/md5-cache/dev-libs/log4c-1.2.4 b/metadata/md5-cache/dev-libs/log4c-1.2.4
deleted file mode 100644
index f45efc2427ec..000000000000
--- a/metadata/md5-cache/dev-libs/log4c-1.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=expat? ( dev-libs/expat ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=Log4c is a library of C for flexible logging to files, syslog and other destinations
-EAPI=5
-HOMEPAGE=http://log4c.sourceforge.net/
-IUSE=debug doc examples +expat static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=expat? ( dev-libs/expat )
-SLOT=0
-SRC_URI=mirror://sourceforge/log4c/log4c-1.2.4.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=63bd793d5727ff748b9cfbbd64c7a664
diff --git a/metadata/md5-cache/dev-libs/uchardet-0.0.5-r1 b/metadata/md5-cache/dev-libs/uchardet-0.0.5-r1
index fd70c801ed85..e2f10632d86e 100644
--- a/metadata/md5-cache/dev-libs/uchardet-0.0.5-r1
+++ b/metadata/md5-cache/dev-libs/uchardet-0.0.5-r1
@@ -4,9 +4,9 @@ DESCRIPTION=An encoding detector library
EAPI=5
HOMEPAGE=https://github.com/BYVoid/uchardet https://www.freedesktop.org/wiki/Software/uchardet/
IUSE=static-libs test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm hppa ppc64 x86
LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
SLOT=0
SRC_URI=https://github.com/BYVoid/uchardet/archive/v0.0.5.tar.gz -> uchardet-0.0.5.tar.gz
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4829e79f9b6c2e49bff8199931529253
+_md5_=7d95170901fa564dab3129d0c371a358
diff --git a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.60.0 b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.60.0
new file mode 100644
index 000000000000..5417fd7d3470
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.60.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
+DESCRIPTION=A clone of the classic Eliza program
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Chatbot-Eliza/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Chatbot-Eliza-1.06.tar.gz
+_eclasses_=multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce
+_md5_=d6d528a70479a6d5f11be8f16f01eca6
diff --git a/metadata/md5-cache/dev-python/boto-2.41.0 b/metadata/md5-cache/dev-python/boto-2.41.0
index 39d90a230a4d..c9b15217f069 100644
--- a/metadata/md5-cache/dev-python/boto-2.41.0
+++ b/metadata/md5-cache/dev-python/boto-2.41.0
@@ -4,7 +4,7 @@ DESCRIPTION=Amazon Web Services API
EAPI=5
HOMEPAGE=https://github.com/boto/boto https://pypi.python.org/pypi/boto
IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=MIT
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/b/boto/boto-2.41.0.tar.gz
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ff7ef142abf5bbfb4b9fa2068a642c57
+_md5_=bfb05d6ef755f25c3fdb65d7664d5788
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73 b/metadata/md5-cache/dev-python/pycups-1.9.73
index 0afa21b58e29..be8db6a537eb 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the CUPS API
EAPI=5
HOMEPAGE=http://cyberelk.net/tim/data/pycups/
IUSE=doc examples python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86
LICENSE=GPL-2
RDEPEND=net-print/cups python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
SLOT=0
SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f9a895e26f2c120ff4ad5e4b7d640207
+_md5_=b5fbd7a62e0e96ce8ba01ebf8fe32997
diff --git a/metadata/md5-cache/dev-python/pynut-1.2 b/metadata/md5-cache/dev-python/pynut-1.2
deleted file mode 100644
index 8f7b22bb7ee7..000000000000
--- a/metadata/md5-cache/dev-python/pynut-1.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=An abstraction class written in Python to access NUT (Network UPS Tools) server
-EAPI=3
-HOMEPAGE=http://www.lestat.st/informatique/projets/pynut-en/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.lestat.st/_media/informatique/projets/pynut/python-pynut-1.2.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=cf0f7347425511a803b8eaaf80f1f381
diff --git a/metadata/md5-cache/dev-python/remoteobjects-99999999 b/metadata/md5-cache/dev-python/remoteobjects-99999999
deleted file mode 100644
index 8f733e386bb9..000000000000
--- a/metadata/md5-cache/dev-python/remoteobjects-99999999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mox[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
-DESCRIPTION=subclassable Python objects for working with JSON REST APIs
-EAPI=5
-HOMEPAGE=https://github.com/LegNeato/remoteobjects
-IUSE=test python_targets_python2_7
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 git-2 7af5d170bfc02983b4bcd3167dc5edd4 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d15a5531a177286e54064f786d394bed
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-plantuml-0.4 b/metadata/md5-cache/dev-python/sphinxcontrib-plantuml-0.4
deleted file mode 100644
index 42ff4242268f..000000000000
--- a/metadata/md5-cache/dev-python/sphinxcontrib-plantuml-0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/sphinx-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Extension to embed UML diagram by using PlantUML
-EAPI=5
-HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-python/sphinx-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] media-gfx/plantuml python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/s/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.4.tar.gz
-_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aeaf60f6185fdf56443e28d92059e334
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.11.11 b/metadata/md5-cache/dev-python/werkzeug-0.11.11
new file mode 100644
index 000000000000..a5efa5035484
--- /dev/null
+++ b/metadata/md5-cache/dev-python/werkzeug-0.11.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-xprocess[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Collection of various utilities for WSGI applications
+EAPI=5
+HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.python.org/pypi/Werkzeug
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/simplejson[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.11.11.tar.gz
+_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=dc56c5c56e6f8da1198eb06a2be42667
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.29 b/metadata/md5-cache/dev-ruby/fxruby-1.6.29
deleted file mode 100644
index ffadd690d8ff..000000000000
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 dev-lang/swig ruby_targets_ruby20? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Ruby language binding to the FOX GUI toolkit
-EAPI=5
-HOMEPAGE=http://www.fxruby.org/
-IUSE=examples doc test elibc_FreeBSD ruby_targets_ruby20 test test
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 )
-SLOT=1.6
-SRC_URI=mirror://rubygems/fxruby-1.6.29.gem
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=cdde9312250c39fbf1a7492cb806bee1
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1 b/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1
deleted file mode 100644
index de17430586a8..000000000000
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 dev-lang/swig ruby_targets_ruby20? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Ruby language binding to the FOX GUI toolkit
-EAPI=5
-HOMEPAGE=http://www.fxruby.org/
-IUSE=examples doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=1.6
-SRC_URI=mirror://rubygems/fxruby-1.6.29.gem
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=e434c02ddf1b4abe33bdf2a33641a838
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.34 b/metadata/md5-cache/dev-ruby/fxruby-1.6.34
deleted file mode 100644
index 6a27fc924c32..000000000000
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.34
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 dev-lang/swig ruby_targets_ruby20? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/ruby-opengl[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Ruby language binding to the FOX GUI toolkit
-EAPI=5
-HOMEPAGE=http://www.fxruby.org/
-IUSE=examples doc test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1.6
-SRC_URI=mirror://rubygems/fxruby-1.6.34.gem
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=e47f60ec84c2445602523432dd072296
diff --git a/metadata/md5-cache/dev-tex/dot2tex-2.9.0 b/metadata/md5-cache/dev-tex/dot2tex-2.9.0
index e2f27731c593..29bf6096bb6d 100644
--- a/metadata/md5-cache/dev-tex/dot2tex-2.9.0
+++ b/metadata/md5-cache/dev-tex/dot2tex-2.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Graphviz to LaTeX converter
EAPI=5
HOMEPAGE=https://dot2tex.readthedocs.org/ https://github.com/kjellmf/dot2tex
IUSE=doc examples python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
LICENSE=MIT
RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/kjellmf/dot2tex/archive/2.9.0.tar.gz -> dot2tex-2.9.0.tar.gz
_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dde5e8d938c835f55e22f48b39220872
+_md5_=cede4ba5b1152a536ab090c69cae9e46
diff --git a/metadata/md5-cache/dev-util/bcc-0.1.8-r2 b/metadata/md5-cache/dev-util/bcc-0.1.8-r2
index 7badeb5509f1..087bd51c6893 100644
--- a/metadata/md5-cache/dev-util/bcc-0.1.8-r2
+++ b/metadata/md5-cache/dev-util/bcc-0.1.8-r2
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-devel/llvm-3.7:= sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
EAPI=6
HOMEPAGE=https://iovisor.github.io/bcc/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/llvm-3.7:= sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+RDEPEND=>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/iovisor/bcc/archive/v0.1.8.tar.gz -> bcc-0.1.8.tar.gz
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=651881d8496e801fb8483dd7b9947088
+_md5_=cf556a45f1a7647241c1865b85502c35
diff --git a/metadata/md5-cache/dev-util/bcc-0.2.0 b/metadata/md5-cache/dev-util/bcc-0.2.0
index 267aff0f86f5..f010a1cae838 100644
--- a/metadata/md5-cache/dev-util/bcc-0.2.0
+++ b/metadata/md5-cache/dev-util/bcc-0.2.0
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-devel/llvm-3.7:= sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
EAPI=6
HOMEPAGE=https://iovisor.github.io/bcc/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/llvm-3.7:= sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+RDEPEND=>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] sys-devel/clang python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/iovisor/bcc/archive/v0.2.0.tar.gz -> bcc-0.2.0.tar.gz
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ccb0724e11a33e9c38a282a6f4d5f1b
+_md5_=0b5c63414fb673a274ad10d7c23b463f
diff --git a/metadata/md5-cache/dev-util/byacc-20150711 b/metadata/md5-cache/dev-util/byacc-20150711
index 6321b0aa699f..ab90a5f54e94 100644
--- a/metadata/md5-cache/dev-util/byacc-20150711
+++ b/metadata/md5-cache/dev-util/byacc-20150711
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure
DESCRIPTION=the best variant of the Yacc parser generator
EAPI=5
HOMEPAGE=http://invisible-island.net/byacc/byacc.html
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
SLOT=0
SRC_URI=ftp://invisible-island.net/byacc/byacc-20150711.tgz
-_md5_=6d4fc562856e38ce27c327e653fe8c1f
+_md5_=08d90b95ebf6337e544e32eb74f3074d
diff --git a/metadata/md5-cache/dev-util/cmake-3.5.2-r1 b/metadata/md5-cache/dev-util/cmake-3.5.2-r1
index b1d5b3ef7478..ebba8af350b2 100644
--- a/metadata/md5-cache/dev-util/cmake-3.5.2-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
EAPI=6
HOMEPAGE=http://www.cmake.org/
IUSE=doc emacs system-jsoncpp ncurses qt4 qt5 test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=CMake
RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
SLOT=0
SRC_URI=http://www.cmake.org/files/v3.5/cmake-3.5.2.tar.gz
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=5f62fd067862aefaea8c1c47737b8df1
+_md5_=b0b3e8b82c384b8c3d4e728a46d71a5f
diff --git a/metadata/md5-cache/dev-util/metro-1.5.1 b/metadata/md5-cache/dev-util/metro-1.5.1
deleted file mode 100644
index 9008a9439a50..000000000000
--- a/metadata/md5-cache/dev-util/metro-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND==dev-lang/python-2*
-DESCRIPTION=release metatool used for creating Gentoo and Funtoo releases
-EAPI=3
-HOMEPAGE=https://github.com/funtoo/metro
-IUSE=+ccache +git threads
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=threads? ( app-arch/pbzip2 ) ccache? ( dev-util/ccache ) git? ( dev-vcs/git ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.funtoo.org/archive/metro/metro-1.5.1.tar.bz2
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=cda2d86c6f6930ccc1fffa61f3782a10
diff --git a/metadata/md5-cache/dev-util/re2c-0.16 b/metadata/md5-cache/dev-util/re2c-0.16
index 0e0743c694e2..564f5637925a 100644
--- a/metadata/md5-cache/dev-util/re2c-0.16
+++ b/metadata/md5-cache/dev-util/re2c-0.16
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=tool for generating C-based recognizers from regular expressions
EAPI=5
HOMEPAGE=http://re2c.org/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=public-domain
SLOT=0
SRC_URI=https://github.com/skvadrik/re2c/releases/download/0.16/re2c-0.16.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=37a8668a6f64f17d5e3199738355cb38
+_md5_=2472a7597701cc6b933e60f62ecaa4df
diff --git a/metadata/md5-cache/games-mud/wxmud-9999 b/metadata/md5-cache/games-mud/wxmud-9999
deleted file mode 100644
index 56bbfee40ee4..000000000000
--- a/metadata/md5-cache/games-mud/wxmud-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=x11-libs/gtk+-2.4:2 x11-libs/wxGTK:2.8 python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Cross-platform MUD client
-EAPI=5
-HOMEPAGE=http://wxmud.sourceforge.net/
-IUSE=python python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.4:2 x11-libs/wxGTK:2.8 python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
-SLOT=0
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 subversion 750f91bd0705a41b26ba01bcee93aaad toolchain-funcs 6198c04daba0e1307bd844df7d37f423 wxwidgets 9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=dd8fe6cafbc3cccc4dd1e37ccfb32f7e
diff --git a/metadata/md5-cache/games-simulation/flightgear-2016.1.1 b/metadata/md5-cache/games-simulation/flightgear-2016.3.1
similarity index 82%
rename from metadata/md5-cache/games-simulation/flightgear-2016.1.1
rename to metadata/md5-cache/games-simulation/flightgear-2016.3.1
index 1434d63a4aeb..df2140faf3d0 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2016.1.1
+++ b/metadata/md5-cache/games-simulation/flightgear-2016.3.1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.1.1 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.3.1 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=Open Source Flight Simulator
EAPI=6
HOMEPAGE=http://www.flightgear.org/
IUSE=dbus debug examples qt5 test +udev +utils vim-syntax
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.1.1 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) ~games-simulation/flightgear-data-2016.1.1
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.3.1 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) ~games-simulation/flightgear-data-2016.3.1
SLOT=0
-SRC_URI=mirror://sourceforge/flightgear/flightgear-2016.1.1.tar.bz2
+SRC_URI=mirror://sourceforge/flightgear/flightgear-2016.3.1.tar.bz2
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d38ff59cde93f83f54e10d9129185c0f
+_md5_=8b0b7710afc43aa93fffeeb512736b89
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index 6a2b4aa322f0..218e0d0e06c2 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-9999 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) ~games-simulation/flightgear-data-9999
SLOT=0
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3002f4e9b70f73cae1933d1d1785aae0
+_md5_=a22d3b3ff119d8403f5538b49ce242d4
diff --git a/metadata/md5-cache/games-simulation/flightgear-data-2016.1.1 b/metadata/md5-cache/games-simulation/flightgear-data-2016.3.1
similarity index 78%
rename from metadata/md5-cache/games-simulation/flightgear-data-2016.1.1
rename to metadata/md5-cache/games-simulation/flightgear-data-2016.3.1
index 5684dc2569e3..95e6e545e811 100644
--- a/metadata/md5-cache/games-simulation/flightgear-data-2016.1.1
+++ b/metadata/md5-cache/games-simulation/flightgear-data-2016.3.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=!=dev-libs/libqtxdg-1.3.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=>=dev-libs/libqtxdg-1.3.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libXScrnSaver dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=Common base library for the LXQt desktop environment
EAPI=6
HOMEPAGE=http://lxqt.org/
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2 LGPL-2.1+
-RDEPEND=>=dev-libs/libqtxdg-1.3.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X]
+RDEPEND=>=dev-libs/libqtxdg-1.3.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libXScrnSaver
SLOT=0
SRC_URI=https://downloads.lxqt.org/lxqt/0.11.0/liblxqt-0.11.0.tar.xz
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7bb23946f840853d3dbfbd16cf0b05fe
+_md5_=b6ee8cda8b9efbf6d068e6f30375425f
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
new file mode 100644
index 000000000000..cf181280d4e7
--- /dev/null
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/menu-cache-0.3.3 ~lxqt-base/liblxqt-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] ) sysstat? ( =lxqt-base/libsysstat-0.3* ) tray? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=LXQt desktop panel and plugins
+EAPI=5
+HOMEPAGE=http://lxqt.org/
+IUSE=+alsa +clock colorpicker cpuload +desktopswitch dom +kbindicator +mainmenu +mount networkmonitor pulseaudio +quicklaunch sensors +showdesktop statusnotifier sysstat +taskbar +tray +volume worldclock
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib:2 >=dev-libs/libqtxdg-1.0.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/kguiaddons:5 kde-frameworks/kwindowsystem:5[X] >=lxde-base/menu-cache-0.3.3 ~lxqt-base/liblxqt-0.11.0 ~lxqt-base/lxqt-globalkeys-0.11.0 x11-libs/libX11 cpuload? ( sys-libs/libstatgrab ) kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) sensors? ( sys-apps/lm_sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5] ) sysstat? ( =lxqt-base/libsysstat-0.3* ) tray? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender ) volume? ( alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) dev-qt/qtsvg:5 >=lxde-base/lxmenu-data-0.1.2
+REQUIRED_USE=volume? ( || ( alsa pulseaudio ) )
+SLOT=0
+SRC_URI=https://downloads.lxqt.org/lxqt/0.11.0/lxqt-panel-0.11.0.tar.xz
+_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0134aa14055c6ac3868d963106fb8396
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r3 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r3
new file mode 100644
index 000000000000..5e1550bce45b
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst preinst prepare
+DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 virtual/pkgconfig
+DESCRIPTION=High-performance interface between the MTA and content checkers
+EAPI=6
+HOMEPAGE=http://www.ijs.si/software/amavisd/
+IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2 BSD-2
+RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
+SLOT=0
+SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.11.0.tar.xz
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87
+_md5_=4bc9eac5e07c37b2ef653ab62fd99ec0
diff --git a/metadata/md5-cache/mail-filter/isbg-0.99-r1 b/metadata/md5-cache/mail-filter/isbg-0.99-r1
deleted file mode 100644
index 507729faf0a6..000000000000
--- a/metadata/md5-cache/mail-filter/isbg-0.99-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND==dev-lang/python-2*
-DESCRIPTION=IMAP Spam Begone: a script that makes it easy to scan an IMAP inbox for spam using SpamAssassin
-EAPI=3
-HOMEPAGE=http://redmine.ookook.fr/projects/isbg
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=mail-filter/spamassassin =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://github/ook/isbg/isbg_0.99_20100303.tgz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=bbad2dcb897037ff88ec6d4da9c7dab8
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r8 b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r8
index 74af9d87e090..d925dcee769c 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r8
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r8
@@ -4,11 +4,11 @@ DESCRIPTION=An extensible mail filter which can identify and tag spam
EAPI=6
HOMEPAGE=http://spamassassin.apache.org/
IUSE=+bayes berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
LICENSE=Apache-2.0 GPL-2
RDEPEND=dev-lang/perl dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
REQUIRED_USE=bayes? ( || ( berkdb mysql postgres sqlite ) )
SLOT=0
SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 perl-functions aac50de73be0a80ebe780e0b20850130 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=185fa37d5410e9ecaa6bc0ee8bb18c26
+_md5_=a8d8a631c14ec4a227082d3810d25d21
diff --git a/metadata/md5-cache/media-gfx/cutycapt-0_p20120409 b/metadata/md5-cache/media-gfx/cutycapt-0_p20120409
deleted file mode 100644
index 73eb3fe4631f..000000000000
--- a/metadata/md5-cache/media-gfx/cutycapt-0_p20120409
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtcore:4 dev-qt/qtsvg:4
-DESCRIPTION=Qt WebKit Web Page Rendering Capture Utility
-EAPI=4
-HOMEPAGE=http://cutycapt.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtcore:4 dev-qt/qtsvg:4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mattm/cutycapt-0_p20120409.tar.gz
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8d351277261977c04be0d5d8ca696437
diff --git a/metadata/md5-cache/media-gfx/xsvg-0.2.1 b/metadata/md5-cache/media-gfx/xsvg-0.2.1
deleted file mode 100644
index c20dc6dd62ab..000000000000
--- a/metadata/md5-cache/media-gfx/xsvg-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/cairo[X] x11-libs/libsvg-cairo x11-libs/libXt x11-libs/libXcursor !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a command line viewer for SVG files
-EAPI=2
-HOMEPAGE=http://cairographics.org
-KEYWORDS=amd64 hppa ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=x11-libs/cairo[X] x11-libs/libsvg-cairo
-SLOT=0
-SRC_URI=http://cairographics.org/snapshots/xsvg-0.2.1.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=c19151447fb4310fb04f92ad4cc54248
diff --git a/metadata/md5-cache/media-libs/libdlna-0.2.4 b/metadata/md5-cache/media-libs/libdlna-0.2.4
deleted file mode 100644
index 633bb0f61caa..000000000000
--- a/metadata/md5-cache/media-libs/libdlna-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=>=virtual/ffmpeg-0.6.90
-DESCRIPTION=A reference open-source implementation of DLNA (Digital Living Network Alliance) standards
-EAPI=5
-HOMEPAGE=http://libdlna.geexbox.org
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/ffmpeg-0.6.90
-SLOT=0
-SRC_URI=http://libdlna.geexbox.org/releases/libdlna-0.2.4.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=d8fcc5c4622a5334204b2812f6b23eea
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.8 b/metadata/md5-cache/media-libs/libmikmod-3.3.8
index d5d508af964a..eb0bd31c6890 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.8
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=A library to play a wide range of module formats
EAPI=5
HOMEPAGE=http://mikmod.sourceforge.net/
IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=LGPL-2+ LGPL-2.1
RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
SLOT=0
SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.8.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8cc4ba2af12603f2e23d59af82cc0f01
+_md5_=96a4b180b99166ce518f166f5099989b
diff --git a/metadata/md5-cache/media-libs/libsvg-0.1.4-r1 b/metadata/md5-cache/media-libs/libsvg-0.1.4-r1
deleted file mode 100644
index 880a22a8e5e3..000000000000
--- a/metadata/md5-cache/media-libs/libsvg-0.1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg virtual/pkgconfig !=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A parser for SVG content in files or buffers
-EAPI=0
-HOMEPAGE=http://cairographics.org
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 media-libs/libpng virtual/jpeg
-SLOT=0
-SRC_URI=http://cairographics.org/snapshots/libsvg-0.1.4.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=6e5640d7bb599b0a28c12771ab70d852
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.5 b/metadata/md5-cache/media-libs/libvisio-0.1.5
index 62c2e6fb0970..d84fddfa56fc 100644
--- a/metadata/md5-cache/media-libs/libvisio-0.1.5
+++ b/metadata/md5-cache/media-libs/libvisio-0.1.5
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing the visio documents
EAPI=6
HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
IUSE=doc static-libs test tools
-KEYWORDS=amd64 ~arm ~hppa ppc64 x86
+KEYWORDS=amd64 ~arm hppa ppc64 x86
LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
SLOT=0
SRC_URI=http://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.5.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ca4d931575da5a8e6613fe67fd05be47
+_md5_=d9de2de749f13fcc6535002c564c5333
diff --git a/metadata/md5-cache/media-libs/rubberband-1.8.1-r1 b/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
index 6a6685851b27..ae30916ee83d 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An audio time-stretching and pitch-shifting library and utility prog
EAPI=5
HOMEPAGE=http://www.breakfastquay.com/rubberband/
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=alpha amd64 hppa ~ppc ppc64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/vamp-plugin-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=http://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=d9563225cf6271c9ab8c00a51b8ffac7
+_md5_=e4660d10904ef5def2637f0f1f3b6006
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
index 4ab77453ec0a..40a4609762aa 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Audio processing plugin system for plugins that extract descriptive
EAPI=5
HOMEPAGE=http://www.vamp-plugins.org
IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~hppa ~mips ppc ppc64 x86
+KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 x86
LICENSE=BSD
RDEPEND=media-libs/libsndfile
SLOT=0
SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/1514/vamp-plugin-sdk-2.6.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=4ba7f78856439efa48445231809be6df
+_md5_=0f6b15af526f336692257d1294877153
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.65 b/metadata/md5-cache/media-plugins/audacious-dumb-0.65
deleted file mode 100644
index f65cf36bb24d..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.65
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig =media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=5
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.65.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=9cebb0b47b0596632feb4a4df6541f2c
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.73 b/metadata/md5-cache/media-plugins/audacious-dumb-0.73
deleted file mode 100644
index f296c0827ba8..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.73
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig =media-sound/audacious-3.1* >=media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=4
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-sound/audacious-3.1* >=media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.73.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ebb3a81f7f546c5e9302285915ffad51
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.74 b/metadata/md5-cache/media-plugins/audacious-dumb-0.74
deleted file mode 100644
index be01d2eea7a0..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.74
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig =media-sound/audacious-3.1* >=media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=4
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-sound/audacious-3.1* >=media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.74.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ebb3a81f7f546c5e9302285915ffad51
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.80 b/metadata/md5-cache/media-plugins/audacious-dumb-0.80
deleted file mode 100644
index 39b659ba74c4..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.80
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig =media-sound/audacious-3.2* >=media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=4
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-sound/audacious-3.2* >=media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.80.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=682db37b52c4e80d303091192a300d67
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.81 b/metadata/md5-cache/media-plugins/audacious-dumb-0.81
deleted file mode 100644
index 7229c78493e1..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.81
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig >=media-sound/audacious-3.3 >=media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=4
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/audacious-3.3 >=media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.81.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=7457a42a595f9f401744c4464139c450
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.82 b/metadata/md5-cache/media-plugins/audacious-dumb-0.82
deleted file mode 100644
index 9076e3b65328..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.82
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig >=media-sound/audacious-3.3 >=media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=4
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/audacious-3.3 >=media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.82.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=a488273d87049f939e602b599b4127fd
diff --git a/metadata/md5-cache/media-plugins/audacious-dumb-0.83 b/metadata/md5-cache/media-plugins/audacious-dumb-0.83
deleted file mode 100644
index 7fb518626d9c..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-dumb-0.83
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/pkgconfig >=media-sound/audacious-3.5 >=media-libs/dumb-0.9.3
-DESCRIPTION=Audacious Plug-in for accurate, high-quality IT/XM/S3M/MOD playback
-EAPI=5
-HOMEPAGE=http://www.netswarm.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/audacious-3.5 >=media-libs/dumb-0.9.3
-SLOT=0
-SRC_URI=http://www.netswarm.net/misc/audacious-dumb-0.83.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=5093461e3b809b895a7a293bc0f86adb
diff --git a/metadata/md5-cache/media-sound/gnaural-1.0.20110606 b/metadata/md5-cache/media-sound/gnaural-1.0.20110606
deleted file mode 100644
index adfd9552ed2a..000000000000
--- a/metadata/md5-cache/media-sound/gnaural-1.0.20110606
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/gtk+-2:2 >=gnome-base/libglade-2 >=dev-libs/glib-2:2 >=media-libs/libsndfile-1.0.2 >=media-libs/portaudio-19_pre20071207 nls? ( dev-util/intltool ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An opensource binaural-beat generator
-EAPI=5
-HOMEPAGE=http://gnaural.sourceforge.net
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2:2 >=gnome-base/libglade-2 >=dev-libs/glib-2:2 >=media-libs/libsndfile-1.0.2 >=media-libs/portaudio-19_pre20071207
-SLOT=0
-SRC_URI=mirror://sourceforge/gnaural/Gnaural/gnaural-1.0.20110606.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=da4a29374a1f282eec731cceeca345ec
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.5 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.5
index 15adca167908..cb3c3d84bf62 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.5
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
EAPI=5
HOMEPAGE=http://ncmpcpp.rybczak.net/
IUSE=clock curl outputs taglib unicode visualizer
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= )
SLOT=0
SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.5.tar.bz2
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=32b5e19a7b187a9efbd1817877f867cd
+_md5_=a1208638d5b566a213738093d3861bd3
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.07.06-r1 b/metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.07.06-r1
deleted file mode 100644
index 3d3a234ff8ce..000000000000
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.07.06-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=dvb_cards_sp8870? ( app-arch/unzip ) dvb_cards_tda10046? ( app-arch/unzip ) dvb_cards_tda10046lifeview? ( app-arch/unzip ) dvb_cards_ttusb-dec? ( app-arch/unzip ) dvb_cards_ttusb-dec? ( app-arch/unzip ) dvb_cards_ttusb-dec? ( app-arch/unzip ) dvb_cards_opera1? ( app-arch/unzip ) dvb_cards_vp7041? ( app-arch/unzip ) dvb_cards_nxt200x? ( app-arch/unzip ) dvb_cards_mpc718? ( app-arch/unzip ) !dvb_cards_usb-a800? ( !dvb_cards_dibusb-usb2? ( !dvb_cards_usb-dtt200u? ( !dvb_cards_usb-umt? ( !dvb_cards_usb-vp702x? ( !dvb_cards_usb-vp7045? ( !dvb_cards_usb-wt220u? ( !dvb_cards_dibusb-usb1? ( !dvb_cards_or51211? ( !dvb_cards_or51132? ( !dvb_cards_or51132? ( !dvb_cards_ttpci? ( !dvb_cards_bcm3510? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-dib0700? ( !dvb_cards_usb-af9015? ( !dvb_cards_sp887x? ( !dvb_cards_af9005? ( !dvb_cards_cx231xx? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx23885? ( !dvb_cards_cx23885? ( !dvb_cards_pvrusb2? ( !dvb_cards_usb-bluebird? ( !dvb_cards_tda10045? ( !dvb_cards_sp8870? ( !dvb_cards_tda10046? ( !dvb_cards_tda10046lifeview? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_opera1? ( !dvb_cards_opera1? ( !dvb_cards_vp7041? ( !dvb_cards_nxt200x? ( !dvb_cards_mpc718? ( app-arch/unzip ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-DESCRIPTION=Firmware files needed for operation of some dvb-devices
-EAPI=0
-HOMEPAGE=http://www.linuxtv.org
-IUSE=dvb_cards_usb-a800 dvb_cards_dibusb-usb2 dvb_cards_usb-dtt200u dvb_cards_usb-umt dvb_cards_usb-vp702x dvb_cards_usb-vp7045 dvb_cards_usb-wt220u dvb_cards_dibusb-usb1 dvb_cards_or51211 dvb_cards_or51132 dvb_cards_or51132 dvb_cards_ttpci dvb_cards_bcm3510 dvb_cards_usb-wt220u dvb_cards_usb-wt220u dvb_cards_usb-dib0700 dvb_cards_usb-af9015 dvb_cards_sp887x dvb_cards_af9005 dvb_cards_cx231xx dvb_cards_cx18 dvb_cards_cx18 dvb_cards_cx18 dvb_cards_cx23885 dvb_cards_cx23885 dvb_cards_pvrusb2 dvb_cards_usb-bluebird dvb_cards_tda10045 dvb_cards_sp8870 dvb_cards_tda10046 dvb_cards_tda10046lifeview dvb_cards_ttusb-dec dvb_cards_ttusb-dec dvb_cards_ttusb-dec dvb_cards_opera1 dvb_cards_opera1 dvb_cards_vp7041 dvb_cards_nxt200x dvb_cards_mpc718
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist ISC all-rights-reserved
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=dvb_cards_usb-a800? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_dibusb-usb2? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-dtt200u? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-umt? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-vp702x? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-vp7045? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-wt220u? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_dibusb-usb1? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_or51211? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_or51132? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_or51132? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_ttpci? ( http://www.escape-edv.de/endriss/firmware/dvb-ttpci-01.fw-fc2624 ) dvb_cards_bcm3510? ( http://www.linuxtv.org/downloads/firmware/dvb-fe-bcm3510-01.fw ) dvb_cards_usb-wt220u? ( http://www.linuxtv.org/downloads/firmware/dvb-usb-wt220u-02.fw ) dvb_cards_usb-wt220u? ( http://home.arcor.de/efocht/dvb-usb-wt220u-fc03.fw ) dvb_cards_usb-dib0700? ( http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw ) dvb_cards_usb-af9015? ( http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw ) dvb_cards_sp887x? ( http://peterdamen.com/dvb-fe-sp887x.fw ) dvb_cards_af9005? ( http://ventoso.org/luca/af9005/af9005.fw ) dvb_cards_cx231xx? ( http://linuxtv.org/downloads/firmware/v4l-cx231xx-avcore-01.fw ) dvb_cards_cx18? ( http://linuxtv.org/downloads/firmware/v4l-cx23418-apu.fw ) dvb_cards_cx18? ( http://linuxtv.org/downloads/firmware/v4l-cx23418-cpu.fw ) dvb_cards_cx18? ( http://linuxtv.org/downloads/firmware/v4l-cx23418-dig.fw ) dvb_cards_cx23885? ( http://linuxtv.org/downloads/firmware/v4l-cx23885-avcore-01.fw ) dvb_cards_cx23885? ( http://linuxtv.org/downloads/firmware/v4l-cx23885-enc.fw ) dvb_cards_pvrusb2? ( http://linuxtv.org/downloads/firmware/v4l-cx25840.fw ) dvb_cards_usb-bluebird? ( http://linuxtv.org/downloads/firmware/dvb-usb-bluebird-01.fw ) dvb_cards_tda10045? ( http://www.fireburn.co.uk/dvb-fe-tda10045.fw ) dvb_cards_sp8870? ( http://2.download.softwarepatch.pl/1619edb0dcb493dd5337b94a1f79c3f6/tt_Premium_217g.zip ) dvb_cards_tda10046? ( http://www.tt-download.com/download/updates/219/TT_PCI_2.19h_28_11_2006.zip ) dvb_cards_tda10046lifeview? ( http://www.lifeview.hk/dbimages/document/7%5Cdrv_2.11.02.zip ) dvb_cards_ttusb-dec? ( http://hauppauge.lightpath.net/de/dec217g.exe ) dvb_cards_ttusb-dec? ( http://hauppauge.lightpath.net/de/dec217g.exe ) dvb_cards_ttusb-dec? ( http://hauppauge.lightpath.net/de/dec217g.exe ) dvb_cards_opera1? ( http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SCap2.sys ) dvb_cards_opera1? ( http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SLoad2.sys ) dvb_cards_vp7041? ( http://www.twinhan.com/files/AW/Software/TwinhanDTV2.608a.zip ) dvb_cards_nxt200x? ( http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip ) dvb_cards_mpc718? ( ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip ) !dvb_cards_usb-a800? ( !dvb_cards_dibusb-usb2? ( !dvb_cards_usb-dtt200u? ( !dvb_cards_usb-umt? ( !dvb_cards_usb-vp702x? ( !dvb_cards_usb-vp7045? ( !dvb_cards_usb-wt220u? ( !dvb_cards_dibusb-usb1? ( !dvb_cards_or51211? ( !dvb_cards_or51132? ( !dvb_cards_or51132? ( !dvb_cards_ttpci? ( !dvb_cards_bcm3510? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-dib0700? ( !dvb_cards_usb-af9015? ( !dvb_cards_sp887x? ( !dvb_cards_af9005? ( !dvb_cards_cx231xx? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx23885? ( !dvb_cards_cx23885? ( !dvb_cards_pvrusb2? ( !dvb_cards_usb-bluebird? ( !dvb_cards_tda10045? ( !dvb_cards_sp8870? ( !dvb_cards_tda10046? ( !dvb_cards_tda10046lifeview? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_opera1? ( !dvb_cards_opera1? ( !dvb_cards_vp7041? ( !dvb_cards_nxt200x? ( !dvb_cards_mpc718? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.escape-edv.de/endriss/firmware/dvb-ttpci-01.fw-fc2624 http://www.linuxtv.org/downloads/firmware/dvb-fe-bcm3510-01.fw http://www.linuxtv.org/downloads/firmware/dvb-usb-wt220u-02.fw http://home.arcor.de/efocht/dvb-usb-wt220u-fc03.fw http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw http://www.otit.fi/~crope/v4l-dvb/af9015/af9015_firmware_cutter/firmware_files/4.95.0/dvb-usb-af9015.fw http://peterdamen.com/dvb-fe-sp887x.fw http://ventoso.org/luca/af9005/af9005.fw http://linuxtv.org/downloads/firmware/v4l-cx231xx-avcore-01.fw http://linuxtv.org/downloads/firmware/v4l-cx23418-apu.fw http://linuxtv.org/downloads/firmware/v4l-cx23418-cpu.fw http://linuxtv.org/downloads/firmware/v4l-cx23418-dig.fw http://linuxtv.org/downloads/firmware/v4l-cx23885-avcore-01.fw http://linuxtv.org/downloads/firmware/v4l-cx23885-enc.fw http://linuxtv.org/downloads/firmware/v4l-cx25840.fw http://linuxtv.org/downloads/firmware/dvb-usb-bluebird-01.fw http://www.fireburn.co.uk/dvb-fe-tda10045.fw http://2.download.softwarepatch.pl/1619edb0dcb493dd5337b94a1f79c3f6/tt_Premium_217g.zip http://www.tt-download.com/download/updates/219/TT_PCI_2.19h_28_11_2006.zip http://www.lifeview.hk/dbimages/document/7%5Cdrv_2.11.02.zip http://hauppauge.lightpath.net/de/dec217g.exe http://hauppauge.lightpath.net/de/dec217g.exe http://hauppauge.lightpath.net/de/dec217g.exe http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SCap2.sys http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SLoad2.sys http://www.twinhan.com/files/AW/Software/TwinhanDTV2.608a.zip http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-_md5_=c81171419c13b5014ac1f27294bb5975
diff --git a/metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.09.19 b/metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.09.19
deleted file mode 100644
index 4596cb5d4e82..000000000000
--- a/metadata/md5-cache/media-tv/linuxtv-dvb-firmware-2009.09.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=app-arch/unrar dvb_cards_sp8870? ( app-arch/unzip ) dvb_cards_tda10046? ( app-arch/unzip ) dvb_cards_tda10046lifeview? ( app-arch/unzip ) dvb_cards_ttusb-dec? ( app-arch/unzip ) dvb_cards_ttusb-dec? ( app-arch/unzip ) dvb_cards_ttusb-dec? ( app-arch/unzip ) dvb_cards_opera1? ( app-arch/unzip ) dvb_cards_vp7041? ( app-arch/unzip ) dvb_cards_nxt200x? ( app-arch/unzip ) dvb_cards_mpc718? ( app-arch/unzip ) dvb_cards_usb-af9015? ( app-arch/unzip ) !dvb_cards_usb-a800? ( !dvb_cards_dibusb-usb2? ( !dvb_cards_usb-dtt200u? ( !dvb_cards_usb-umt? ( !dvb_cards_usb-vp702x? ( !dvb_cards_usb-vp7045? ( !dvb_cards_usb-wt220u? ( !dvb_cards_dibusb-usb1? ( !dvb_cards_or51211? ( !dvb_cards_or51132? ( !dvb_cards_or51132? ( !dvb_cards_usb-dw2104? ( !dvb_cards_usb-dw2104? ( !dvb_cards_ttpci? ( !dvb_cards_bcm3510? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-dib0700? ( !dvb_cards_sp887x? ( !dvb_cards_af9005? ( !dvb_cards_cx231xx? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx23885? ( !dvb_cards_cx23885? ( !dvb_cards_pvrusb2? ( !dvb_cards_usb-bluebird? ( !dvb_cards_tda10045? ( !dvb_cards_sp8870? ( !dvb_cards_tda10046? ( !dvb_cards_tda10046lifeview? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_opera1? ( !dvb_cards_opera1? ( !dvb_cards_vp7041? ( !dvb_cards_nxt200x? ( !dvb_cards_mpc718? ( !dvb_cards_usb-af9015? ( app-arch/unzip ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-DESCRIPTION=Firmware files needed for operation of some dvb-devices
-EAPI=0
-HOMEPAGE=http://www.linuxtv.org
-IUSE=dvb_cards_usb-a800 dvb_cards_dibusb-usb2 dvb_cards_usb-dtt200u dvb_cards_usb-umt dvb_cards_usb-vp702x dvb_cards_usb-vp7045 dvb_cards_usb-wt220u dvb_cards_dibusb-usb1 dvb_cards_or51211 dvb_cards_or51132 dvb_cards_or51132 dvb_cards_usb-dw2104 dvb_cards_usb-dw2104 dvb_cards_ttpci dvb_cards_bcm3510 dvb_cards_usb-wt220u dvb_cards_usb-wt220u dvb_cards_usb-dib0700 dvb_cards_sp887x dvb_cards_af9005 dvb_cards_cx231xx dvb_cards_cx18 dvb_cards_cx18 dvb_cards_cx18 dvb_cards_cx23885 dvb_cards_cx23885 dvb_cards_pvrusb2 dvb_cards_usb-bluebird dvb_cards_tda10045 dvb_cards_sp8870 dvb_cards_tda10046 dvb_cards_tda10046lifeview dvb_cards_ttusb-dec dvb_cards_ttusb-dec dvb_cards_ttusb-dec dvb_cards_opera1 dvb_cards_opera1 dvb_cards_vp7041 dvb_cards_nxt200x dvb_cards_mpc718 dvb_cards_usb-af9015
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist ISC all-rights-reserved
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=dvb_cards_usb-a800? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_dibusb-usb2? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-dtt200u? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-umt? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-vp702x? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-vp7045? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-wt220u? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_dibusb-usb1? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_or51211? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_or51132? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_or51132? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 ) dvb_cards_usb-dw2104? ( http://tevii.com/Tevii_linuxdriver_0815.rar ) dvb_cards_usb-dw2104? ( http://tevii.com/Tevii_linuxdriver_0815.rar ) dvb_cards_ttpci? ( http://www.escape-edv.de/endriss/firmware/dvb-ttpci-01.fw-fc2624 ) dvb_cards_bcm3510? ( http://www.linuxtv.org/downloads/firmware/dvb-fe-bcm3510-01.fw ) dvb_cards_usb-wt220u? ( http://www.linuxtv.org/downloads/firmware/dvb-usb-wt220u-02.fw ) dvb_cards_usb-wt220u? ( http://home.arcor.de/efocht/dvb-usb-wt220u-fc03.fw ) dvb_cards_usb-dib0700? ( http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw ) dvb_cards_sp887x? ( http://peterdamen.com/dvb-fe-sp887x.fw ) dvb_cards_af9005? ( http://ventoso.org/luca/af9005/af9005.fw ) dvb_cards_cx231xx? ( http://linuxtv.org/downloads/firmware/v4l-cx231xx-avcore-01.fw ) dvb_cards_cx18? ( http://linuxtv.org/downloads/firmware/v4l-cx23418-apu.fw ) dvb_cards_cx18? ( http://linuxtv.org/downloads/firmware/v4l-cx23418-cpu.fw ) dvb_cards_cx18? ( http://linuxtv.org/downloads/firmware/v4l-cx23418-dig.fw ) dvb_cards_cx23885? ( http://linuxtv.org/downloads/firmware/v4l-cx23885-avcore-01.fw ) dvb_cards_cx23885? ( http://linuxtv.org/downloads/firmware/v4l-cx23885-enc.fw ) dvb_cards_pvrusb2? ( http://linuxtv.org/downloads/firmware/v4l-cx25840.fw ) dvb_cards_usb-bluebird? ( http://linuxtv.org/downloads/firmware/dvb-usb-bluebird-01.fw ) dvb_cards_tda10045? ( http://www.fireburn.co.uk/dvb-fe-tda10045.fw ) dvb_cards_sp8870? ( http://2.download.softwarepatch.pl/1619edb0dcb493dd5337b94a1f79c3f6/tt_Premium_217g.zip ) dvb_cards_tda10046? ( http://www.tt-download.com/download/updates/219/TT_PCI_2.19h_28_11_2006.zip ) dvb_cards_tda10046lifeview? ( http://www.lifeview.hk/dbimages/document/7%5Cdrv_2.11.02.zip ) dvb_cards_ttusb-dec? ( http://hauppauge.lightpath.net/de/dec217g.exe ) dvb_cards_ttusb-dec? ( http://hauppauge.lightpath.net/de/dec217g.exe ) dvb_cards_ttusb-dec? ( http://hauppauge.lightpath.net/de/dec217g.exe ) dvb_cards_opera1? ( http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SCap2.sys ) dvb_cards_opera1? ( http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SLoad2.sys ) dvb_cards_vp7041? ( http://www.twinhan.com/files/AW/Software/TwinhanDTV2.608a.zip ) dvb_cards_nxt200x? ( http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip ) dvb_cards_mpc718? ( ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip ) dvb_cards_usb-af9015? ( http://www.ite.com.tw/EN/Services/download.ashx?file=57 ) !dvb_cards_usb-a800? ( !dvb_cards_dibusb-usb2? ( !dvb_cards_usb-dtt200u? ( !dvb_cards_usb-umt? ( !dvb_cards_usb-vp702x? ( !dvb_cards_usb-vp7045? ( !dvb_cards_usb-wt220u? ( !dvb_cards_dibusb-usb1? ( !dvb_cards_or51211? ( !dvb_cards_or51132? ( !dvb_cards_or51132? ( !dvb_cards_usb-dw2104? ( !dvb_cards_usb-dw2104? ( !dvb_cards_ttpci? ( !dvb_cards_bcm3510? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-wt220u? ( !dvb_cards_usb-dib0700? ( !dvb_cards_sp887x? ( !dvb_cards_af9005? ( !dvb_cards_cx231xx? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx18? ( !dvb_cards_cx23885? ( !dvb_cards_cx23885? ( !dvb_cards_pvrusb2? ( !dvb_cards_usb-bluebird? ( !dvb_cards_tda10045? ( !dvb_cards_sp8870? ( !dvb_cards_tda10046? ( !dvb_cards_tda10046lifeview? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_ttusb-dec? ( !dvb_cards_opera1? ( !dvb_cards_opera1? ( !dvb_cards_vp7041? ( !dvb_cards_nxt200x? ( !dvb_cards_mpc718? ( !dvb_cards_usb-af9015? ( http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://www.linuxtv.org/downloads/firmware/dvb-firmwares-1.tar.bz2 http://tevii.com/Tevii_linuxdriver_0815.rar http://tevii.com/Tevii_linuxdriver_0815.rar http://www.escape-edv.de/endriss/firmware/dvb-ttpci-01.fw-fc2624 http://www.linuxtv.org/downloads/firmware/dvb-fe-bcm3510-01.fw http://www.linuxtv.org/downloads/firmware/dvb-usb-wt220u-02.fw http://home.arcor.de/efocht/dvb-usb-wt220u-fc03.fw http://www.wi-bw.tfh-wildau.de/~pboettch/home/files/dvb-usb-dib0700-1.20.fw http://peterdamen.com/dvb-fe-sp887x.fw http://ventoso.org/luca/af9005/af9005.fw http://linuxtv.org/downloads/firmware/v4l-cx231xx-avcore-01.fw http://linuxtv.org/downloads/firmware/v4l-cx23418-apu.fw http://linuxtv.org/downloads/firmware/v4l-cx23418-cpu.fw http://linuxtv.org/downloads/firmware/v4l-cx23418-dig.fw http://linuxtv.org/downloads/firmware/v4l-cx23885-avcore-01.fw http://linuxtv.org/downloads/firmware/v4l-cx23885-enc.fw http://linuxtv.org/downloads/firmware/v4l-cx25840.fw http://linuxtv.org/downloads/firmware/dvb-usb-bluebird-01.fw http://www.fireburn.co.uk/dvb-fe-tda10045.fw http://2.download.softwarepatch.pl/1619edb0dcb493dd5337b94a1f79c3f6/tt_Premium_217g.zip http://www.tt-download.com/download/updates/219/TT_PCI_2.19h_28_11_2006.zip http://www.lifeview.hk/dbimages/document/7%5Cdrv_2.11.02.zip http://hauppauge.lightpath.net/de/dec217g.exe http://hauppauge.lightpath.net/de/dec217g.exe http://hauppauge.lightpath.net/de/dec217g.exe http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SCap2.sys http://www.informatik.uni-leipzig.de/~hlawit/dvb/2830SLoad2.sys http://www.twinhan.com/files/AW/Software/TwinhanDTV2.608a.zip http://www.avermedia-usa.com/support/Drivers/AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip http://www.ite.com.tw/EN/Services/download.ashx?file=57 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) )
-_md5_=3714bbf1624c0712fcb75453bfab8ec5
diff --git a/metadata/md5-cache/media-video/arista-0.9.7 b/metadata/md5-cache/media-video/arista-0.9.7
deleted file mode 100644
index 645d887e86b7..000000000000
--- a/metadata/md5-cache/media-video/arista-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=An easy to use multimedia transcoder for the GNOME Desktop
-EAPI=5
-HOMEPAGE=http://www.transcoder.org
-IUSE=+faac kde nautilus +x264 +xvid python_targets_python2_7 linguas_ar linguas_ast linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gl linguas_hu linguas_ia linguas_id linguas_it linguas_ja linguas_jv linguas_kn linguas_lt linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=x11-libs/gtk+-2.16:2 >=dev-python/pygtk-2.16:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gconf-python:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-gudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/librsvg >=media-libs/gstreamer-0.10.22:0.10 dev-python/gst-python:0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-bad:0.10 media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-ffmpeg:0.10 x11-themes/gnome-icon-theme nautilus? ( dev-python/nautilus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) kde? ( dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) faac? ( media-plugins/gst-plugins-faac:0.10 ) x264? ( media-plugins/gst-plugins-x264:0.10 ) xvid? ( media-plugins/gst-plugins-xvid:0.10 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://programmer-art.org/media/releases/arista-transcoder/arista-0.9.7.tar.gz
-_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 l10n e26ea0642846685782f1813642e7ff0f multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fe650f83f964e62a8270d108f7aa609f
diff --git a/metadata/md5-cache/media-video/coriander-2.0.2 b/metadata/md5-cache/media-video/coriander-2.0.2
deleted file mode 100644
index 263877de6e08..000000000000
--- a/metadata/md5-cache/media-video/coriander-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libdc1394-2.0.0 media-libs/libsdl media-libs/tiff:0 gnome-base/libgnomeui gnome-base/libbonoboui gnome-base/libgnomecanvas gnome-base/libgnome gnome-base/orbit virtual/pkgconfig
-DESCRIPTION=A Gnome2 GUI for firewire camera control and capture
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/coriander/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libdc1394-2.0.0 media-libs/libsdl media-libs/tiff:0 gnome-base/libgnomeui gnome-base/libbonoboui gnome-base/libgnomecanvas gnome-base/libgnome gnome-base/orbit
-SLOT=0
-SRC_URI=mirror://sourceforge/coriander/coriander-2.0.2.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=a968950327c1425573bd8f7fff042056
diff --git a/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.2 b/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.2
deleted file mode 100644
index 5e338c53de74..000000000000
--- a/metadata/md5-cache/media-video/dvd-slideshow-0.8.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=DVD Slideshow - Turn your pictures into a dvd with menus!
-EAPI=4
-HOMEPAGE=http://dvd-slideshow.sourceforge.net/wiki/Main_Page
-IUSE=examples mp3 themes vorbis
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-sound/sox || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) media-video/mjpegtools >media-video/dvdauthor-0.6.11 virtual/cdrtools virtual/ffmpeg app-cdr/dvd+rw-tools mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis ) sys-devel/bc media-gfx/jhead
-SLOT=0
-SRC_URI=mirror://sourceforge/dvd-slideshow/dvd-slideshow-0.8.4-2.tar.gz examples? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-examples-0.8.4-1.tar.gz ) themes? ( mirror://sourceforge/dvd-slideshow/dvd-slideshow-themes-0.8.4-1.tar.gz )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed5789c9e14c897db23dd24b501d2598
diff --git a/metadata/md5-cache/media-video/mpv-0.18.0-r1 b/metadata/md5-cache/media-video/mpv-0.18.0-r1
index 8e8fd9d30906..00de8e7a80ff 100644
--- a/metadata/md5-cache/media-video/mpv-0.18.0-r1
+++ b/metadata/md5-cache/media-video/mpv-0.18.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Media player based on MPlayer and mplayer2
EAPI=6
HOMEPAGE=https://mpv.io/
IUSE=aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba -sdl selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv zsh-completion
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+KEYWORDS=alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
LICENSE=GPL-2+ BSD ISC
RDEPEND=!libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv enca? ( app-i18n/enca ) libguess? ( >=app-i18n/libguess-1.0 ) uchardet? ( dev-libs/uchardet ) ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( =media-libs/openal-1.13 ) opengl? ( !aqua? ( virtual/opengl ) ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 media-libs/mesa[egl,gles2] ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( x11-libs/libXdamage ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) selinux? ( sec-policy/selinux-mplayer )
REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) egl? ( || ( gbm X wayland ) ) enca? ( iconv ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli )
SLOT=0
SRC_URI=https://github.com/mpv-player/mpv/archive/v0.18.0.tar.gz -> mpv-0.18.0.tar.gz https://waf.io/waf-1.8.12
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 waf-utils c21174962af5ca8091b66f58612797ce xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=37c784b7472ff7781fd80d2489cccbe3
+_md5_=7fe5decd211dda54f58efe50da5a0c51
diff --git a/metadata/md5-cache/media-video/pgcedit-0.8.6 b/metadata/md5-cache/media-video/pgcedit-0.8.6
deleted file mode 100644
index a542dd390fcc..000000000000
--- a/metadata/md5-cache/media-video/pgcedit-0.8.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=DVD IFO and Menu editor
-EAPI=4
-HOMEPAGE=http://download.videohelp.com/r0lZ/pgcedit/
-IUSE=video
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-cdr/cdrtools >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0 video? ( app-emulation/wine )
-SLOT=0
-SRC_URI=http://download.videohelp.com/r0lZ/pgcedit/versions/PgcEdit_source_8.6.zip http://download.videohelp.com/r0lZ/pgcedit/versions/PgcEdit_Manual_html.zip mirror://gentoo/pgcedit.png
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4571c592762a02ae05363bc7b278941d
diff --git a/metadata/md5-cache/media-video/xanim-2.80.1-r4 b/metadata/md5-cache/media-video/xanim-2.80.1-r4
deleted file mode 100644
index a2fc10858c3a..000000000000
--- a/metadata/md5-cache/media-video/xanim-2.80.1-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-libs/libXext x11-libs/libXt >=sys-libs/zlib-1.1.3 >=sys-apps/sed-4.0.5 x11-proto/xextproto
-DESCRIPTION=program for playing a wide variety of animation, audio and video formats
-EAPI=0
-HOMEPAGE=http://xanim.polter.net/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=XAnim
-RDEPEND=x11-libs/libXext x11-libs/libXt >=sys-libs/zlib-1.1.3
-SLOT=0
-SRC_URI=mirror://gentoo/xanim2801.tar.gz sparc? ( mirror://gentoo/xa2.0_cvid_sparcELF.o.Z mirror://gentoo/xa1.0_cyuv_sparcELF.o.Z mirror://gentoo/xa2.0_iv32_sparcELF.o.Z ) alpha? ( mirror://gentoo/xa2.0_cvid_linuxAlpha.o.gz mirror://gentoo/xa1.0_cyuv_linuxAlpha.o.gz mirror://gentoo/xa2.0_iv32_linuxAlpha.o.gz ) ppc? ( mirror://gentoo/xa2.0_cvid_linuxPPC.o.Z mirror://gentoo/xa1.0_cyuv_linuxPPC.o.Z mirror://gentoo/xa2.0_iv32_linuxPPC.o.Z ) x86? ( mirror://gentoo/xa2.0_cvid_linuxELFg21.o.gz mirror://gentoo/xa1.0_cyuv_linuxELFg21.o.gz mirror://gentoo/xa2.1_iv32_linuxELFg21.o.gz ) x86-fbsd? ( mirror://gentoo/xa2.0_cvid_linuxELFg21.o.gz mirror://gentoo/xa1.0_cyuv_linuxELFg21.o.gz mirror://gentoo/xa2.1_iv32_linuxELFg21.o.gz )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=7ba4ac1d94d7822cfa13ef6bcc0c6a06
diff --git a/metadata/md5-cache/media-video/xvideoservicethief-2.4.1-r2 b/metadata/md5-cache/media-video/xvideoservicethief-2.4.1-r2
deleted file mode 100644
index c0a8c0bfb127..000000000000
--- a/metadata/md5-cache/media-video/xvideoservicethief-2.4.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-arch/unzip >=dev-qt/qtgui-4.5.3:4 >=dev-qt/qtwebkit-4.5.3:4 doc? ( app-doc/doxygen )
-DESCRIPTION=Download (and convert) videos from various Web Video Services
-EAPI=2
-HOMEPAGE=http://xviservicethief.sourceforge.net/
-IUSE=debug doc linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_nl linguas_pl linguas_ro linguas_ru linguas_sv
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtgui-4.5.3:4 virtual/ffmpeg media-video/flvstreamer
-SLOT=0
-SRC_URI=mirror://sourceforge/xviservicethief/xVST_2_4_1_src.zip
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0318bc811e3fd7d961c4b91fea9b4cd6
diff --git a/metadata/md5-cache/net-analyzer/bmon-3.9 b/metadata/md5-cache/net-analyzer/bmon-3.9
index 49ef57a2b43d..fdb0bf69f71e 100644
--- a/metadata/md5-cache/net-analyzer/bmon-3.9
+++ b/metadata/md5-cache/net-analyzer/bmon-3.9
@@ -3,10 +3,10 @@ DEPEND=>=sys-libs/ncurses-5.3-r2:= dev-libs/confuse:= dev-libs/libnl:3 virtual/p
DESCRIPTION=interface bandwidth monitor
EAPI=6
HOMEPAGE=http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/
-KEYWORDS=amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86
LICENSE=BSD-2 MIT
RDEPEND=>=sys-libs/ncurses-5.3-r2:= dev-libs/confuse:= dev-libs/libnl:3
SLOT=0
SRC_URI=https://codeload.github.com/tgraf/bmon/tar.gz/v3.9 -> bmon-3.9.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5de6d6c40d9c340aca9369a56c73051f
+_md5_=543dfec2a1d3423bfec3256cf3c7d3fb
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
index cb2bd189c938..dcc450ea7a97 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.7.3-r5
@@ -4,7 +4,7 @@ DESCRIPTION=Software for generating and retrieving SNMP data
EAPI=5
HOMEPAGE=http://net-snmp.sourceforge.net/
IUSE=X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=HPND BSD GPL-2
RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) pci? ( sys-apps/pciutils ) lm_sensors? ( sys-apps/lm_sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( virtual/mysql ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
REQUIRED_USE=python? ( python_targets_python2_7 ) rpm? ( bzip2 zlib )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.7.3/net-snmp-5.7.3.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-2.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524.patch.gz https://dev.gentoo.org/~dilfridge/distfiles/net-snmp-5.7.3-perl524-2.patch.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 unpacker 45d07319df5f40ee6af58418b0f930be xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3bd7c86ea51ebca789d21341a8794641
+_md5_=804c253a6267e54cb030487276f0c75e
diff --git a/metadata/md5-cache/net-analyzer/portbunny-1.0_p20080423 b/metadata/md5-cache/net-analyzer/portbunny-1.0_p20080423
deleted file mode 100644
index e4468fbced1a..000000000000
--- a/metadata/md5-cache/net-analyzer/portbunny-1.0_p20080423
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=dev-lang/python kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=A kernel based highspeed TCP SYN port scanner
-EAPI=0
-HOMEPAGE=http://recurity-labs.com/portbunny/
-IUSE=kernel_linux
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/python kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://recurity-labs.com/portbunny/PortBunny230408.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 linux-info fd1e29abbb02cbc49f1a14299846e9c4 linux-mod 4755518412586c2fd655ff6e55780bcb multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c9ae4adad1c1bfecc1f2b7070e8b0e1a
diff --git a/metadata/md5-cache/net-dialup/radiusclient-0.3.2 b/metadata/md5-cache/net-dialup/radiusclient-0.3.2
deleted file mode 100644
index 04c7947b6c1b..000000000000
--- a/metadata/md5-cache/net-dialup/radiusclient-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client !=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for writing RADIUS clients accompanied with several client utilities
-EAPI=0
-HOMEPAGE=http://freshmeat.net/projects/radiusclient/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client
-SLOT=0
-SRC_URI=ftp://ftp.cityline.net/pub/radiusclient/radiusclient-0.3.2.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8f329bad36111658b777b0b66f2c6fa2
diff --git a/metadata/md5-cache/net-dialup/radiusclient-0.3.2-r1 b/metadata/md5-cache/net-dialup/radiusclient-0.3.2-r1
deleted file mode 100644
index 1c73df4a59bc..000000000000
--- a/metadata/md5-cache/net-dialup/radiusclient-0.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for writing RADIUS clients accompanied with several client utilities
-EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/radiusclient/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=!net-dialup/radiusclient-ng !net-dialup/freeradius-client
-SLOT=0
-SRC_URI=ftp://ftp.cityline.net/pub/radiusclient/radiusclient-0.3.2.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=5c87f299335930d5a608a47b7737d7c8
diff --git a/metadata/md5-cache/net-dns/hesinfo-3.1.0 b/metadata/md5-cache/net-dns/hesinfo-3.1.0
deleted file mode 100644
index 3855e39f5854..000000000000
--- a/metadata/md5-cache/net-dns/hesinfo-3.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=net-dns/hesiod-3.1.0 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A simple command-line interface to the net-dns/hesiod service library
-EAPI=2
-HOMEPAGE=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd
-LICENSE=ISC
-RDEPEND=>=net-dns/hesiod-3.1.0
-SLOT=0
-SRC_URI=ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-3.1.0.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=b9cb92d6adf5e3ed5d08a7a22810273c
diff --git a/metadata/md5-cache/net-fs/sshfs-2.8 b/metadata/md5-cache/net-fs/sshfs-2.8
index 2f2999090f5b..9d24e5c9041d 100644
--- a/metadata/md5-cache/net-fs/sshfs-2.8
+++ b/metadata/md5-cache/net-fs/sshfs-2.8
@@ -3,9 +3,9 @@ DEPEND=>=sys-fs/fuse-2.6.0_pre3 >=dev-libs/glib-2.4.2 virtual/pkgconfig
DESCRIPTION=Fuse-filesystem utilizing the sftp service
EAPI=6
HOMEPAGE=https://github.com/libfuse/sshfs
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=amd64 arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=sys-fs/fuse-2.6.0_pre3 >=dev-libs/glib-2.4.2 >=net-misc/openssh-4.4
SLOT=0
SRC_URI=https://github.com/libfuse/sshfs/releases/download/sshfs_2.8/sshfs-2.8.tar.gz
-_md5_=26d78233dc57c6d3eb25b544b572b919
+_md5_=eee996dbf12c3ea4a2ecc7b171140edf
diff --git a/metadata/md5-cache/net-im/simpserver-bin-2.1.0-r2 b/metadata/md5-cache/net-im/simpserver-bin-2.1.0-r2
deleted file mode 100644
index 0a4b6ef25fbe..000000000000
--- a/metadata/md5-cache/net-im/simpserver-bin-2.1.0-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=SimpServer for Unix: IM instant security transparent proxy
-EAPI=6
-HOMEPAGE=http://www.secway.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=simpserver-test
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://download.secway.com/public/products/simpserver/simpserver-2.1.0-linux-x86.tgz
-_md5_=0a921e6d7e8c1bbc8f501409ec6ed443
diff --git a/metadata/md5-cache/net-irc/irc-client-2.10.3_p7 b/metadata/md5-cache/net-irc/irc-client-2.10.3_p7
deleted file mode 100644
index 721a7fca4f20..000000000000
--- a/metadata/md5-cache/net-irc/irc-client-2.10.3_p7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses sys-libs/zlib
-DESCRIPTION=A simplistic RFC compliant IRC client
-EAPI=0
-HOMEPAGE=http://www.irc.org
-IUSE=ipv6
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-1
-RDEPEND=sys-libs/ncurses sys-libs/zlib !net-irc/ircii
-SLOT=0
-SRC_URI=ftp://ftp.irc.org/irc/server/irc2.10.3p7.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=67f6c776011b9836907028f89cf63983
diff --git a/metadata/md5-cache/net-libs/libnet-1.2_rc3-r1 b/metadata/md5-cache/net-libs/libnet-1.2_rc3-r1
index 15aa552ad20f..541cd48be50e 100644
--- a/metadata/md5-cache/net-libs/libnet-1.2_rc3-r1
+++ b/metadata/md5-cache/net-libs/libnet-1.2_rc3-r1
@@ -4,9 +4,9 @@ DESCRIPTION=library providing an API for commonly used low-level network functio
EAPI=6
HOMEPAGE=http://libnet-dev.sourceforge.net/
IUSE=doc static-libs
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD BSD-2 HPND
SLOT=1.1
SRC_URI=mirror://sourceforge/project/libnet-dev/libnet-1.2-rc3.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=b7b732bb08f2c845eff3f173f4ba8e49
+_md5_=241c35b8bff0ecd4c9726b71796296ea
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0 b/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0
deleted file mode 100644
index dffdda402cb6..000000000000
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=~net-libs/libsoup-2.50.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=net-libs/libsoup-2.42.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME plugin for libsoup
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/LibSoup
-IUSE=debug +introspection debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=~net-libs/libsoup-2.50.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=net-libs/libsoup-2.42.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=2.4
-SRC_URI=mirror://gnome/sources/libsoup/2.50/libsoup-2.50.0.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=20ea21c4993b9916d8725e412e6a4daa
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2 b/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2
deleted file mode 100644
index f5eb3981dfbb..000000000000
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=~net-libs/libsoup-2.52.2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME plugin for libsoup
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/LibSoup
-IUSE=+introspection debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=~net-libs/libsoup-2.52.2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-db/sqlite:3=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-SLOT=2.4
-SRC_URI=mirror://gnome/sources/libsoup/2.52/libsoup-2.52.2.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f97b9298c373aadf8efe011181a56b96
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
index bc76684b4016..758839f61fc5 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=RabbitMQ C client
EAPI=6
HOMEPAGE=https://github.com/alanxz/rabbitmq-c
IUSE=doc libressl test +ssl static-libs tools
-KEYWORDS=amd64 ~arm ~hppa ~x86
+KEYWORDS=amd64 ~arm hppa ~x86
LICENSE=MIT
RDEPEND=ssl? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) tools? ( dev-libs/popt )
REQUIRED_USE=test? ( static-libs )
SLOT=0/4
SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.8.0.zip -> rabbitmq-c-v0.8.0.zip
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d0969fbd56d5ffd54e5544ac650ac86
+_md5_=9cdcf25e58fe24978538cbb410a96083
diff --git a/metadata/md5-cache/net-libs/wt-3.3.4 b/metadata/md5-cache/net-libs/wt-3.3.4
deleted file mode 100644
index 5ae44bf14fa1..000000000000
--- a/metadata/md5-cache/net-libs/wt-3.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/boost-1.41 graphicsmagick? ( media-gfx/graphicsmagick ) pdf? ( media-libs/libharu x11-libs/pango ) postgres? ( dev-db/postgresql:= ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) fcgi? ( dev-libs/fcgi virtual/httpd-fastcgi ) server? ( ssl? ( dev-libs/openssl:= ) zlib? ( sys-libs/zlib ) ) >=dev-util/cmake-2.6 sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=C++ library for developing interactive web applications
-EAPI=5
-HOMEPAGE=http://webtoolkit.eu/
-IUSE=doc +extjs fcgi graphicsmagick mysql pdf postgres resources +server ssl +sqlite test zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.41 graphicsmagick? ( media-gfx/graphicsmagick ) pdf? ( media-libs/libharu x11-libs/pango ) postgres? ( dev-db/postgresql:= ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) fcgi? ( dev-libs/fcgi virtual/httpd-fastcgi ) server? ( ssl? ( dev-libs/openssl:= ) zlib? ( sys-libs/zlib ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/witty/wt/3.3.0/wt-3.3.4.tar.gz
-_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f152ecc3c3e57ae5e01d926cb0d6462f
diff --git a/metadata/md5-cache/net-misc/dhcpcd-6.11.3 b/metadata/md5-cache/net-misc/dhcpcd-6.11.3
index 0ff765e92013..22f19553fa8c 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-6.11.3
+++ b/metadata/md5-cache/net-misc/dhcpcd-6.11.3
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
EAPI=6
HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
LICENSE=BSD-2
RDEPEND=udev? ( virtual/udev )
SLOT=0
SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-6.11.3.tar.xz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=4367dc9b5fa29f0f675903589f9b270e
+_md5_=c86bfc59d72e120793993230fbd89181
diff --git a/metadata/md5-cache/net-misc/gnome-rdp-0.3.0.9 b/metadata/md5-cache/net-misc/gnome-rdp-0.3.0.9
deleted file mode 100644
index e7e88d17a98d..000000000000
--- a/metadata/md5-cache/net-misc/gnome-rdp-0.3.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-db/sqlite:3 dev-dotnet/ndesk-dbus-glib dev-dotnet/gconf-sharp:2 dev-dotnet/glade-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 >=dev-dotnet/gnome-keyring-sharp-1.0 >=net-misc/openssh-3 >=x11-terms/gnome-terminal-2 rdesktop? ( >=net-misc/rdesktop-1.3 ) vnc? ( >=net-misc/tightvnc-1.2 )
-DESCRIPTION=Remote Desktop Client for the GNOME desktop
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/gnome-rdp
-IUSE=+rdesktop +vnc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 dev-dotnet/ndesk-dbus-glib dev-dotnet/gconf-sharp:2 dev-dotnet/glade-sharp:2 dev-dotnet/glib-sharp:2 dev-dotnet/gtk-sharp:2 >=dev-dotnet/gnome-keyring-sharp-1.0 >=net-misc/openssh-3 >=x11-terms/gnome-terminal-2 rdesktop? ( >=net-misc/rdesktop-1.3 ) vnc? ( >=net-misc/tightvnc-1.2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnome-rdp/gnome-rdp-0.3.0.9.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 mono 3fb22ec265e021c7294a29e720f3d5f7 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=e7cebc74ab602ac71a8c853818736903
diff --git a/metadata/md5-cache/net-misc/goog-sitemapgen-1.5 b/metadata/md5-cache/net-misc/goog-sitemapgen-1.5
deleted file mode 100644
index 1161f943fffd..000000000000
--- a/metadata/md5-cache/net-misc/goog-sitemapgen-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A python script which will generate an XML sitemap for your web site
-EAPI=4
-HOMEPAGE=https://sitemap-generators.googlecode.com/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=https://sitemap-generators.googlecode.com/files/sitemap_gen_1.5.tar.gz
-_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=5790b8179124a4f19ae6c494578c0863
diff --git a/metadata/md5-cache/net-misc/googlecl-0.9.14 b/metadata/md5-cache/net-misc/googlecl-0.9.14
deleted file mode 100644
index 4738f75d3f31..000000000000
--- a/metadata/md5-cache/net-misc/googlecl-0.9.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-DESCRIPTION=Command line tools for the Google Data APIs
-EAPI=3
-HOMEPAGE=https://code.google.com/p/googlecl/
-KEYWORDS=~amd64 ~arm ~x86 ~arm-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/gdata || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-SLOT=0
-SRC_URI=https://googlecl.googlecode.com/files/googlecl-0.9.14.tar.gz
-_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=008aadcce81ce6dc158b9201ec8dbefc
diff --git a/metadata/md5-cache/net-misc/gtkvncviewer-0.4 b/metadata/md5-cache/net-misc/gtkvncviewer-0.4
deleted file mode 100644
index 0253fac8cea7..000000000000
--- a/metadata/md5-cache/net-misc/gtkvncviewer-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=dev-python/gconf-python:2 dev-python/gnome-keyring-python dev-python/pygtk:2 net-libs/gtk-vnc[python] =dev-lang/python-2*
-DESCRIPTION=A small GTK tool to connect to VNC servers
-EAPI=4
-HOMEPAGE=https://launchpad.net/gtkvncviewer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/gconf-python:2 dev-python/gnome-keyring-python dev-python/pygtk:2 net-libs/gtk-vnc[python] =dev-lang/python-2*
-SLOT=0
-SRC_URI=https://launchpad.net/gtkvncviewer/trunk/0.4/+download/gtkvncviewer-0.4.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=b780b2d86fa0311b619996d7812f6b64
diff --git a/metadata/md5-cache/net-misc/identicurse-0.9 b/metadata/md5-cache/net-misc/identicurse-0.9
deleted file mode 100644
index 3b5fb389e104..000000000000
--- a/metadata/md5-cache/net-misc/identicurse-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/setuptools =dev-lang/python-2*
-DESCRIPTION=A simple Identi.ca client with a curses-based UI
-EAPI=4
-HOMEPAGE=http://identicurse.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/oauth =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://identicurse.net/release/0.9/identicurse-0.9.tar.bz2
-_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a596643fd09694922c3f79c9ea94fcb3
diff --git a/metadata/md5-cache/net-misc/kafka-bin-0.10.0.1 b/metadata/md5-cache/net-misc/kafka-bin-0.10.0.1
index 6e39bd7ac42a..a59ecccaef85 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-0.10.0.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-0.10.0.1
@@ -11,4 +11,4 @@ RESTRICT=mirror
SLOT=0
SRC_URI=mirror://apache/kafka/0.10.0.1/kafka_2.11-0.10.0.1.tgz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=eda58f07d766b33755cc96824032ec95
+_md5_=50e136b58dd2269c6aeabaee26eba042
diff --git a/metadata/md5-cache/net-misc/nut-monitor-1.3-r2 b/metadata/md5-cache/net-misc/nut-monitor-1.3-r2
deleted file mode 100644
index 527502cb2acd..000000000000
--- a/metadata/md5-cache/net-misc/nut-monitor-1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A graphical application to monitor and manage UPSes connected to a NUT server
-EAPI=4
-HOMEPAGE=http://www.lestat.st/informatique/projets/nut-monitor-en/
-IUSE=linguas_fr
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygtk dev-python/pynut =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.lestat.st/_media/informatique/projets/nut-monitor/nut-monitor-1.3.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=463f950b90f60c1ee9228d62a62b36ea
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.6.0-r2 b/metadata/md5-cache/net-misc/tigervnc-1.6.0-r2
index 50f875780dcc..233d2a47521d 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.6.0-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.6.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Remote desktop viewer display system
EAPI=6
HOMEPAGE=http://www.tigervnc.org
IUSE=gnutls java +opengl pam server +xorgmodule elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
LICENSE=GPL-2
RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) xorgmodule? ( =x11-base/xorg-server-1.18* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.6.0.tar.gz -> tigervnc-1.6.0.tar.gz mirror://gentoo/tigervnc.png https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.18.4.tar.bz2 )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0687d8a20610e7fd2f40984377f8b168
+_md5_=415ea4b8039df48a4e65c20648953cc4
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
deleted file mode 100644
index 6f6d8102b264..000000000000
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jdk-1.4 ) x11-proto/xextproto x11-proto/xproto server? ( x11-proto/inputproto x11-proto/kbproto x11-proto/printproto ) >=x11-misc/imake-1 x11-misc/gccmakedep x11-misc/makedepend !net-misc/tigervnc java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A great client/server software package allowing remote network access to graphical desktops
-EAPI=5
-HOMEPAGE=http://www.tightvnc.com/
-IUSE=java tcpd server elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~mips ppc ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9fc871be4851c8eb59641db4204cfbcd
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r3 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r3
deleted file mode 100644
index c0587c66ee31..000000000000
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jdk-1.4 ) x11-proto/xextproto x11-proto/xproto server? ( x11-proto/inputproto x11-proto/kbproto x11-proto/printproto ) >=x11-misc/imake-1 x11-misc/gccmakedep x11-misc/makedepend !net-misc/tigervnc java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A great client/server software package allowing remote network access to graphical desktops
-EAPI=5
-HOMEPAGE=http://www.tightvnc.com/
-IUSE=java tcpd server elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=df6e7c3b367cbab333523e74b6a79289
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.2 b/metadata/md5-cache/net-misc/yajhfc-0.5.2
deleted file mode 100644
index e349bad3547e..000000000000
--- a/metadata/md5-cache/net-misc/yajhfc-0.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Yet another Java HylaFAX Plus Client
-EAPI=5
-HOMEPAGE=http://www.yajhfc.de/
-IUSE=elibc_FreeBSD java
-LICENSE=GPL-3
-RDEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://download.yajhfc.de/releases/yajhfc-0_5_2.jar
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=885a8f2adf088e578eabe029b76a28b4
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.7 b/metadata/md5-cache/net-misc/yajhfc-0.5.7
deleted file mode 100644
index c93fa8d54329..000000000000
--- a/metadata/md5-cache/net-misc/yajhfc-0.5.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/gnu-hylafax:0 dev-java/tablelayout:0 >=virtual/jdk-1.6 virtual/pkgconfig app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Yet another Java HylaFAX Plus Client
-EAPI=5
-HOMEPAGE=http://www.yajhfc.de/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-java/gnu-hylafax:0 dev-java/tablelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://download.yajhfc.de/releases/yajhfc-0_5_7-src.zip
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple bdf24e52707f01512ffea6d3aa05425b java-utils-2 9a25f292ff66f8c2c00100ac0b15c54f multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a2847e04c30f6f0c1e568b07017c7c28
diff --git a/metadata/md5-cache/net-nds/389-admin-1.1.31-r1 b/metadata/md5-cache/net-nds/389-admin-1.1.31-r1
deleted file mode 100644
index 7b82087268bf..000000000000
--- a/metadata/md5-cache/net-nds/389-admin-1.1.31-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-apps/sed >=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu:= dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] net-nds/openldap selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] =www-servers/apache-2* !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=389 Directory Server (admin)
-EAPI=5
-HOMEPAGE=http://port389.org/
-IUSE=debug ipv6 selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 Apache-2.0
-RDEPEND=>=app-admin/389-admin-console-1.1.0 >=app-admin/389-ds-console-1.1.0 app-misc/mime-types dev-libs/389-adminutil dev-libs/cyrus-sasl dev-libs/icu:= dev-libs/nss[utils] || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 ) dev-libs/svrcore net-analyzer/net-snmp[ipv6?] net-nds/openldap selinux? ( sys-apps/checkpolicy sys-apps/policycoreutils ) >=sys-libs/db-4.2.52 sys-libs/pam sys-apps/tcp-wrappers[ipv6?] www-apache/mod_nss www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads] www-client/lynx selinux? ( sec-policy/selinux-base-policy ) =www-servers/apache-2*
-SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-admin-1.1.31.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8edef606f1d34ae9162afef6accbe557
diff --git a/metadata/md5-cache/net-print/hplip-3.16.8 b/metadata/md5-cache/net-print/hplip-3.16.8
new file mode 100644
index 000000000000..c257eb7b0570
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.16.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=virtual/jpeg:0 hpijs? ( || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] ) ) >=net-print/cups-1.4.0 !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) virtual/pkgconfig virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=6
+HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+IUSE=doc fax +hpcups hpijs kde -libusb0 minimal parport policykit +qt4 qt5 scanner +snmp static-ppds X python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0 hpijs? ( || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] ) ) >=net-print/cups-1.4.0 !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( >=sys-apps/dbus-1.6.8-r1 ) snmp? ( net-analyzer/net-snmp dev-libs/openssl:0 ) ) >=app-text/ghostscript-gpl-8.71-r3 policykit? ( sys-auth/polkit ) !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-python/pygobject[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] kernel_linux? ( virtual/udev ) scanner? ( >=dev-python/reportlab-3.1.44-r2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( >=dev-python/reportlab-3.1.44-r2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) qt4? ( >=dev-python/PyQt4-4.11.1[dbus,X,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ) !minimal? ( qt4? ( !qt5 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.16.8.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.16.5-patches-1.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 udev 73058269b3e70e34e084fa3981282338 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bceb5520be5aca4311452cffb8117e4d
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.16.8 b/metadata/md5-cache/net-print/hplip-plugin-3.16.8
new file mode 100644
index 000000000000..da91f26de2ea
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.16.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Proprietary plugins and firmware for HPLIP
+EAPI=6
+HOMEPAGE=http://hplipopensource.com/hplip-web/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=hplip-plugin
+RDEPEND=~net-print/hplip-3.16.8 virtual/udev
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-3.16.8-plugin.run
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 udev 73058269b3e70e34e084fa3981282338 unpacker 45d07319df5f40ee6af58418b0f930be
+_md5_=40eff63d1fb3e879d88a7cb7afe365ce
diff --git a/metadata/md5-cache/net-proxy/http-replicator-3.0-r6 b/metadata/md5-cache/net-proxy/http-replicator-3.0-r6
index 031b4b33eb30..fc5558613516 100644
--- a/metadata/md5-cache/net-proxy/http-replicator-3.0-r6
+++ b/metadata/md5-cache/net-proxy/http-replicator-3.0-r6
@@ -4,9 +4,9 @@ DESCRIPTION=Proxy cache for Gentoo packages
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/http-replicator
IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ~ppc ~sparc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/http-replicator/http-replicator_3.0.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=8507c39a3b26e49a71831cf8d7dd3fc2
+_md5_=504b10a1d3e9b3a38618352c9deecd35
diff --git a/metadata/md5-cache/sci-physics/mpb-1.4.2-r2 b/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
deleted file mode 100644
index 7c900d2786cf..000000000000
--- a/metadata/md5-cache/sci-physics/mpb-1.4.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Photonic band structure program
-EAPI=4
-HOMEPAGE=http://ab-initio.mit.edu/mpb/
-IUSE=doc examples hdf5 mpi
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=http://ab-initio.mit.edu/mpb/mpb-1.4.2.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=c448264ce0ecd5443cf2f108c35189f6
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-14 b/metadata/md5-cache/sys-boot/efibootmgr-14
new file mode 100644
index 000000000000..0be6a31440d6
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/efibootmgr-14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
+DESCRIPTION=User-space application to modify the EFI boot manager
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/efibootmgr
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/efibootmgr/releases/download/14/efibootmgr-14.tar.bz2
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=b20c92894a1878265b5129d274d3c061
diff --git a/metadata/md5-cache/sys-boot/gummiboot-45 b/metadata/md5-cache/sys-boot/gummiboot-45
deleted file mode 100644
index 4c916499ebe5..000000000000
--- a/metadata/md5-cache/sys-boot/gummiboot-45
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare pretend setup
-DEPEND=sys-apps/util-linux app-arch/xz-utils app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-boot/gnu-efi-3.0.2
-DESCRIPTION=Minimalistic UEFI bootloader
-EAPI=5
-HOMEPAGE=https://freedesktop.org/wiki/Software/gummiboot/
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=sys-apps/util-linux
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/gummiboot-45.tar.xz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1d16cd0a19bfe3609b1018e425f689f2
diff --git a/metadata/md5-cache/sys-boot/gummiboot-48 b/metadata/md5-cache/sys-boot/gummiboot-48
deleted file mode 100644
index f28ee6df8f01..000000000000
--- a/metadata/md5-cache/sys-boot/gummiboot-48
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare pretend setup
-DEPEND=sys-apps/util-linux app-arch/xz-utils app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-boot/gnu-efi-3.0.2 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
-DESCRIPTION=Minimalistic UEFI bootloader
-EAPI=6
-HOMEPAGE=https://freedesktop.org/wiki/Software/gummiboot/
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+
-RDEPEND=sys-apps/util-linux
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~floppym/dist/gummiboot-48.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=861b5b61a0ec3509f530a88d8b4b4d37
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index bff7797032b4..fb0044719c7c 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=~sys-devel/llvm-9999:=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
+DEPEND=~sys-devel/llvm-9999:=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) test? ( dev-python/lit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( virtual/pkgconfig ) !!=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
DESCRIPTION=C language family frontend for LLVM
EAPI=6
HOMEPAGE=http://llvm.org/
@@ -10,4 +10,4 @@ RDEPEND=~sys-devel/llvm-9999:=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?
REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
SLOT=0/9999
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4f096b40e0968a73a1c272002d8c9aa6
+_md5_=8a58fcbc50fdfaab0e516b5e4c7a4bb7
diff --git a/metadata/md5-cache/sys-devel/llvm-3.9.0 b/metadata/md5-cache/sys-devel/llvm-3.9.0
index 0dfad742716c..8c9bd6448165 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.9.0
+++ b/metadata/md5-cache/sys-devel/llvm-3.9.0
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml ) || ( llvm_targets_AArc
SLOT=0/3.9.0
SRC_URI=http://llvm.org/releases/3.9.0/llvm-3.9.0.src.tar.xz clang? ( http://llvm.org/releases/3.9.0/compiler-rt-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/cfe-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/clang-tools-extra-3.9.0.src.tar.xz ) lldb? ( http://llvm.org/releases/3.9.0/lldb-3.9.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~mgorny/dist/llvm-3.9.0_rc3-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f prefix 99dcca42e6528d8fe3c214bf5731aaf2 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b8821567418d1b38d90463198f1543e
+_md5_=83f3cc4fa72af5c78490514479a98961
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 950fdec6afe7..b474e319fa33 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.6.1-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !!=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.6.1-r1 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Low Level Virtual Machine
EAPI=6
HOMEPAGE=http://llvm.org/
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
SLOT=0/9999
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=549aa1e5956f262d85274b892d9ee87e
+_md5_=367435dd1459a308c3baf4fa7e8966fc
diff --git a/metadata/md5-cache/sys-devel/qconf-2.0 b/metadata/md5-cache/sys-devel/qconf-2.0
index 707a1e5638c7..d51d746feb65 100644
--- a/metadata/md5-cache/sys-devel/qconf-2.0
+++ b/metadata/md5-cache/sys-devel/qconf-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=./configure like generator for qmake-based projects
EAPI=6
HOMEPAGE=http://delta.affinix.com/qconf/
IUSE=+qt4 qt5
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtxml:5 )
REQUIRED_USE=^^ ( qt4 qt5 )
SLOT=0
SRC_URI=http://delta.affinix.com/download/qconf-2.0.tar.bz2
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=dc3b930520f488eb56b3c71ced972182
+_md5_=0d49b8b8c72a6b3ab6612f825a225aa0
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.6.1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.6.1
index 9a788798a8c1..3d75261ed1ce 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.6.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Btrfs filesystem utilities
EAPI=6
HOMEPAGE=https://btrfs.wiki.kernel.org
IUSE=+convert static static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= )
RESTRICT=test
SLOT=0/0
SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.6.1.tar.xz
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ec1c5df6a8ea7bd1215f7755c4d4037a
+_md5_=da77b427ab7e495f09a5d6002f0d7db7
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.7 b/metadata/md5-cache/sys-fs/fuse-2.9.7
index eca224a36bfe..25280e09ac67 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.7
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=An interface for filesystems implemented in userspace
EAPI=6
HOMEPAGE=https://github.com/libfuse/libfuse
IUSE=examples kernel_linux kernel_FreeBSD static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
SLOT=0
SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 udev 73058269b3e70e34e084fa3981282338 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f5c136c8dbd2ccd5a8b515f981e67fd6
+_md5_=e1c17ff67db21e0ebe747cc717a35bef
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20160331 b/metadata/md5-cache/sys-kernel/linux-firmware-20160331
index 65ec85d6c5fb..f37f54466e45 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20160331
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20160331
@@ -3,10 +3,10 @@ DESCRIPTION=Linux firmware files
EAPI=5
HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
IUSE=savedconfig savedconfig
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist
RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !=sys-kernel/linux-headers-3.18
+DESCRIPTION=Tools and library to manipulate EFI variables
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/efivar
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt
+SLOT=0/1
+SRC_URI=https://github.com/rhinstaller/efivar/archive/30.tar.gz -> efivar-30.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
+_md5_=686ab9e3db9f4e83c88a593490cdb6df
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.5.2 b/metadata/md5-cache/sys-libs/freeipmi-1.5.4
similarity index 91%
rename from metadata/md5-cache/sys-libs/freeipmi-1.5.2
rename to metadata/md5-cache/sys-libs/freeipmi-1.5.4
index 82442e19e8c7..f08e5b670ce9 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.5.2
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.5.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl ) sys-apps/openrc
SLOT=0
-SRC_URI=mirror://gnu/freeipmi/freeipmi-1.5.2.tar.gz
+SRC_URI=mirror://gnu/freeipmi/freeipmi-1.5.4.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
_md5_=29c7b7bc06b096c4b021bbc491809cc4
diff --git a/metadata/md5-cache/sys-libs/libomp-9999 b/metadata/md5-cache/sys-libs/libomp-9999
index 1f06942d4f2c..88288f214a18 100644
--- a/metadata/md5-cache/sys-libs/libomp-9999
+++ b/metadata/md5-cache/sys-libs/libomp-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm sys-devel/clang[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/ninja >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-lang/perl test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-devel/llvm >=sys-devel/clang-3.9.0 ) dev-util/ninja >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
EAPI=6
HOMEPAGE=http://openmp.llvm.org
@@ -8,4 +8,4 @@ LICENSE=UoI-NCSA
RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
_eclasses_=cmake-multilib 273c15f5a0a06438a38bb5c3e98fa2db cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3ccda395a1f37dcab87ad8dd62ba5251
+_md5_=fd17b1e6a83c7792161fc6199327f5fd
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-1.0.18 b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.18
new file mode 100644
index 000000000000..6a2c5c605017
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-1.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=C library for developing embedded Linux systems
+EAPI=6
+HOMEPAGE=http://www.uclibc-ng.org/
+IUSE=debug hardened iconv ipv6 rpc crosscompile_opts_headers-only savedconfig
+KEYWORDS=-* ~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://downloads.uclibc-ng.org/releases/1.0.18/uClibc-ng-1.0.18.tar.bz2
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 portability bb1a0ed8ea152b957d17339f01d4d7f5 savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9dc0a85435e6f8b089f7907161ea691c
diff --git a/metadata/md5-cache/sys-libs/uclibc-ng-9999 b/metadata/md5-cache/sys-libs/uclibc-ng-9999
index 699bc8bf488f..58c52ab2c1f2 100644
--- a/metadata/md5-cache/sys-libs/uclibc-ng-9999
+++ b/metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -9,4 +9,4 @@ RDEPEND=!!sys-libs/uclibc iconv? ( dev-libs/libiconv )
RESTRICT=strip
SLOT=0
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 00f60a84fc7b499c99edfe99caea9f95 multilib 165fc17c38d1b11dac2008280dab6e80 portability bb1a0ed8ea152b957d17339f01d4d7f5 savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3dba7affbbcf0eba8bb1566fcc9283b8
+_md5_=9dc0a85435e6f8b089f7907161ea691c
diff --git a/metadata/md5-cache/sys-power/cpuspeedy-0.4.1 b/metadata/md5-cache/sys-power/cpuspeedy-0.4.1
deleted file mode 100644
index 4f7dec50e460..000000000000
--- a/metadata/md5-cache/sys-power/cpuspeedy-0.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A simple and easy to use program to control the speed and the voltage of CPUs on the fly
-EAPI=3
-HOMEPAGE=http://cpuspeedy.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/cpuspeedy/cpuspeedy-0.4.1.tar.gz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=b82b6899a0c938ac9dab7b432bdfc852
diff --git a/metadata/md5-cache/www-apache/mod_anonymize_ip-0.3.1 b/metadata/md5-cache/www-apache/mod_anonymize_ip-0.3.1
deleted file mode 100644
index 0fbe7e525fef..000000000000
--- a/metadata/md5-cache/www-apache/mod_anonymize_ip-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=mod_anonymize_ip is a simple module for anonymizing the client IP address
-EAPI=4
-HOMEPAGE=https://github.com/hollow/mod_anonymize_ip
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=https://nodeload.github.com/hollow/mod_anonymize_ip/tarball/v0.3.1 -> mod_anonymize_ip-0.3.1.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=e238619421be6e50a4f562601fd765d0
diff --git a/metadata/md5-cache/www-apache/mod_auth_cookie_mysql2-1.0 b/metadata/md5-cache/www-apache/mod_auth_cookie_mysql2-1.0
deleted file mode 100644
index fb562c347dae..000000000000
--- a/metadata/md5-cache/www-apache/mod_auth_cookie_mysql2-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=virtual/mysql =www-servers/apache-2.2*
-DESCRIPTION=An Apache2 backend authentication module that uses cookies and MySQL
-EAPI=0
-HOMEPAGE=http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/mysql =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/mod_auth_cookie_mysql2_1.0.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=76f6662b165fc71154f1e98a2df6e002
diff --git a/metadata/md5-cache/www-apache/mod_auth_imap2-2.2.0 b/metadata/md5-cache/www-apache/mod_auth_imap2-2.2.0
deleted file mode 100644
index e5c2aa3e24b3..000000000000
--- a/metadata/md5-cache/www-apache/mod_auth_imap2-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2*
-DESCRIPTION=An Apache2 module to provide authentication via an IMAP Mail server
-EAPI=0
-HOMEPAGE=http://ben.brillat.net/projects/mod_auth_imap/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==www-servers/apache-2*
-SLOT=0
-SRC_URI=http://ben.brillat.net/files/projects/mod_auth_imap2/mod_auth_imap2-2.2.0.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=50b586f4637100226c66541e24d59a37
diff --git a/metadata/md5-cache/www-apache/mod_auth_mysql-3.0.0-r3 b/metadata/md5-cache/www-apache/mod_auth_mysql-3.0.0-r3
deleted file mode 100644
index 3afcd5872a3d..000000000000
--- a/metadata/md5-cache/www-apache/mod_auth_mysql-3.0.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/mysql sys-libs/zlib =www-servers/apache-2.2*
-DESCRIPTION=Basic authentication for Apache using a MySQL database
-EAPI=2
-HOMEPAGE=http://modauthmysql.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=Apache-1.1
-RDEPEND=virtual/mysql sys-libs/zlib !www-apache/mod-auth-mysql =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=mirror://sourceforge/modauthmysql/mod_auth_mysql-3.0.0.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=486cb8f9d336388f5c070adc74b85167
diff --git a/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2 b/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2
deleted file mode 100644
index a58d861ed9c4..000000000000
--- a/metadata/md5-cache/www-apache/mod_auth_nufw-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) =www-servers/apache-2.2* !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A NuFW authentication module for Apache
-EAPI=2
-HOMEPAGE=http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw
-IUSE=+mysql postgres
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://software.inl.fr/releases/mod_auth_nufw/mod_auth_nufw-2.2.2.tar.bz2
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d autotools 07e71b3b5690738ef7e8bc097077e00c confutils 18995f74ac4ffafb7ad853dfe133f209 depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=59622e055dfd9dab08db52e79df10af7
diff --git a/metadata/md5-cache/www-apache/mod_auth_token-1.0.6_beta b/metadata/md5-cache/www-apache/mod_auth_token-1.0.6_beta
deleted file mode 100644
index 1eff946a9545..000000000000
--- a/metadata/md5-cache/www-apache/mod_auth_token-1.0.6_beta
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=Token based URI access module for Apache2
-EAPI=3
-HOMEPAGE=https://code.google.com/p/mod-auth-token/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=https://mod-auth-token.googlecode.com/files/mod_auth_token-1.0.6-beta.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=103b2bb4615f9c6e47fbb56efed6340b
diff --git a/metadata/md5-cache/www-apache/mod_cband-0.9.7.5 b/metadata/md5-cache/www-apache/mod_cband-0.9.7.5
deleted file mode 100644
index 7b5cdcfe1254..000000000000
--- a/metadata/md5-cache/www-apache/mod_cband-0.9.7.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=Apache2 bandwidth quota and throttling module
-EAPI=0
-HOMEPAGE=http://codee.pl/cband.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://cband.linux.pl/download/mod-cband-0.9.7.5.tgz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=1550b3bd0f7b434a0b153a6590860e4b
diff --git a/metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141 b/metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141
deleted file mode 100644
index e5a3eb71fd8e..000000000000
--- a/metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=FastCGI is a open extension to CGI without the limitations of server specific APIs
-EAPI=0
-HOMEPAGE=http://fastcgi.com/
-KEYWORDS=amd64 x86
-LICENSE=mod_fastcgi
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://www.fastcgi.com/dist/mod_fastcgi-SNAP-0910052141.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=5c85fad05ec7db5462930c70d6fa664f
diff --git a/metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141-r1 b/metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141-r1
deleted file mode 100644
index 19ba14a7d74e..000000000000
--- a/metadata/md5-cache/www-apache/mod_fastcgi-2.4.7_pre0910052141-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND==www-servers/apache-2*
-DESCRIPTION=FastCGI is a open extension to CGI without the limitations of server specific APIs
-EAPI=5
-HOMEPAGE=http://fastcgi.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=mod_fastcgi
-RDEPEND==www-servers/apache-2*
-SLOT=0
-SRC_URI=http://www.fastcgi.com/dist/mod_fastcgi-SNAP-0910052141.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=c97811568b031ffacb8d41717bc2690c
diff --git a/metadata/md5-cache/www-apache/mod_ftpd-0.14-r1 b/metadata/md5-cache/www-apache/mod_ftpd-0.14-r1
deleted file mode 100644
index 209d0b6b3082..000000000000
--- a/metadata/md5-cache/www-apache/mod_ftpd-0.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dbi? ( dev-db/libdbi ) gdbm? ( sys-libs/gdbm ) =www-servers/apache-2.2*
-DESCRIPTION=Apache2 module which provides an FTP server
-EAPI=2
-HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_ftpd/
-IUSE=dbi gdbm
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dbi? ( dev-db/libdbi ) gdbm? ( sys-libs/gdbm ) =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://www.outoforder.cc/downloads/mod_ftpd/mod_ftpd-0.14.tar.bz2
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=cd5a43bb01ff364073f7f5262befb335
diff --git a/metadata/md5-cache/www-apache/mod_layout-5.1 b/metadata/md5-cache/www-apache/mod_layout-5.1
deleted file mode 100644
index 0a1e01282dba..000000000000
--- a/metadata/md5-cache/www-apache/mod_layout-5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=An Apache2 module for adding custom headers and/or footers
-EAPI=0
-HOMEPAGE=http://tangent.org/index.pl?node_id=362
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND==www-servers/apache-2.2*
-SLOT=2
-SRC_URI=http://download.tangent.org/mod_layout-5.1.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=5927d64a83e80d0295829f6d0f473854
diff --git a/metadata/md5-cache/www-apache/mod_loadavg-0.0.1 b/metadata/md5-cache/www-apache/mod_loadavg-0.0.1
deleted file mode 100644
index a2679ad40e0b..000000000000
--- a/metadata/md5-cache/www-apache/mod_loadavg-0.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=Apache module executing CGI-Requests depending on the load of the server
-EAPI=0
-HOMEPAGE=http://defunced.de/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-1.1
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=mirror://gentoo/mod_loadavg-0.0.1.c
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=2f22ba7e21feec25052471ab0f2e8dfc
diff --git a/metadata/md5-cache/www-apache/mod_perl-2.0.10_rc1 b/metadata/md5-cache/www-apache/mod_perl-2.0.10_rc1
new file mode 100644
index 000000000000..66339c4f005d
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_perl-2.0.10_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=dev-perl/Apache-Test-1.400.0 >=www-servers/apache-2.0.47 apache2_mpms_event? ( dev-lang/perl[ithreads] ) apache2_mpms_worker? ( dev-lang/perl[ithreads] ) !apache2_mpms_event? ( !apache2_mpms_worker? ( !apache2_mpms_prefork? ( dev-lang/perl[ithreads] ) ) ) dev-perl/Module-Build test? ( >=dev-perl/CGI-3.110.0 dev-perl/Chatbot-Eliza dev-perl/Devel-Symdump dev-perl/HTML-Parser dev-perl/IPC-Run3 dev-perl/libwww-perl www-servers/apache[apache2_modules_version,-apache2_modules_unique_id] ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
+DESCRIPTION=An embedded Perl interpreter for Apache2
+EAPI=5
+HOMEPAGE=https://perl.apache.org/
+IUSE=debug test apache2_mpms_event apache2_mpms_worker apache2_mpms_prefork
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+PDEPEND=>=dev-perl/Apache-Reload-0.130.0 >=dev-perl/Apache-SizeLimit-0.970.0
+RDEPEND=>=dev-perl/Apache-Test-1.400.0 >=www-servers/apache-2.0.47 apache2_mpms_event? ( dev-lang/perl[ithreads] ) apache2_mpms_worker? ( dev-lang/perl[ithreads] ) !apache2_mpms_event? ( !apache2_mpms_worker? ( !apache2_mpms_prefork? ( dev-lang/perl[ithreads] ) ) ) =www-servers/apache-2* dev-lang/perl:=[-build(-)]
+SLOT=1
+SRC_URI=https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz
+_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce toolchain-funcs 6198c04daba0e1307bd844df7d37f423 unpacker 45d07319df5f40ee6af58418b0f930be
+_md5_=0ff7229586f6f62b375796053d6c7a92
diff --git a/metadata/md5-cache/www-apache/mod_proxy_fcgi-0_p816361 b/metadata/md5-cache/www-apache/mod_proxy_fcgi-0_p816361
deleted file mode 100644
index 7d054d4a0056..000000000000
--- a/metadata/md5-cache/www-apache/mod_proxy_fcgi-0_p816361
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=mod_proxy_fcgi is a FastCGI protocol handler for mod_proxy
-EAPI=0
-HOMEPAGE=https://httpd.apache.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~hollow/distfiles/mod_proxy_fcgi-0_p816361.tar.bz2
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=cc426d903ea9c0d273dd17ff6a783c95
diff --git a/metadata/md5-cache/www-apache/mod_proxy_html-3.1.2 b/metadata/md5-cache/www-apache/mod_proxy_html-3.1.2
deleted file mode 100644
index f7eb10064b71..000000000000
--- a/metadata/md5-cache/www-apache/mod_proxy_html-3.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=app-arch/bzip2 dev-libs/libxml2 >=www-apache/mod_xml2enc-1.0.3 =www-servers/apache-2*
-DESCRIPTION=An Apache2 module to rewrite links in html pages behind a reverse proxy
-EAPI=0
-HOMEPAGE=http://apache.webthing.com/mod_proxy_html/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/libxml2 >=www-apache/mod_xml2enc-1.0.3 =www-servers/apache-2*
-SLOT=0
-SRC_URI=http://apache.webthing.com/mod_proxy_html/mod_proxy_html-3.1.2.tar.bz2
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=fdb6b05835be7c1f70889f41bba6c870
diff --git a/metadata/md5-cache/www-apache/mod_slotlimit-1.3 b/metadata/md5-cache/www-apache/mod_slotlimit-1.3
deleted file mode 100644
index 41fbdac76a4a..000000000000
--- a/metadata/md5-cache/www-apache/mod_slotlimit-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2.2*
-DESCRIPTION=manage resources used for each running site using dynamic slot allocation algorithm and static rules
-EAPI=3
-HOMEPAGE=http://www.lucaercoli.it/en/mod_slotlimit.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==www-servers/apache-2.2*
-SLOT=0
-SRC_URI=http://downloads.sourceforge.net/project/mod-slotlimit/mod-slotlimit/1.3/mod_slotlimit-1.3.tar.gz
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=800f1e4d175a3454a520da58623e7d68
diff --git a/metadata/md5-cache/www-apache/mod_tcl-1.0.1 b/metadata/md5-cache/www-apache/mod_tcl-1.0.1
deleted file mode 100644
index 97652ca6d554..000000000000
--- a/metadata/md5-cache/www-apache/mod_tcl-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=dev-lang/tcl =www-servers/apache-2.2*
-DESCRIPTION=An Apache2 module providing an embedded Tcl interpreter
-EAPI=0
-HOMEPAGE=http://tcl.apache.org/mod_tcl/
-KEYWORDS=~amd64 ppc x86
-LICENSE=Apache-1.1
-RDEPEND=dev-lang/tcl =www-servers/apache-2.2*
-SLOT=0
-SRC_URI=mirror://gentoo/mod_tcl-1.0.1.tar.bz2
-_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d depend.apache d86176876ab66b0d5239c0097903a1b2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=d682d83f5830c51acf56dda970404667
diff --git a/metadata/md5-cache/www-apps/389-dsgw-1.1.10 b/metadata/md5-cache/www-apps/389-dsgw-1.1.10
deleted file mode 100644
index 51710e0cf867..000000000000
--- a/metadata/md5-cache/www-apps/389-dsgw-1.1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu:= dev-libs/389-adminutil net-nds/openldap !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=389 Directory Server Gateway Web Application
-EAPI=5
-HOMEPAGE=http://port389.org/
-IUSE=debug +adminserver
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/icu:= dev-libs/389-adminutil net-nds/openldap dev-perl/perl-mozldap dev-perl/CGI
-SLOT=0
-SRC_URI=http://directory.fedoraproject.org/sources/389-dsgw-1.1.10.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=473065aea4a61b5bccdaf7f301cbf424
diff --git a/metadata/md5-cache/www-apps/airdcpp-webui-1.2.0 b/metadata/md5-cache/www-apps/airdcpp-webui-1.3.1
similarity index 83%
rename from metadata/md5-cache/www-apps/airdcpp-webui-1.2.0
rename to metadata/md5-cache/www-apps/airdcpp-webui-1.3.1
index f5b5d5056687..3f5820eceeca 100644
--- a/metadata/md5-cache/www-apps/airdcpp-webui-1.2.0
+++ b/metadata/md5-cache/www-apps/airdcpp-webui-1.3.1
@@ -4,7 +4,7 @@ EAPI=6
HOMEPAGE=https://airdcpp-web.github.io/
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND==net-p2p/airdcpp-webclient-1.2*
+RDEPEND==net-p2p/airdcpp-webclient-1.3*
SLOT=0
-SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-1.2.0.tgz
+SRC_URI=https://registry.npmjs.org/airdcpp-webui/-/airdcpp-webui-1.3.1.tgz
_md5_=9a778418ac35e7f4b2cbe9b5f3f0c702
diff --git a/metadata/md5-cache/www-client/links-2.12-r2 b/metadata/md5-cache/www-client/links-2.12-r2
index 7f6ff7b4b6ec..4aea4bd5379b 100644
--- a/metadata/md5-cache/www-client/links-2.12-r2
+++ b/metadata/md5-cache/www-client/links-2.12-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A fast and lightweight web browser running in both graphics and text
EAPI=5
HOMEPAGE=http://links.twibright.com/
IUSE=bzip2 directfb fbcon gpm ipv6 jpeg libressl livecd lzma ssl suid svga tiff unicode X zlib
-KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=bzip2? ( app-arch/bzip2 ) directfb? ( media-libs/libpng:0= dev-libs/DirectFB ) fbcon? ( media-libs/libpng:0= ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib )
REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
SLOT=2
SRC_URI=http://links.twibright.com/download/links-2.12.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.10-2.debian.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=43bbd323638a13c0cd81ca3f55633fc8
+_md5_=022c4671c15d68f40661f6f9f54833a1
diff --git a/metadata/md5-cache/www-misc/reflector-2011.05.13.1 b/metadata/md5-cache/www-misc/reflector-2011.05.13.1
deleted file mode 100644
index 1a2517cda365..000000000000
--- a/metadata/md5-cache/www-misc/reflector-2011.05.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=archlinux's take on mirrorselect
-EAPI=3
-HOMEPAGE=http://xyne.archlinux.ca/projects/reflector/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=|| ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://xyne.archlinux.ca/src/reflector-2011.05.13.1.tar.gz
-_eclasses_=distutils ad9e4720eb3e69090dd968b152fc611b eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ed173bc2a7757b9de2b41b755535e782
diff --git a/metadata/md5-cache/www-servers/webfs-1.21-r3 b/metadata/md5-cache/www-servers/webfs-1.21-r3
deleted file mode 100644
index bf7e058dc7e6..000000000000
--- a/metadata/md5-cache/www-servers/webfs-1.21-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Lightweight HTTP server for static content
-EAPI=5
-HOMEPAGE=http://linux.bytesex.org/misc/webfs.html
-IUSE=ssl threads
-KEYWORDS=amd64 ppc x86 ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl:0= ) app-misc/mime-types
-SLOT=0
-SRC_URI=http://dl.bytesex.org/releases/webfs/webfs-1.21.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=022c55a570245e5f3f0cce7aa5d72df3
diff --git a/metadata/md5-cache/www-servers/webfs-1.21-r5 b/metadata/md5-cache/www-servers/webfs-1.21-r5
deleted file mode 100644
index 3ca50a87bbea..000000000000
--- a/metadata/md5-cache/www-servers/webfs-1.21-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
-DESCRIPTION=Lightweight HTTP server for static content
-EAPI=5
-HOMEPAGE=http://linux.bytesex.org/misc/webfs.html
-IUSE=libressl ssl threads
-KEYWORDS=~amd64 ~ppc ~x86 ~arm-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) app-misc/mime-types
-SLOT=0
-SRC_URI=http://dl.bytesex.org/releases/webfs/webfs-1.21.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=4695aa77fe5d9e84dd529467a16104b3
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.2 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.2
deleted file mode 100644
index 9880b2bd5bef..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev >=x11-proto/inputproto-2.1.99.3 >=sys-kernel/linux-headers-2.6 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
-DESCRIPTION=Generic Linux input driver
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev x11-base/xorg-server:= x11-base/xorg-server[xorg]
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.10.2.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xorg-2 b41f09eee8d441f780b7413dba7e120b
-_md5_=25943fbd5689b81ff10c8f5c945e30be
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.1 b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.4
similarity index 98%
rename from metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.1
rename to metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.4
index a9bdf7b44fac..0f7138a67889 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.4
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
LICENSE=MIT
RDEPEND=>=x11-base/xorg-server-1.18[udev] dev-libs/libevdev sys-libs/mtdev x11-base/xorg-server:= x11-base/xorg-server[xorg]
SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.10.1.tar.bz2
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.10.4.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xorg-2 b41f09eee8d441f780b7413dba7e120b
_md5_=25943fbd5689b81ff10c8f5c945e30be
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.20.0
similarity index 83%
rename from metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0
rename to metadata/md5-cache/x11-drivers/xf86-input-libinput-0.20.0
index f0fbd1c70195..0d9ef628666e 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.18.0
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.20.0
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/libinput-1.2.0:0= !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
+DEPEND=>=dev-libs/libinput-1.5.0:0= !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/inputproto x11-proto/kbproto x11-proto/xproto x11-base/xorg-server[xorg]
DESCRIPTION=X.org input driver based on libinput
EAPI=5
HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
LICENSE=MIT
-RDEPEND=>=dev-libs/libinput-1.2.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
+RDEPEND=>=dev-libs/libinput-1.5.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-0.18.0.tar.bz2
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-input-libinput-0.20.0.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xorg-2 b41f09eee8d441f780b7413dba7e120b
-_md5_=fd3bf6ff041856ed5d983e513e37b75d
+_md5_=db48a5c80b817e5b4fc11ac35c71ebcb
diff --git a/metadata/md5-cache/x11-libs/fxscintilla-3.3.5 b/metadata/md5-cache/x11-libs/fxscintilla-3.3.5
deleted file mode 100644
index 0a580e02d003..000000000000
--- a/metadata/md5-cache/x11-libs/fxscintilla-3.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A free source code editing component for the FOX-Toolkit
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/fxscintilla/
-IUSE=doc
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 )
-SLOT=0
-SRC_URI=https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-3_3_5.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=12b486926ade168a119482ad68e62c5c
diff --git a/metadata/md5-cache/x11-libs/libsvg-cairo-0.1.6 b/metadata/md5-cache/x11-libs/libsvg-cairo-0.1.6
deleted file mode 100644
index 3be98cc3057a..000000000000
--- a/metadata/md5-cache/x11-libs/libsvg-cairo-0.1.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/cairo media-libs/libsvg virtual/pkgconfig
-DESCRIPTION=Render SVG content using cairo
-EAPI=0
-HOMEPAGE=http://cairographics.org
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2
-RDEPEND=x11-libs/cairo media-libs/libsvg
-SLOT=0
-SRC_URI=http://cairographics.org/snapshots/libsvg-cairo-0.1.6.tar.gz
-_md5_=c726c976bf3b7675a26903b8cdeaf5d9
diff --git a/metadata/md5-cache/x11-misc/ardesia-1.0 b/metadata/md5-cache/x11-misc/ardesia-1.0
deleted file mode 100644
index 7c7326a1c17b..000000000000
--- a/metadata/md5-cache/x11-misc/ardesia-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 gnome-extra/libgsf cwiid? ( app-misc/cwiid ) x11-misc/xdg-utils
-DESCRIPTION=Color, record and share free-hand annotations on screen and on network
-EAPI=4
-HOMEPAGE=https://code.google.com/p/ardesia/
-IUSE=cwiid
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 gnome-extra/libgsf cwiid? ( app-misc/cwiid )
-SLOT=0
-SRC_URI=https://ardesia.googlecode.com/files/ardesia-1.0.tar.bz2
-_md5_=dab7d7761713929be2bc6193ee1f3c51
diff --git a/metadata/md5-cache/x11-misc/denu-2.3.2-r1 b/metadata/md5-cache/x11-misc/denu-2.3.2-r1
deleted file mode 100644
index ab1967d54348..000000000000
--- a/metadata/md5-cache/x11-misc/denu-2.3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-python/pygtk-2.4.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=A menu generation program for fluxbox, waimea, openbox, icewm, gnome and kde
-EAPI=3
-HOMEPAGE=http://denu.sourceforge.net
-KEYWORDS=amd64 hppa ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/pygtk-2.4.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://sourceforge/denu/denu-2.3.2.tar.bz2
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 python efc1c55fc44c5b7272fc2ffba73c3e6f toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=a88c731341f6b6bc692261d971836a01
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.4 b/metadata/md5-cache/x11-misc/obconf-2.0.4
index 2b5e991222cf..1a2c84181b71 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.4
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=ObConf is a tool for configuring the Openbox window manager
EAPI=5
HOMEPAGE=http://openbox.org/wiki/ObConf:About
IUSE=nls
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.2
SLOT=0
SRC_URI=http://openbox.org/dist/obconf/obconf-2.0.4.tar.gz
_eclasses_=fdo-mime 92d07846ea8ea54172f8c0112a47ae3d
-_md5_=5c3fb7437af999c48118760605a99fef
+_md5_=e76b41fc63a9cc53f633dc450bc0c95a
diff --git a/metadata/md5-cache/x11-misc/xac-0.6_pre4 b/metadata/md5-cache/x11-misc/xac-0.6_pre4
deleted file mode 100644
index 61bb03188726..000000000000
--- a/metadata/md5-cache/x11-misc/xac-0.6_pre4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/python-2.3 sys-apps/pciutils
-DESCRIPTION=Xorgautoconfig (xac) generates configuration files for X.org
-EAPI=0
-HOMEPAGE=https://dev.gentoo.org/~josejx/xac.html
-IUSE=livecd
-KEYWORDS=~amd64 ppc ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.3 x11-base/xorg-server
-SLOT=0
-SRC_URI=mirror://gentoo/xac-0.6_pre4.tar.bz2
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=1424cc7d49a5552dce218983a2861bef
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.19 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.19
new file mode 100644
index 000000000000..bafdfb4e52d3
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=!=x11-proto/xproto-7.0.20 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X keyboard configuration database
+EAPI=5
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=5
-HOMEPAGE=http://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc
-SLOT=0
-SRC_URI=ftp://invisible-island.net/xterm/xterm-324.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=759522435d0fefe5b627ba842ab07287
diff --git a/metadata/md5-cache/x11-terms/xterm-323 b/metadata/md5-cache/x11-terms/xterm-326
similarity index 77%
rename from metadata/md5-cache/x11-terms/xterm-323
rename to metadata/md5-cache/x11-terms/xterm-326
index c860f61c8931..2329075bb575 100644
--- a/metadata/md5-cache/x11-terms/xterm-323
+++ b/metadata/md5-cache/x11-terms/xterm-326
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
+DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto
DESCRIPTION=Terminal Emulator for X Windows
EAPI=5
HOMEPAGE=http://invisible-island.net/xterm/
-IUSE=+openpty toolbar truetype unicode Xaw3d
+IUSE=+openpty toolbar truetype unicode Xaw3d xinerama
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc
+RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc
SLOT=0
-SRC_URI=ftp://invisible-island.net/xterm/xterm-323.tgz
+SRC_URI=ftp://invisible-island.net/xterm/xterm-326.tgz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=759522435d0fefe5b627ba842ab07287
+_md5_=92a9f86401300ad86f269b1052d06e53
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1 b/metadata/md5-cache/x11-wm/openbox-3.6.1
index 870435eddc2a..f3e2009b7d11 100644
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
EAPI=5
HOMEPAGE=http://openbox.org/
IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
REQUIRED_USE=xdg? ( || ( python_targets_python2_7 ) )
SLOT=3
SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=4b12ace0fdfbb6bf9dd7f1eba51b9a92
+_md5_=758c50cdb1a286456075fabb7355c7ae
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.7 b/metadata/md5-cache/x11-wm/windowmaker-0.95.7
index 4e1f8b03d5c6..1244b6f543d2 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.7
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.7
@@ -4,10 +4,10 @@ DESCRIPTION=The fast and light GNUstep window manager
EAPI=5
HOMEPAGE=http://www.windowmaker.org/
IUSE=gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr
-KEYWORDS=alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) imagemagick? ( media-gfx/imagemagick ) jpeg? ( virtual/jpeg:0= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 ) !app-i18n/scim-anthy[gtk3]
SLOT=0
SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.7.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 6198c04daba0e1307bd844df7d37f423
-_md5_=ccf4b6cfae05bc44de1896dd7d63af0d
+_md5_=afb52f6700b0eab958644ae95c7a5dd6
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 16ff45c89bf3..8b462d2c0214 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2016 06:40:41 +0000
+Sat, 01 Oct 2016 13:40:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7bd5c0b52f6d..1fff73762f83 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Oct 1 06:39:46 UTC 2016
+Sat Oct 1 13:39:43 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d8b8c7e6051b..c7fa4d06f185 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2016 07:00:01 +0000
+Sat, 01 Oct 2016 14:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 56147b0eca0e..7cbf499df713 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1475304002 Sat 01 Oct 2016 06:40:02 AM UTC
+1475329201 Sat 01 Oct 2016 01:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 16ff45c89bf3..8b462d2c0214 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 01 Oct 2016 06:40:41 +0000
+Sat, 01 Oct 2016 13:40:38 +0000
diff --git a/net-analyzer/bmon/bmon-3.9.ebuild b/net-analyzer/bmon/bmon-3.9.ebuild
index be66f1238280..a8845a409c4f 100644
--- a/net-analyzer/bmon/bmon-3.9.ebuild
+++ b/net-analyzer/bmon/bmon-3.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD-2 MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
RDEPEND="
>=sys-libs/ncurses-5.3-r2:=
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
index 73812ddcac8d..18f66e59b52e 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${P/_/.}
# GPL-2 for the init scripts
LICENSE="HPND BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="X bzip2 doc elf ipv6 libressl lm_sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
COMMON_DEPEND="
diff --git a/net-analyzer/portbunny/Manifest b/net-analyzer/portbunny/Manifest
deleted file mode 100644
index 9ca6a5c15964..000000000000
--- a/net-analyzer/portbunny/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PortBunny230408.tar.gz 224753 SHA256 ace967834ffe36a0e2f073a46b3a81b48671cc78e2d2cca6eb2ca6a63d05ead3 SHA512 9053ec4467b1726ac006615a9fff82382d4977642422739160d5a6a4166e60a16cedd299dc58af0eb7df963d6a17e7d7d6ffaaa7365f851fbd533b219ce2e1e0 WHIRLPOOL c3186d701f1e0b92d260bb3b55684636ab24bdc986dc489fbfc16ffe6e71efc17e1caa9e216033dc31ea4da0b357ad1fdb17c6e0f1afea32ba36db8df64f3136
diff --git a/net-analyzer/portbunny/metadata.xml b/net-analyzer/portbunny/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/portbunny/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/net-analyzer/portbunny/portbunny-1.0_p20080423.ebuild b/net-analyzer/portbunny/portbunny-1.0_p20080423.ebuild
deleted file mode 100644
index 29234edcf955..000000000000
--- a/net-analyzer/portbunny/portbunny-1.0_p20080423.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils linux-mod
-
-MY_PV_SNAP=${PV##*_p}
-if [[ ${MY_PV_SNAP} != ${PV} ]]; then
- MY_PV=${MY_PV_SNAP:6:2}${MY_PV_SNAP:4:2}${MY_PV_SNAP:2:2}
- MY_P=PortBunny${MY_PV}
- S="${WORKDIR}"/${MY_P}-dev
-else
- MY_P=PortBunny-${PV}
- S="${WORKDIR}"/${MY_P}
-fi
-
-MODULE_NAMES="portbunny(kernel:)"
-BUILD_TARGETS="all"
-
-DESCRIPTION="A kernel based highspeed TCP SYN port scanner"
-HOMEPAGE="http://recurity-labs.com/portbunny/"
-SRC_URI="http://recurity-labs.com/portbunny/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="dev-lang/python"
-
-src_install() {
- insinto /usr/share/portbunny
- doins UI/share/portbunny/*
- dosed "s:^\(ETC_SERVICES\)[[:space:]]\+=.*:\1 = '/usr/share/portbunny/services':g" \
- /usr/share/portbunny/PBunnyServices.py
- dobin UI/bin/portbunny.py
- dosym portbunny.py /usr/bin/portbunny
- dosed "s:^\(PBUNNY_SHARE\)[[:space:]]\+=.*:\1 = '/usr/share/portbunny/':g" \
- /usr/bin/portbunny.py
- dosed "s:^\(PBUNNY_SHARE2\)[[:space:]]\+=.*:\1 = '/usr/share/portbunny/':g" \
- /usr/bin/portbunny.py
-
- linux-mod_src_install
-}
-
-pkg_postinst() {
- einfo
- einfo "See http://recurity-labs.com/portbunny/README.pdf"
- einfo
- ewarn
- ewarn "WARNING"
- ewarn "WARNING: this software may HARM the stability of your system!"
- ewarn "WARNING: do NOT use this on production machines!"
- ewarn "WARNING"
- ewarn
- ebeep 10
-}
diff --git a/net-dialup/radiusclient/Manifest b/net-dialup/radiusclient/Manifest
deleted file mode 100644
index bfb0913133ab..000000000000
--- a/net-dialup/radiusclient/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST radiusclient-0.3.2.tar.gz 147004 SHA256 ebf5efdd6efe385faba39f48b39ebc4ee6857ccf59adf5174a5865ac7c05b6fe SHA512 42a796eb099fdea3df3601fa23ead32b75434ff1c6fa4bd09a1af6ca3fb73cd3957537b22cede5d1b03c9189d230dda0612252466865c251829cea510642e7aa WHIRLPOOL 9c5e609232e8a89c3b0b30b98da4c83e4ac1845dd95eb5e5ab4234fe761c98192d69f79cb17989153d9adf9860610e313504a89c67ee38624bb5cfd9385d8299
diff --git a/net-dialup/radiusclient/files/pkgsysconfdir-install.patch b/net-dialup/radiusclient/files/pkgsysconfdir-install.patch
deleted file mode 100644
index 3c9544a460e9..000000000000
--- a/net-dialup/radiusclient/files/pkgsysconfdir-install.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nru radiusclient-0.3.2.orig/etc/Makefile.am radiusclient-0.3.2/etc/Makefile.am
---- radiusclient-0.3.2.orig/etc/Makefile.am 1998-06-28 03:08:16.000000000 +0300
-+++ radiusclient-0.3.2/etc/Makefile.am 2004-11-21 09:49:57.556532216 +0200
-@@ -26,9 +26,9 @@
- <$(srcdir)/radiusclient.conf.in >radiusclient.conf
-
- install-data-local: servers
-- $(mkinstalldirs) $(pkgsysconfdir); \
-- echo " $(INSTALL) -m600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
-- $(INSTALL) -m600 $(srcdir)/servers $(pkgsysconfdir)/servers
-+ $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir); \
-+ echo " $(INSTALL) -m600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers"; \
-+ $(INSTALL) -m600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers
-
- uninstall-local:
- rm -f $(pkgsysconfdir)/servers
diff --git a/net-dialup/radiusclient/files/radiusclient-0.3.2-64bit-compat.patch b/net-dialup/radiusclient/files/radiusclient-0.3.2-64bit-compat.patch
deleted file mode 100644
index 49f6afc96245..000000000000
--- a/net-dialup/radiusclient/files/radiusclient-0.3.2-64bit-compat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Gentoo bug report - https://bugs.gentoo.org/show_bug.cgi?id=399433
-Patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=321229
-
---- include/radiusclient.h.orig 2005-08-04 10:50:19.636354682 +0200
-+++ include/radiusclient.h 2005-08-04 10:48:47.955569910 +0200
-@@ -38,8 +38,13 @@
- # define __P(protos) ()
- #endif
-
-+#if !(defined(__x86_64__))
- typedef unsigned long UINT4;
- typedef long INT4;
-+#else
-+typedef unsigned int UINT4;
-+typedef int INT4;
-+#endif
-
- #define AUTH_VECTOR_LEN 16
- #define AUTH_PASS_LEN (3 * 16) /* multiple of 16 */
diff --git a/net-dialup/radiusclient/metadata.xml b/net-dialup/radiusclient/metadata.xml
deleted file mode 100644
index 35ac6bdda04d..000000000000
--- a/net-dialup/radiusclient/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- A library for writing RADIUS clients accompanied with several client utilities
-
- radiusclient
-
-
diff --git a/net-dialup/radiusclient/radiusclient-0.3.2-r1.ebuild b/net-dialup/radiusclient/radiusclient-0.3.2-r1.ebuild
deleted file mode 100644
index 669b90e70e64..000000000000
--- a/net-dialup/radiusclient/radiusclient-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A library for writing RADIUS clients accompanied with several client utilities"
-HOMEPAGE="http://freshmeat.net/projects/radiusclient/"
-SRC_URI="ftp://ftp.cityline.net/pub/radiusclient/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs"
-
-DEPEND="!net-dialup/radiusclient-ng
- !net-dialup/freeradius-client"
-RDEPEND="${DEPEND}"
-
-DOCS=( BUGS CHANGES README )
-HTML_DOCS=( doc/instop.html )
-PATCHES=(
- "${FILESDIR}/pkgsysconfdir-install.patch"
- "${FILESDIR}/${P}-64bit-compat.patch" # bug #399433
-)
diff --git a/net-dialup/radiusclient/radiusclient-0.3.2.ebuild b/net-dialup/radiusclient/radiusclient-0.3.2.ebuild
deleted file mode 100644
index 827557304a92..000000000000
--- a/net-dialup/radiusclient/radiusclient-0.3.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools
-
-DESCRIPTION="A library for writing RADIUS clients accompanied with several client utilities"
-HOMEPAGE="http://freshmeat.net/projects/radiusclient/"
-SRC_URI="ftp://ftp.cityline.net/pub/radiusclient/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!net-dialup/radiusclient-ng
- !net-dialup/freeradius-client"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}/pkgsysconfdir-install.patch"
- eautoreconf
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
- dodoc README BUGS CHANGES COPYRIGHT
- dohtml doc/instop.html
-}
diff --git a/net-dns/hesinfo/Manifest b/net-dns/hesinfo/Manifest
deleted file mode 100644
index d966bdee16c8..000000000000
--- a/net-dns/hesinfo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hesinfo-3.1.0.tar.gz 137487 SHA256 2d3e34a8aa5c703a438b26a93b0662f5fbb58bd08b00f806244c6d01d1ccb91f SHA512 063623b574e1fdc88fcf13561783c9be2d89c995117ec169d0b9bb1a2451ffe8d3b8b01b955d6834cceabb472436fad8e6eea4873f7c994149dcbc835d371153 WHIRLPOOL b1db828b665001f0eb91bf7055bdfee6c06dda96c0e0f6aebe83d7ccd21ebf7db1038813d9a22df5e6bf9b0ebc041d54bd6ba63bf9b46d1ec7926e802038e7b0
diff --git a/net-dns/hesinfo/files/hesinfo-3.1.0-autotools.patch b/net-dns/hesinfo/files/hesinfo-3.1.0-autotools.patch
deleted file mode 100644
index 7e611c042bee..000000000000
--- a/net-dns/hesinfo/files/hesinfo-3.1.0-autotools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- Makefile.in 2006-03-30 18:22:39.000000000 +0200
-+++ Makefile.in 2010-03-12 21:34:34.000000000 +0100
-@@ -22,7 +22,7 @@
- all: hesinfo
-
- hesinfo: hesinfo.o
-- ${CC} ${LDFLAGS} -o $@ hesinfo.o -lhesiod ${LIBS}
-+ ${CC} ${LDFLAGS} -o $@ hesinfo.o -lhesiod ${LIBS} ${LDFLAGS}
-
- .c.o:
- ${CC} -c ${ALL_CFLAGS} $<
---- configure.in 2006-03-30 18:22:39.000000000 +0200
-+++ configure.in 2010-03-12 21:42:05.000000000 +0100
-@@ -7,6 +7,43 @@
- AC_PROG_CC
- AC_PROG_INSTALL
-
--ATHENA_HESIOD_REQUIRED
-+dnl This file provides local macros for packages which use specific
-+dnl external libraries. The public macros are:
-+dnl
-+dnl ATHENA_HESIOD_REQUIRED
-+dnl Generates error if Hesiod not found.
-+dnl Specify desired AFS libraries as a parameter.
-+dnl ----- Hesiod -----
-+
-+AC_DEFUN(ATHENA_HESIOD_CHECK,
-+[AC_CHECK_FUNC(res_send, :, AC_CHECK_LIB(resolv, res_send))
-+if test "$hesiod" != yes; then
-+ CPPFLAGS="$CPPFLAGS -I$hesiod/include"
-+ LDFLAGS="$LDFLAGS -L$hesiod/lib"
-+fi
-+AC_CHECK_LIB(hesiod, hes_resolve, :,
-+ [AC_MSG_ERROR(Hesiod library not found)])])
-+
-+AC_DEFUN(ATHENA_HESIOD,
-+[AC_ARG_WITH(hesiod,
-+ [ --with-hesiod=PREFIX Use Hesiod],
-+ [hesiod="$withval"], [hesiod=no])
-+if test "$hesiod" != no; then
-+ ATHENA_HESIOD_CHECK
-+ HESIOD_LIBS="-lhesiod"
-+ AC_DEFINE(HAVE_HESIOD)
-+fi
-+AC_SUBST(HESIOD_LIBS)])
-
-+AC_DEFUN(ATHENA_HESIOD_REQUIRED,
-+[AC_ARG_WITH(hesiod,
-+ [ --with-hesiod=PREFIX Specify location of Hesiod],
-+ [hesiod="$withval"], [hesiod=yes])
-+if test "$hesiod" != no; then
-+ ATHENA_HESIOD_CHECK
-+else
-+ AC_MSG_ERROR(This package requires Hesiod.)
-+fi])
-+
-+ATHENA_HESIOD_REQUIRED
- AC_OUTPUT(Makefile)
diff --git a/net-dns/hesinfo/hesinfo-3.1.0.ebuild b/net-dns/hesinfo/hesinfo-3.1.0.ebuild
deleted file mode 100644
index 06f9834c7355..000000000000
--- a/net-dns/hesinfo/hesinfo-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="A simple command-line interface to the net-dns/hesiod service library"
-HOMEPAGE="ftp://athena-dist.mit.edu/pub/ATHENA/hesiod"
-SRC_URI="ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=net-dns/hesiod-${PV}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- rm -f aclocal.m4 || die "rm failed"
- epatch "${FILESDIR}/${P}-autotools.patch"
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc NEWS README || die
-}
diff --git a/net-dns/hesinfo/metadata.xml b/net-dns/hesinfo/metadata.xml
deleted file mode 100644
index 13849a9febdd..000000000000
--- a/net-dns/hesinfo/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/net-fs/sshfs/sshfs-2.8.ebuild b/net-fs/sshfs/sshfs-2.8.ebuild
index e2514c8fe330..384a119a9af1 100644
--- a/net-fs/sshfs/sshfs-2.8.ebuild
+++ b/net-fs/sshfs/sshfs-2.8.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
SRC_URI="https://github.com/libfuse/${PN}/releases/download/${PN}_${PV}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
SLOT="0"
CDEPEND=">=sys-fs/fuse-2.6.0_pre3
diff --git a/net-im/simpserver-bin/Manifest b/net-im/simpserver-bin/Manifest
deleted file mode 100644
index 09da4b041f80..000000000000
--- a/net-im/simpserver-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST simpserver-2.1.0-linux-x86.tgz 609317 SHA256 77a28d92f3b4bc99f6cf78574fe1d9eb4d4e983ec6632fa0ff5be3e5a353d7b8 SHA512 821dd878c5e9e6a3a41150220faa7a6fbc46abe840b7f361982eacd4654d21d2cdf43ee68a2ef96c79b048162b2106f78c4d63a89213925069fb53959cb15862 WHIRLPOOL e0a7f6ac24c393fa250c181294d41a811ae24b919c0a9224fe7c79532622c980fcfb384bcafb1e2e6dd228c655f97f6a9ac9dff334069e1c52c1e23e0c8b1a3e
diff --git a/net-im/simpserver-bin/files/simpserver.rc b/net-im/simpserver-bin/files/simpserver.rc
deleted file mode 100644
index 16528fe0237c..000000000000
--- a/net-im/simpserver-bin/files/simpserver.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting simpserver"
- start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/simpserver.pid \
- --exec /opt/bin/simpserver -- /etc/simp.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping simpserver"
- start-stop-daemon --stop --quiet --pidfile /var/run/simpserver.pid
- eend $?
-}
diff --git a/net-im/simpserver-bin/metadata.xml b/net-im/simpserver-bin/metadata.xml
deleted file mode 100644
index 435c13a7e404..000000000000
--- a/net-im/simpserver-bin/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-SimpServer is the first lightweight instant messaging security gateway for Unix systems. Install SimpServer on a
-Unix system and configure IM clients on your local network, and conversations with Simp-equipped parties will be
-automatically encrypted. SimpServer can indeed accept simultaneous remote connections and thus secure local and/or
-remote clients.
-
-With SimpServer, corporate environments can now benefit from centralized instant messenger encryption. Linux fans
-can now secure their MSN conversations. SimpServer is currently beta software and is free for any use.
-
-
diff --git a/net-im/simpserver-bin/simpserver-bin-2.1.0-r2.ebuild b/net-im/simpserver-bin/simpserver-bin-2.1.0-r2.ebuild
deleted file mode 100644
index 7ee8c6349faf..000000000000
--- a/net-im/simpserver-bin/simpserver-bin-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN=${PN/-bin/}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SimpServer for Unix: IM instant security transparent proxy"
-SRC_URI="http://download.secway.com/public/products/simpserver/${MY_P}-linux-x86.tgz"
-HOMEPAGE="http://www.secway.com/"
-LICENSE="simpserver-test"
-
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-SLOT="0"
-S=${WORKDIR}/simp
-
-RESTRICT="strip"
-
-src_compile() {
- einfo "Binary distribution. No compilation required."
-}
-
-src_install () {
- dodoc README VERSION doc/CONFIG doc/TODO
-
- exeinto /opt/bin
- doexe bin/${MY_PN}
-
- insinto /etc
- doins etc/simp.conf
-
- newinitd "${FILESDIR}/${MY_PN}".rc ${MY_PN}
-}
-
-pkg_postinst() {
- elog "Please edit the configuration file: /etc/simp.conf."
-}
diff --git a/net-irc/irc-client/Manifest b/net-irc/irc-client/Manifest
deleted file mode 100644
index 97f360cbf0f6..000000000000
--- a/net-irc/irc-client/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST irc2.10.3p7.tgz 678412 SHA256 1c7b5ba8e03d096a1b7412b6a50f2e3e00fce77193e2a66cd0ab8a9de02253b9 SHA512 84a148b95de3be32ffc2d11095c3da2e06b6fb963498020e32304f58f89d2a4c00ff9fa15816a1b54af95b54c86da4cd40846afc0e63ddd99bec9fb044873c32 WHIRLPOOL fcfb7e41fe05f5283c6da01fb2b82f8c9b88abe681f72f1df689052d53f3a4ca43acef4d8a9bdd1edcdc20663112b9516e1a02975cbaeffcaa783c42e5ceece8
diff --git a/net-irc/irc-client/files/irc-client-2.10.3_p7-amd64-chost.patch b/net-irc/irc-client/files/irc-client-2.10.3_p7-amd64-chost.patch
deleted file mode 100644
index 7761a3e5e76d..000000000000
--- a/net-irc/irc-client/files/irc-client-2.10.3_p7-amd64-chost.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Nathan Phillip Brink
-Subject: Do not ignore the --host argument passed to the fake ./configure.
-
---- a/configure
-+++ b/configure
-@@ -10,6 +10,7 @@
- -version | --version | --versio | --versi | --vers)
- quick_fwd=yes
- break ;;
-+ --host=*)
-+ rev=$(expr "${arg}" : '[^=]*=\(.*\)')
-+ ;;
-- *)
-- break ;;
- esac
-@@ -18,8 +21,10 @@
- then
- support/configure $*
- else
-- echo "retrieving the system name, type and OS release..."
-- rev=`support/config.guess`
-+ if ! test "${rev}"; then
-+ echo "retrieving the system name, type and OS release..."
-+ rev=`support/config.guess`
-+ fi
- if test "${rev}" # test for no output
- then
- echo " your system seems to be ${rev}."
-
diff --git a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
deleted file mode 100644
index 28c1ad81a79d..000000000000
--- a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-MY_P=irc${PV/_/}
-DESCRIPTION="A simplistic RFC compliant IRC client"
-HOMEPAGE="http://www.irc.org"
-SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz"
-LICENSE="GPL-1"
-SLOT="0"
-
-KEYWORDS="~amd64 ppc x86"
-IUSE="ipv6"
-
-DEPEND="sys-libs/ncurses
- sys-libs/zlib"
-# This and ircci both install /usr/bin/irc #247987
-RDEPEND="${DEPEND}
- !net-irc/ircii"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}" || die
- epatch "${FILESDIR}"/${P}-amd64-chost.patch
-}
-
-src_compile () {
- econf \
- $(use_with ipv6 ip6) \
- --sysconfdir=/etc/ircd \
- --localstatedir=/var/run/ircd \
- || die "econf failed"
- emake -C ${CHOST} client || die "client build failed"
-}
-
-src_install() {
- make -C ${CHOST} \
- prefix=${D}/usr \
- client_man_dir=${D}/usr/share/man/man1 \
- install-client || die "client installed failed"
- dodoc doc/Etiquette doc/alt-irc-faq doc/rfc* || die
-}
diff --git a/net-irc/irc-client/metadata.xml b/net-irc/irc-client/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/irc-client/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
index aed5df5a0f08..cf665b7e95d9 100644
--- a/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
+++ b/net-libs/libnet/libnet-1.2_rc3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}-dev/${P/_/-}.tar.gz"
LICENSE="BSD BSD-2 HPND"
SLOT="1.1"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc static-libs"
DOCS=(
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
deleted file mode 100644
index da2eb46c9821..000000000000
--- a/net-libs/libsoup-gnome/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libsoup-2.50.0.tar.xz 1755052 SHA256 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b SHA512 5004baac41feb2c4a7c4f8e68e0a2aac91ae115518e5bb7b58bc7f85dc7675611de82ad21d6a2f779daf2fc7496ab802e7d6dcd5eca91186b221664db37819e2 WHIRLPOOL 09f2cdc9804a4785e1f6a8d9e8adefab549fcb6de1506e2c0fa7af9ee3af531a26a55909ab917c7f08076e99bff3f992516125d12baeb5fce22c918e81a4636e
-DIST libsoup-2.52.2.tar.xz 1764308 SHA256 db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc SHA512 866942d8db43a19630f39db12b22058cf31ef0c56f337e6c5790f5b881aaa768d4dbece1d2fe0d9560a82ae0f362365c19aa9b0d05afeb45bc5774f6713f51b2 WHIRLPOOL f0f7ac95d49f21d0bb92968d6d3de596a08aea0519db82089b6c476916d96c3c44e0871a8d3102f5f0b176294ce6f1582d52e6cfcd65bb74ad0c7c4ab8f020a4
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch
deleted file mode 100644
index d731fc0c733a..000000000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001
-From: Priit Laes
-Date: Tue, 20 Dec 2011 15:42:44 +0200
-Subject: [PATCH] Split support for libsoup-gnome
-
-https://bugzilla.gnome.org/show_bug.cgi?id=595065
-
-Original patch by Romain Perier.
----
- Makefile.am | 12 +++++++++--
- configure.ac | 35 ++++++++++++++++++++-----------
- libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
- 3 files changed, 77 insertions(+), 30 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c8fa95c..fc09778 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
--SUBDIRS = libsoup po tests examples docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
-+endif
-
- EXTRA_DIST = \
- data/effective_tld_names.dat \
-@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
-
- pkgconfigdir = $(libdir)/pkgconfig
-
--pkgconfig_DATA = libsoup-2.4.pc
-+pkgconfig_DATA =
-+
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
-
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc
-diff --git a/configure.ac b/configure.ac
-index 96bb378..0153f10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
- dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
-+PKG_PROG_PKG_CONFIG
-+enable_ssl=no
-+AC_ARG_WITH(libsoup-system,
-+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+ [with_libsoup_system=$withval], [with_libsoup_system=no])
-+if test "$with_libsoup_system" = "no"; then
-+ GLIB_REQUIRED=2.38.0
-+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+ fi
-+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-
--GLIB_REQUIRED=2.38.0
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
-- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
--fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+ AC_SUBST(GLIB_MAKEFILE)
-
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
-+ PKG_CHECK_MODULES(XML, libxml-2.0)
-+ AC_SUBST(XML_CFLAGS)
-+ AC_SUBST(XML_LIBS)
-+fi
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
-
- GLIB_TESTS
-
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
--
- PKG_CHECK_MODULES(SQLITE, sqlite3)
- AC_SUBST(SQLITE_CFLAGS)
- AC_SUBST(SQLITE_LIBS)
-@@ -141,6 +148,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
-
- if test $with_gnome != no; then
- AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
-+
-+ if test $with_libsoup_system != no; then
-+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+ fi
- fi
- AC_SUBST(HAVE_GNOME)
-
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 60920bd..26c5616 100644
---- a/libsoup/Makefile.am
-+++ b/libsoup/Makefile.am
-@@ -1,14 +1,19 @@
- ## Process this file with automake to produce Makefile.in
-
- EXTRA_DIST =
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
-
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
-
--AM_CPPFLAGS = \
-+AM_CPPFLAGS =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+AM_CPPFLAGS += \
- -DG_LOG_DOMAIN=\"libsoup\" \
- -DLOCALEDIR=\"$(localedir)\" \
- -I$(top_srcdir) \
-@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
- nodist_libsoupinclude_HEADERS = \
- soup-version.h
-
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
-
- libsoup_2_4_la_LDFLAGS = \
- -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
-@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
- soup-version.c \
- soup-xmlrpc.c
-
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES += tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
-
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
-- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
-
- if BUILD_LIBSOUP_GNOME
-
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
-
-+AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS = \
- soup-cookie-jar-sqlite.h\
- soup-gnome.h \
-@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
-
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
-
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
- libsoup_gnome_2_4_la_LDFLAGS = \
- -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
- -no-undefined \
- -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
-+endif
-
- EXTRA_DIST += libsoup-gnome-2.4.sym
-
- libsoup_gnome_2_4_la_LIBADD = \
-- libsoup-2.4.la \
- $(GLIB_LIBS)
-
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES = \
- soup-cookie-jar-sqlite.c \
- soup-gnome-features.c \
-@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
- endif
-
- GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
-- $(GLIB_GENERATED) \
-- tld_data.inc
-+BUILT_SOURCES += \
-+ $(GLIB_GENERATED)
-
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
- soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
-@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
-
- if HAVE_INTROSPECTION
-
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
-@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
-
- INTROSPECTION_GIRS += Soup-2.4.gir
-
-+endif
-+
- if BUILD_LIBSOUP_GNOME
-
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- $(libsoupgnomeinclude_HEADERS) \
- $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS = \
- --identifier-prefix=Soup \
- --symbol-prefix=soup \
-- --c-include "libsoup/soup-gnome.h" \
-- --include-uninstalled=$(builddir)/Soup-2.4.gir
-+ --c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
-
-@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
- typelibdir = $(libdir)/girepository-1.0
- typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
--CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-
- endif
-@@ -326,6 +326,7 @@
-
- # We only do this check on Linux, so we don't have to worry about
- # different "nm" output on other platforms
-+if BUILD_LIBSOUP
- if OS_LINUX
- check-local:
- @echo Checking libsoup-2.4.so symbols
-@@ -335,3 +336,16 @@
- env LANG=C sort -u | \
- diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
- endif
-+endif
-+
-+if BUILD_LIBSOUP_GNOME
-+if OS_LINUX
-+check-local:
-+ @echo Checking libsoup-gnome-2.4.so symbols
-+ @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
-+ grep "^[[:xdigit:]]\+ [BTR] " | \
-+ sed "s/^[[:xdigit:]]\+ [BTR] //" | \
-+ env LANG=C sort -u | \
-+ diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
-+endif
-+endif
---
-1.9.0
-
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch
deleted file mode 100644
index 54b6014457fe..000000000000
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -ur libsoup-2.52.2/configure.ac libsoup-2.52.2.new/configure.ac
---- libsoup-2.52.2/configure.ac 2015-11-09 21:23:00.000000000 +0100
-+++ libsoup-2.52.2.new/configure.ac 2015-11-17 10:32:25.562815235 +0100
-@@ -77,23 +77,28 @@
- dnl ***********************
- dnl *** Checks for glib ***
- dnl ***********************
--
--GLIB_REQUIRED=2.38.0
--AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
-- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+PKG_PROG_PKG_CONFIG
-+enable_ssl=no
-+AC_ARG_WITH(libsoup-system,
-+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
-+ [with_libsoup_system=$withval], [with_libsoup_system=no])
-+if test "$with_libsoup_system" = "no"; then
-+ GLIB_REQUIRED=2.38.0
-+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
-+ fi
-+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+ AC_SUBST(GLIB_MAKEFILE)
-+ PKG_CHECK_MODULES(XML, libxml-2.0)
-+ AC_SUBST(XML_CFLAGS)
-+ AC_SUBST(XML_LIBS)
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
--
--GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
--AC_SUBST(GLIB_MAKEFILE)
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
-
- GLIB_TESTS
-
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
--
- PKG_CHECK_MODULES(SQLITE, sqlite3)
- AC_SUBST(SQLITE_CFLAGS)
- AC_SUBST(SQLITE_LIBS)
-@@ -148,6 +153,9 @@
-
- if test $with_gnome != no; then
- AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
-+ if test $with_libsoup_system != no; then
-+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
-+ fi
- fi
- AC_SUBST(HAVE_GNOME)
-
-Sólo en libsoup-2.52.2.new/: configure.ac~
-diff -ur libsoup-2.52.2/libsoup/Makefile.am libsoup-2.52.2.new/libsoup/Makefile.am
---- libsoup-2.52.2/libsoup/Makefile.am 2015-11-09 21:21:48.000000000 +0100
-+++ libsoup-2.52.2.new/libsoup/Makefile.am 2015-11-19 12:11:19.743369476 +0100
-@@ -3,14 +3,19 @@
- EXTRA_DIST =
- CLEANFILES =
-
--
-+BUILT_SOURCES =
- include $(GLIB_MAKEFILE)
-
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
-
--AM_CPPFLAGS = \
-+AM_CPPFLAGS =
-+lib_LTLIBRARIES =
-+CLEANFILES =
-+
-+if BUILD_LIBSOUP
-+AM_CPPFLAGS += \
- -DG_LOG_DOMAIN=\"libsoup\" \
- -DLIBSOUP_COMPILATION \
- -DLOCALEDIR=\"$(localedir)\" \
-@@ -84,7 +89,7 @@
- nodist_libsoupinclude_HEADERS = \
- soup-version.h
-
--lib_LTLIBRARIES = libsoup-2.4.la
-+lib_LTLIBRARIES += libsoup-2.4.la
-
- libsoup_2_4_la_LDFLAGS = \
- -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
-@@ -202,18 +207,23 @@
- soup-xmlrpc.c \
- soup-xmlrpc-old.c
-
--# TLD rules
--EXTRA_DIST += tld-parser.py
--
-+BUILT_SOURCES += tld_data.inc
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
-
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
-- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
-+
-+# TLD rules
-+EXTRA_DIST += tld-parser.py
-+
-+endif
-
- if BUILD_LIBSOUP_GNOME
-
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
-
-+AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
-+
- libsoupgnomeinclude_HEADERS = \
- soup-cookie-jar-sqlite.h\
- soup-gnome.h \
-@@ -221,17 +231,26 @@
-
- lib_LTLIBRARIES += libsoup-gnome-2.4.la
-
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
-+else
- libsoup_gnome_2_4_la_LDFLAGS = \
- -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
- -no-undefined \
- -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
-+endif
-
- EXTRA_DIST += libsoup-gnome-2.4.sym
-
- libsoup_gnome_2_4_la_LIBADD = \
-- libsoup-2.4.la \
- $(GLIB_LIBS)
-
-+if BUILD_LIBSOUP
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
-+else
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
-+endif
-+
- libsoup_gnome_2_4_la_SOURCES = \
- soup-cookie-jar-sqlite.c \
- soup-gnome-features.c \
-@@ -243,9 +262,8 @@
- endif
-
- GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
--BUILT_SOURCES = \
-- $(GLIB_GENERATED) \
-- tld_data.inc
-+BUILT_SOURCES += \
-+ $(GLIB_GENERATED)
-
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
- soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
-@@ -260,6 +278,8 @@
-
- if HAVE_INTROSPECTION
-
-+if BUILD_LIBSOUP
-+
- # Core library
- gi_soup_files = \
- $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
-@@ -292,20 +312,28 @@
-
- EXTRA_DIST += Soup-2.4.metadata Soup-2.4-custom.vala libsoup-2.4.deps
-
-+endif
-+
- if BUILD_LIBSOUP_GNOME
-
-+if BUILD_LIBSOUP
-+SOUP_GIR = Soup-2.4.gir
-+else
-+SOUP_GIR =
-+endif
-+
- # GNOME extensions
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\
- $(libsoupgnomeinclude_HEADERS) \
- $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
- SoupGNOME_2_4_gir_SCANNERFLAGS = \
- --identifier-prefix=Soup \
- --symbol-prefix=soup \
-- --c-include "libsoup/soup-gnome.h" \
-- --include-uninstalled=$(builddir)/Soup-2.4.gir
-+ --c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
-
-@@ -319,12 +347,13 @@
- typelibdir = $(libdir)/girepository-1.0
- typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
--CLEANFILES+= $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
-
- endif
-
- # We only do this check on Linux, so we don't have to worry about
- # different "nm" output on other platforms
-+if BUILD_LIBSOUP
- if OS_LINUX
- check-local:
- @echo Checking libsoup-2.4.so symbols
-@@ -334,3 +363,16 @@
- env LC_ALL=C sort -u | \
- diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
- endif
-+endif
-+
-+if BUILD_LIBSOUP_GNOME
-+if OS_LINUX
-+check-local:
-+ @echo Checking libsoup-gnome-2.4.so symbols
-+ @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
-+ grep "^[[:xdigit:]]\+ [BTR] " | \
-+ sed "s/^[[:xdigit:]]\+ [BTR] //" | \
-+ env LANG=C sort -u | \
-+ diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
-+endif
-+endif
-Sólo en libsoup-2.52.2.new/libsoup: Makefile.am~
-diff -ur libsoup-2.52.2/Makefile.am libsoup-2.52.2.new/Makefile.am
---- libsoup-2.52.2/Makefile.am 2015-10-29 16:08:21.000000000 +0100
-+++ libsoup-2.52.2.new/Makefile.am 2015-11-17 10:25:54.034816211 +0100
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
--SUBDIRS = libsoup po tests examples docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
-+endif
-
- EXTRA_DIST = \
- data/effective_tld_names.dat \
-@@ -18,7 +22,11 @@
-
- pkgconfigdir = $(libdir)/pkgconfig
-
--pkgconfig_DATA = libsoup-2.4.pc
-+pkgconfig_DATA =
-+
-+if BUILD_LIBSOUP
-+pkgconfig_DATA += libsoup-2.4.pc
-+endif
-
- if BUILD_LIBSOUP_GNOME
- pkgconfig_DATA += libsoup-gnome-2.4.pc
-Sólo en libsoup-2.52.2.new/: Makefile.am~
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
deleted file mode 100644
index a84399060df5..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.50.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2 multilib-minimal
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
- ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
- dev-db/sqlite:3=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- >=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Use lib present on the system
- epatch "${FILESDIR}"/${PN}-2.48.0-system-lib.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # FIXME: we need addpredict to workaround bug #324779 until
- # root cause (bug #249496) is solved
- addpredict /usr/share/snmp/mibs/.index
-
- # Disable apache tests until they are usable on Gentoo, bug #326957
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tls-check \
- $(multilib_native_use_enable introspection) \
- --with-libsoup-system \
- --with-gnome \
- --without-apache-httpd
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
deleted file mode 100644
index 6b8ac6892c12..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2 multilib-minimal
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="https://wiki.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="+introspection"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
- ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
- dev-db/sqlite:3=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.10
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # Use lib present on the system
- epatch "${FILESDIR}"/${PN}-2.52.2-system-lib.patch
- eautoreconf
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # FIXME: we need addpredict to workaround bug #324779 until
- # root cause (bug #249496) is solved
- addpredict /usr/share/snmp/mibs/.index
-
- # Disable apache tests until they are usable on Gentoo, bug #326957
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --disable-tls-check \
- $(multilib_native_use_enable introspection) \
- --with-libsoup-system \
- --with-gnome \
- --without-apache-httpd \
- --disable-vala
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/net-libs/libsoup-gnome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
-
diff --git a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
index f682ee79e6d5..830a5006a32a 100644
--- a/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
+++ b/net-libs/rabbitmq-c/rabbitmq-c-0.8.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://github.com/alanxz/rabbitmq-c.git"
else
SRC_URI="https://github.com/alanxz/rabbitmq-c/archive/v${PV}.zip -> ${PN}-v${PV}.zip"
- KEYWORDS="amd64 ~arm ~hppa ~x86"
+ KEYWORDS="amd64 ~arm hppa ~x86"
fi
LICENSE="MIT"
diff --git a/net-libs/wt/Manifest b/net-libs/wt/Manifest
deleted file mode 100644
index dd2f1155e298..000000000000
--- a/net-libs/wt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wt-3.3.4.tar.gz 35313108 SHA256 327f9c64504366e3f2fa2c8f1d1a23efc7b8fba8ace3869de375d668f99ede10 SHA512 1deff3fe325b8e009713bcbc388058d025864b3724bf1cf1cb3c36e909520046189d4a13de0adbff5c11d171536819b687d598d125b4041dd78bb4a3c5a6c279 WHIRLPOOL dee9fbe1d88a23e9f178df74455a33b22b3040523c70411f9ae982f65e51b7f3b5473a597fe98d2ec1213fbf25c7f0fccc91952ed10b956b4c5ab92707681cf2
diff --git a/net-libs/wt/files/cmakelist.patch b/net-libs/wt/files/cmakelist.patch
deleted file mode 100644
index a121d00ff9cc..000000000000
--- a/net-libs/wt/files/cmakelist.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- CMakeLists.txt 2012-07-04 00:50:36.000000000 -0700
-+++ CMakeLists-new 2012-10-02 11:25:05.860077447 -0700
-@@ -451 +451 @@ IF(NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_
-- INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${DESTDIR}${CONFIGDIR})
-+ INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
diff --git a/net-libs/wt/files/wt-fix-automagic.patch b/net-libs/wt/files/wt-fix-automagic.patch
deleted file mode 100644
index ea7ca59b90a1..000000000000
--- a/net-libs/wt/files/wt-fix-automagic.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From 414ad3a07f4bb9a4a6678d25e992d337771684b3 Mon Sep 17 00:00:00 2001
-From: Nikoli
-Date: Wed, 22 Sep 2010 08:18:48 +0400
-Subject: [PATCH] cmake: fix automagic, config installation; make examples and resources optional
-
----
- CMakeLists.txt | 30 ++++++++++++++++++----------
- examples/mandelbrot/CMakeLists.txt | 6 ++--
- examples/style/CMakeLists.txt | 6 ++--
- src/CMakeLists.txt | 28 +++++++++++++++-----------
- src/Wt/CMakeLists.txt | 12 ++++++++++-
- src/Wt/Dbo/backend/CMakeLists.txt | 17 ++++++++++++---
- test/CMakeLists.txt | 37 +++++++++++++++++++++--------------
- 7 files changed, 87 insertions(+), 49 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 896bd2d..9c6f679 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,6 +27,10 @@ SET(WTDBOPOSTGRES_SOVERSION 23)
- #
- # Various things that must be configured by the user or packager ...
- #
-+option(BUILD_EXAMPLES "Build examples" OFF)
-+option(INSTALL_RESOURCES "Install resources directory" ON)
-+option(ENABLE_GM "Enable GraphicsMagick, for supporting painting to raster images (PNG, GIF, ...) (WRasterImage)" ON)
-+option(ENABLE_HARU "Enable Haru Free PDF Library, which is used to provide support for painting to PDF (WPdfImage)" ON)
-
- IF(NOT SHARED_LIBS)
- IF(WIN32)
-@@ -296,11 +300,11 @@ IF (DOXYGEN_FOUND)
- ADD_DEPENDENCIES(doc doxygen-examples)
- ENDIF (DOXYGEN_FOUND)
-
--IF(WIN32)
-- SUBDIRS(src examples)
--ELSE(WIN32)
-- SUBDIRS(src EXCLUDE_FROM_ALL examples)
--ENDIF(WIN32)
-+SUBDIRS(src)
-+
-+IF(BUILD_EXAMPLES)
-+ SUBDIRS(examples)
-+ENDIF(BUILD_EXAMPLES)
-
- IF(BUILD_TESTS)
- SUBDIRS(test)
-@@ -313,20 +317,24 @@ ENDIF( NOT DEFINED WT_CMAKE_FINDER_INSTALL_DIR)
- INSTALL(FILES ${PROJECT_SOURCE_DIR}/cmake/FindWt.cmake DESTINATION
- ${CMAKE_INSTALL_PREFIX}/${WT_CMAKE_FINDER_INSTALL_DIR} )
-
-+IF(INSTALL_RESOURCES)
- INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/resources DESTINATION
- ${CMAKE_INSTALL_PREFIX}/share/Wt/)
-+ENDIF(INSTALL_RESOURCES)
-
--IF(NOT EXISTS ${CONFIGDIR}/wt_config.xml)
-+IF(NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
- INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
--ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)
-+ENDIF (NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
-
--IF(HARU_FOUND)
-+IF(ENABLE_HARU AND HARU_FOUND)
-+ SET(HAVE_HARU ON)
- SET(WT_HAS_WPDFIMAGE true)
--ENDIF(HARU_FOUND)
-+ENDIF(ENABLE_HARU AND HARU_FOUND)
-
--IF(GM_FOUND)
-+IF(ENABLE_GM AND GM_FOUND)
-+ SET(HAVE_GM ON)
- SET(WT_HAS_WRASTERIMAGE true)
--ENDIF(GM_FOUND)
-+ENDIF(ENABLE_GM AND GM_FOUND)
-
- # Compile time constants & make sure our build finds it
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Wt)
-diff --git a/examples/mandelbrot/CMakeLists.txt b/examples/mandelbrot/CMakeLists.txt
-index 176cab6..64b8ff7 100644
---- a/examples/mandelbrot/CMakeLists.txt
-+++ b/examples/mandelbrot/CMakeLists.txt
-@@ -1,6 +1,6 @@
--IF(NOT GM_FOUND)
-+IF(NOT HAVE_GM)
- MESSAGE(STATUS "** Not building mandelbrot example: requires Wt::WRasterImage.")
--ELSE(NOT GM_FOUND)
-+ELSE(NOT HAVE_GM)
-
- WT_ADD_EXAMPLE(mandelbrot.wt MandelbrotImage.C MandelbrotExample.C)
-
-@@ -11,5 +11,5 @@ ELSE(NOT GM_FOUND)
-
- ADD_DEPENDENCIES(mandelbrot.wt wt ${EXAMPLES_CONNECTOR})
-
--ENDIF(NOT GM_FOUND)
-+ENDIF(NOT HAVE_GM)
-
-diff --git a/examples/style/CMakeLists.txt b/examples/style/CMakeLists.txt
-index 6443035..04a71f7 100644
---- a/examples/style/CMakeLists.txt
-+++ b/examples/style/CMakeLists.txt
-@@ -1,8 +1,8 @@
--IF(NOT GM_FOUND)
-+IF(NOT HAVE_GM)
-
- MESSAGE(STATUS "** Not building style example: requires WRasterImage.")
-
--ELSE(NOT GM_FOUND)
-+ELSE(NOT HAVE_GM)
-
- WT_ADD_EXAMPLE(styleexample.wt CornerImage.C RoundedWidget.C StyleExample.C)
-
-@@ -12,5 +12,5 @@ ELSE(NOT GM_FOUND)
-
- ADD_DEPENDENCIES(styleexample.wt wt ${EXAMPLES_CONNECTOR})
-
--ENDIF(NOT GM_FOUND)
-+ENDIF(NOT HAVE_GM)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7d11b67..4523540 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -238,33 +238,37 @@ IF (MULTI_THREADED_BUILD)
- SET(libsources ${libsources} web/SocketNotifier.C)
- ENDIF(MULTI_THREADED_BUILD)
-
--IF(HARU_FOUND)
-+IF(HAVE_HARU)
- SET(libsources ${libsources} Wt/WPdfImage.C)
--ENDIF(HARU_FOUND)
-+ENDIF(HAVE_HARU)
-
--IF(GM_FOUND)
-+IF(HAVE_GM)
- SET(libsources ${libsources} Wt/WRasterImage.C)
--ENDIF(GM_FOUND)
-+ENDIF(HAVE_GM)
-
- ADD_LIBRARY(wt ${libsources})
- TARGET_LINK_LIBRARIES(wt ${BOOST_WT_LIBRARIES})
-
--IF(HARU_FOUND)
-+IF(HAVE_HARU)
- TARGET_LINK_LIBRARIES(wt ${HARU_LIBRARIES})
- INCLUDE_DIRECTORIES(${HARU_INCLUDE_DIRS})
--ELSE(HARU_FOUND)
-+ELSE(HAVE_HARU)
- MESSAGE("** Disabling PDF support (WPdfImage): requires libharu.")
-- MESSAGE(" Indicate the location of your haru library using -DHARU_PREFIX=...")
--ENDIF(HARU_FOUND)
-+ IF(ENABLE_HARU)
-+ MESSAGE(" Indicate the location of your haru library using -DHARU_PREFIX=...")
-+ ENDIF(ENABLE_HARU)
-+ENDIF(HAVE_HARU)
-
--IF(GM_FOUND)
-+IF(HAVE_GM)
- TARGET_LINK_LIBRARIES(wt ${GM_LIBRARIES})
- INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS})
- ADD_DEFINITIONS(-DHAVE_RASTER_IMAGE)
--ELSE(GM_FOUND)
-+ELSE(HAVE_GM)
- MESSAGE("** Disabling raster image support (WRasterImage): requires graphicsmagick.")
-- MESSAGE(" Indicate the location of your graphicsmagick library using -DGM_PREFIX=...")
--ENDIF(GM_FOUND)
-+ IF(ENABLE_GM)
-+ MESSAGE(" Indicate the location of your graphicsmagick library using -DGM_PREFIX=...")
-+ ENDIF(ENABLE_GM)
-+ENDIF(HAVE_GM)
-
- IF(MULTI_THREADED_BUILD)
- TARGET_LINK_LIBRARIES(wt ${CMAKE_THREAD_LIBS_INIT})
-diff --git a/src/Wt/CMakeLists.txt b/src/Wt/CMakeLists.txt
-index d5a3c58..67faae8 100644
---- a/src/Wt/CMakeLists.txt
-+++ b/src/Wt/CMakeLists.txt
-@@ -1,4 +1,14 @@
--SUBDIRS(Dbo Ext Chart Http Test)
-+SUBDIRS(Chart Http Test)
-+
-+# FIXME we should use (HAVE_SQLITE OR HAVE_POSTGRES)
-+IF(ENABLE_SQLITE OR ENABLE_POSTGRES)
-+ SUBDIRS(Dbo)
-+ENDIF(ENABLE_SQLITE OR ENABLE_POSTGRES)
-+
-+option(ENABLE_EXT "Build Wt Ext library with JavaScript-only widgets (http://extjs.com/)" ON)
-+IF(ENABLE_EXT)
-+ SUBDIRS(Ext)
-+ENDIF(ENABLE_EXT)
-
- INSTALL_FILES(/include/Wt "^W.*[^C~]$")
- #INSTALL(
-diff --git a/src/Wt/Dbo/backend/CMakeLists.txt b/src/Wt/Dbo/backend/CMakeLists.txt
-index 653a830..7668b90 100644
---- a/src/Wt/Dbo/backend/CMakeLists.txt
-+++ b/src/Wt/Dbo/backend/CMakeLists.txt
-@@ -1,3 +1,8 @@
-+OPTION(ENABLE_SQLITE "Build SQLite3 backend for Wt::Dbo" ON)
-+OPTION(ENABLE_POSTGRES "Build PostgreSQL backend for Wt::Dbo" OFF)
-+
-+IF(ENABLE_SQLITE)
-+
- OPTION( USE_SYSTEM_SQLITE3 "Use system-wide Sqlite3 instead of Wt's version" OFF)
-
- IF(USE_SYSTEM_SQLITE3)
-@@ -41,7 +46,9 @@ PROPERTIES
- INSTALL_FILES(/include/Wt/Dbo/backend "^Sqlite3$")
- INSTALL_FILES(/include/Wt/Dbo/backend "^.*Sqlite3.*h$")
-
--IF(POSTGRES_FOUND)
-+ENDIF(ENABLE_SQLITE)
-+
-+IF(ENABLE_POSTGRES AND POSTGRES_FOUND)
- MESSAGE("** Wt::Dbo: building Postgres backend.")
- ADD_LIBRARY(wtdbopostgres
- Postgres.C
-@@ -65,8 +72,10 @@ IF(POSTGRES_FOUND)
-
- INSTALL_FILES(/include/Wt/Dbo/backend "^Postgres$")
- INSTALL_FILES(/include/Wt/Dbo/backend "^.*Postgres.*h$")
--ELSE(POSTGRES_FOUND)
-+ELSE(ENABLE_POSTGRES AND POSTGRES_FOUND)
- MESSAGE("** Wt::Dbo: not building Postgres backend.")
-- MESSAGE(" Indicate the location of your postgres installation using -DPOSTGRES_PREFIX=...")
--ENDIF(POSTGRES_FOUND)
-+ IF(ENABLE_POSTGRES)
-+ MESSAGE(" Indicate the location of your postgres installation using -DPOSTGRES_PREFIX=...")
-+ ENDIF(ENABLE_POSTGRES)
-+ENDIF(ENABLE_POSTGRES AND POSTGRES_FOUND)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index d18ca2e..2a928ae 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,20 +1,27 @@
--ADD_EXECUTABLE(test
-- test.C
-- chart/WChartTest.C
-- dbo/DboTest.C
-- dbo/DboTest2.C
-- models/WBatchEditProxyModelTest.C
-- utf8/Utf8Test.C
-- wdatetime/WDateTimeTest.C
--)
-+# Tests need sqlite
-+IF(ENABLE_SQLITE)
-
--# SQLITE3 test
--TARGET_LINK_LIBRARIES(test wt wtdbo wtdbosqlite3)
--ADD_DEFINITIONS(-DSQLITE3)
-+ ADD_EXECUTABLE(test
-+ test.C
-+ chart/WChartTest.C
-+ dbo/DboTest.C
-+ dbo/DboTest2.C
-+ models/WBatchEditProxyModelTest.C
-+ utf8/Utf8Test.C
-+ wdatetime/WDateTimeTest.C
-+ )
-
--# POSTGRES test
--#TARGET_LINK_LIBRARIES(test wt wtdbo wtdbopostgres)
--#ADD_DEFINITIONS(-DPOSTGRES)
-+ # SQLITE3 test
-+ TARGET_LINK_LIBRARIES(test wt wtdbo wtdbosqlite3)
-+ ADD_DEFINITIONS(-DSQLITE3)
-+
-+ENDIF(ENABLE_SQLITE)
-+
-+## # POSTGRES test
-+## IF(ENABLE_POSTGRES AND POSTGRES_FOUND)
-+## TARGET_LINK_LIBRARIES(test wt wtdbo wtdbopostgres)
-+## ADD_DEFINITIONS(-DPOSTGRES)
-+## ENDIF(ENABLE_POSTGRES AND POSTGRES_FOUND)
-
- INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src)
-
---
-1.7.2.2
-
diff --git a/net-libs/wt/metadata.xml b/net-libs/wt/metadata.xml
deleted file mode 100644
index f2d52bfe26b3..000000000000
--- a/net-libs/wt/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- witty
-
-
diff --git a/net-libs/wt/wt-3.3.4.ebuild b/net-libs/wt/wt-3.3.4.ebuild
deleted file mode 100644
index 00cee3579e5b..000000000000
--- a/net-libs/wt/wt-3.3.4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit cmake-utils versionator eutils user
-
-DESCRIPTION="C++ library for developing interactive web applications"
-MY_P=${P/_/-}
-HOMEPAGE="http://webtoolkit.eu/"
-SRC_URI="mirror://sourceforge/witty/wt/3.3.0/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +extjs fcgi graphicsmagick mysql pdf postgres resources +server ssl +sqlite test zlib"
-
-RDEPEND="
- >=dev-libs/boost-1.41
- graphicsmagick? ( media-gfx/graphicsmagick )
- pdf? (
- media-libs/libharu
- x11-libs/pango
- )
- postgres? ( dev-db/postgresql:= )
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite:3 )
- fcgi? (
- dev-libs/fcgi
- virtual/httpd-fastcgi
- )
- server? (
- ssl? ( dev-libs/openssl:= )
- zlib? ( sys-libs/zlib )
- )
-"
-DEPEND="
- ${RDEPEND}
- >=dev-util/cmake-2.6
-"
-
-DOCS="Changelog INSTALL"
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use !server && use !fcgi; then
- ewarn "You have to select at least built-in server support or fcgi support."
- ewarn "Invalid use flag combination, enable at least one of: server, fcgi"
- fi
-
- if use test && use !sqlite; then
- ewarn "Tests need sqlite, disabling."
- fi
-
- enewgroup wt
- enewuser wt -1 -1 /var/lib/wt/home wt
-}
-
-src_prepare() {
- # just to be sure
- rm -rf Wt/Dbo/backend/amalgamation
-
- # fix png linking
- if use pdf; then
- sed -e 's/-lpng12/-lpng/' \
- -i cmake/WtFindHaru.txt || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- BOOST_PKG="$(best_version ">=dev-libs/boost-1.41.0")"
- BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
- BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
- BOOST_INC="/usr/include/boost-${BOOST_VER}"
-
- local mycmakeargs=(
- -DDESTDIR="${D}"
- -DLIB_INSTALL_DIR=$(get_libdir)
- $(cmake-utils_use test BUILD_TESTS)
- -DSHARED_LIBS=ON
- -DMULTI_THREADED=ON
- -DUSE_SYSTEM_SQLITE3=ON
- -DWEBUSER=wt
- -DWEBGROUP=wt
- $(cmake-utils_use extjs ENABLE_EXT)
- $(cmake-utils_use graphicsmagick ENABLE_GM)
- $(cmake-utils_use pdf ENABLE_HARU)
- $(cmake-utils_use postgres ENABLE_POSTGRES)
- $(cmake-utils_use sqlite ENABLE_SQLITE)
- $(cmake-utils_use mysql ENABLE_MYSQL)
- $(cmake-utils_use fcgi CONNECTOR_FCGI)
- $(cmake-utils_use server CONNECTOR_HTTP)
- $(cmake-utils_use ssl WT_WITH_SSL)
- $(cmake-utils_use zlib HTTP_WITH_ZLIB)
- -DBUILD_EXAMPLES=OFF
- $(cmake-utils_use resources INSTALL_RESOURCES)
- )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- # Tests need sqlite
- if use sqlite; then
- pushd "${CMAKE_BUILD_DIR}" > /dev/null
- ./test/test || die
- popd > /dev/null
- fi
-}
-
-src_install() {
-
- dodir \
- /var/lib/wt \
- /var/lib/wt/home
-
- cmake-utils_src_install
-
- use doc && dohtml -A pdf,xhtml -r doc/*
-
-}
-
-pkg_postinst() {
- if use fcgi; then
- elog "You selected fcgi support. Please make sure that the web-server"
- elog "has fcgi support and access to the fcgi socket."
- elog "You can use spawn-fcgi to spawn the witty-processes and run them"
- elog "in a chroot environment."
- fi
-
- chown -R wt:wt \
- "${ROOT}"/var/lib/wt
-
- chmod 0750 \
- "${ROOT}"/var/lib/wt \
- "${ROOT}"/var/lib/wt/home
-
-}
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
index 9d7a1beefe8f..9976ee40c511 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
@@ -11,7 +11,7 @@ else
MY_P="${MY_P/_beta/-beta}"
MY_P="${MY_P/_rc/-rc}"
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/gnome-rdp/Manifest b/net-misc/gnome-rdp/Manifest
deleted file mode 100644
index c1924658d40e..000000000000
--- a/net-misc/gnome-rdp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-rdp-0.3.0.9.tar.gz 138141 SHA256 d5b70e42f9a7d407daf1fc76232c11e5190cfa6b1ec7f7a82a44753c13e9168d SHA512 74760dff5a6bdf6c957eef3148da733ff83bb5d36cb75349fd9cbf023b99a0cf62461f7311a5c52d70b8885b980f70bcb3a0398cbb5e04602f78fd79cfc5fdda WHIRLPOOL 02a58eaaa7037aebc7a2ca14cb9932d9b99f08e025de110c128dc028a84cb51f97b8850a0ca50783bd47e393660f70ade4655d2edef15aeaa88eaff940ef5e5a
diff --git a/net-misc/gnome-rdp/gnome-rdp-0.3.0.9.ebuild b/net-misc/gnome-rdp/gnome-rdp-0.3.0.9.ebuild
deleted file mode 100644
index 463329ba5bb7..000000000000
--- a/net-misc/gnome-rdp/gnome-rdp-0.3.0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils mono
-
-DESCRIPTION="Remote Desktop Client for the GNOME desktop"
-HOMEPAGE="https://sourceforge.net/projects/gnome-rdp"
-SRC_URI="mirror://sourceforge/gnome-rdp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+rdesktop +vnc"
-
-RDEPEND="dev-db/sqlite:3
- dev-dotnet/ndesk-dbus-glib
- dev-dotnet/gconf-sharp:2
- dev-dotnet/glade-sharp:2
- dev-dotnet/glib-sharp:2
- dev-dotnet/gtk-sharp:2
- >=dev-dotnet/gnome-keyring-sharp-1.0
- >=net-misc/openssh-3
- >=x11-terms/gnome-terminal-2
- rdesktop? ( >=net-misc/rdesktop-1.3 )
- vnc? ( >=net-misc/tightvnc-1.2 )"
-DEPEND="${RDEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc ChangeLog
- doicon Menu/${PN}.png
- domenu Menu/${PN}.desktop
-}
diff --git a/net-misc/gnome-rdp/metadata.xml b/net-misc/gnome-rdp/metadata.xml
deleted file mode 100644
index 499d1f1eeee5..000000000000
--- a/net-misc/gnome-rdp/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- Mono Remote Desktop Client for the GNOME Desktop. Supported protocols: RDP, VNC, SSH. Configured sessions can be saved to the built in list
-
- gnome-rdp
-
-
diff --git a/net-misc/goog-sitemapgen/Manifest b/net-misc/goog-sitemapgen/Manifest
deleted file mode 100644
index 185b210f0c26..000000000000
--- a/net-misc/goog-sitemapgen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sitemap_gen_1.5.tar.gz 22742 SHA256 d66a5df1450ae70a2ee29a52325c663019d8022cf2813d2592860ec635b0cf73 SHA512 47d0fab242611e5a94ff097d99dce4392831837d1c5f4c0afde51b256df80060799263cad7f30695579b18e0917087b2b6a4a19136c184521c338353cea96596 WHIRLPOOL 381af46dcdf9f24b1ec1567d1105693d2a7671bb96a6f55fcd01046caea272f258cf26f14c4501c9a5c55ae0f07a881b58256c998578a3477f4ccfca6d2d7bde
diff --git a/net-misc/goog-sitemapgen/files/goog-sitemapgen-1.5.patch b/net-misc/goog-sitemapgen/files/goog-sitemapgen-1.5.patch
deleted file mode 100644
index 4f4d8d1074f5..000000000000
--- a/net-misc/goog-sitemapgen/files/goog-sitemapgen-1.5.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup.py~ 2007-07-19 05:51:20.000000000 +0200
-+++ setup.py 2012-03-20 11:47:32.218963792 +0100
-@@ -9,4 +9,5 @@
- author='Google Inc.',
- author_email='opensource@google.com',
- url='http://code.google.com/p/sitemap-generators/',
-+ scripts=['sitemap_gen'],
- )
diff --git a/net-misc/goog-sitemapgen/goog-sitemapgen-1.5.ebuild b/net-misc/goog-sitemapgen/goog-sitemapgen-1.5.ebuild
deleted file mode 100644
index 85e295f5dca4..000000000000
--- a/net-misc/goog-sitemapgen/goog-sitemapgen-1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit eutils python distutils
-
-MY_P="sitemap_gen_${PV}"
-
-DESCRIPTION="A python script which will generate an XML sitemap for your web site"
-HOMEPAGE="https://sitemap-generators.googlecode.com/"
-SRC_URI="https://sitemap-generators.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog example_* README"
-
-S=${WORKDIR}
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- distutils_src_prepare
- epatch "${FILESDIR}"/${P}.patch
- mv sitemap_gen.py sitemap_gen || die
-}
diff --git a/net-misc/goog-sitemapgen/metadata.xml b/net-misc/goog-sitemapgen/metadata.xml
deleted file mode 100644
index 8f2f0879285b..000000000000
--- a/net-misc/goog-sitemapgen/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- Sitemap Gen is a python script which will generate an xml Sitemap for
- your web site.
- The sitemap_gen.py script analyzes your web server and generates one or
- more Sitemap files. These files are XML listings of content you make
- available on your web server. The files can be directly submitted to
- search engines as hints for the search engine web crawlers as they
- index your web site. This can result in better coverage of your web
- content in search engine indices, and less of your bandwidth spent
- doing it.
- The sitemap_gen.py script is written in Python 2.2 and released to the
- open source community for continuous improvements.
-
- sitemap-generators
-
-
diff --git a/net-misc/googlecl/Manifest b/net-misc/googlecl/Manifest
deleted file mode 100644
index 43941220548b..000000000000
--- a/net-misc/googlecl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST googlecl-0.9.14.tar.gz 99834 SHA256 0a4640b1240104b8020f9af526e24afe53a8327390d95ef28e1ca093673fce5a SHA512 199a959b6d975fff0295833bf9f59b59a8a5c8a74f0e353fca37da579e9964e305452f0aefb263a2f10d267fc433d37cc4cf60b9ad024c2caa8d6e43f3766440 WHIRLPOOL 140dd5deca7ea03f3003ecbdd30196851a306c67f79b9155896b02296cef0ee9e50eeed9eb1aef8c1c9f1c6084ef243e146940991295cf8e37385c832223d445
diff --git a/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch b/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch
deleted file mode 100644
index 83897bb69550..000000000000
--- a/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-fix "when" field in calendar not showing dates
-
-http://bugs.gentoo.org/show_bug.cgi?id=355913
-http://code.google.com/p/googlecl/issues/detail?id=358
-
-Index: googlecl/base.py
-===================================================================
---- src/googlecl/base.py (revision 527)
-+++ src/googlecl/base.py (working copy)
-@@ -673,10 +673,12 @@
- except ValueError, err:
- LOG.debug(err.args[0] + ' (Did not add value for field ' + attr + ')')
- except AttributeError, err:
-+ LOG.debug(err.args[0] + ' (value for field ' + attr + ')')
- try:
- # Last ditch effort to blindly grab the attribute
- val = getattr(wrapped_entry.entry, attr).text or missing_field_value
- except AttributeError:
-+ LOG.debug(err.args[0] + ' (value for field ' + attr + ')')
- val = missing_field_value
- # Apparently, atom(?) doesn't always return a Unicode type when there are
- # non-latin characters, so force everything to Unicode.
-Index: googlecl/calendar/__init__.py
-===================================================================
---- src/googlecl/calendar/__init__.py (revision 527)
-+++ src/googlecl/calendar/__init__.py (working copy)
-@@ -235,12 +235,22 @@
-
-
- class CalendarEntryToStringWrapper(googlecl.base.BaseEntryToStringWrapper):
-+ def __init__(self, entry, config):
-+ """Initialize a CalendarEntry wrapper.
-+
-+ Args:
-+ entry: CalendarEntry to interpret to strings.
-+ config: Configuration parser. Needed for some values.
-+ """
-+ googlecl.base.BaseEntryToStringWrapper.__init__(self, entry)
-+ self.config_parser = config
-+
- @property
- def when(self):
- """When event takes place."""
- start_date, end_date, freq = get_datetimes(self.entry)
-- print_format = googlecl.CONFIG.lazy_get(SECTION_HEADER,
-- 'date_print_format')
-+ print_format = self.config_parser.lazy_get(SECTION_HEADER,
-+ 'date_print_format')
- start_text = time.strftime(print_format, start_date)
- end_text = time.strftime(print_format, end_date)
- value = start_text + ' - ' + end_text
-@@ -277,9 +287,9 @@
-
- for entry in single_events:
- print googlecl.base.compile_entry_string(
-- CalendarEntryToStringWrapper(entry),
-- options.fields.split(','),
-- delimiter=options.delimiter)
-+ CalendarEntryToStringWrapper(entry, client.config),
-+ options.fields.split(','),
-+ delimiter=options.delimiter)
-
-
- #===============================================================================
diff --git a/net-misc/googlecl/googlecl-0.9.14.ebuild b/net-misc/googlecl/googlecl-0.9.14.ebuild
deleted file mode 100644
index 7d18b12a39e6..000000000000
--- a/net-misc/googlecl/googlecl-0.9.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-PYTHON_DEPEND="2:2.5:2.7"
-
-inherit distutils
-
-DESCRIPTION="Command line tools for the Google Data APIs"
-HOMEPAGE="https://code.google.com/p/googlecl/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~arm-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- dev-python/gdata
-"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_install() {
- distutils_src_install
-
- dodoc changelog || die "dodoc failed"
- doman man/*.1 || die "doman failed"
-}
diff --git a/net-misc/googlecl/metadata.xml b/net-misc/googlecl/metadata.xml
deleted file mode 100644
index 7482c1cf949a..000000000000
--- a/net-misc/googlecl/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- googlecl
-
-
diff --git a/net-misc/gtkvncviewer/Manifest b/net-misc/gtkvncviewer/Manifest
deleted file mode 100644
index 5637ecacdefd..000000000000
--- a/net-misc/gtkvncviewer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtkvncviewer-0.4.tar.gz 79464 SHA256 e439fd92d445e87b8e450ac0b8fe3d555ceac579daf29028a36b551f231bf708 SHA512 eec3097e1faeb73b0be90c57df9381c996fa2565cda2a9f6e292580c10601b5fc56707ef372c9cc4973807eea559c557b584eb36c83eefbbf32141714587b756 WHIRLPOOL 163d6a59c818a078902be406d527e5f58ffac05a1c48fad9c0070466fca5f6045fb91b01dc226631a8084c38320a45606538a61485de1cf6c163a949c939f4a7
diff --git a/net-misc/gtkvncviewer/gtkvncviewer-0.4.ebuild b/net-misc/gtkvncviewer/gtkvncviewer-0.4.ebuild
deleted file mode 100644
index d09b94fd90bc..000000000000
--- a/net-misc/gtkvncviewer/gtkvncviewer-0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit eutils fdo-mime python
-
-DESCRIPTION="A small GTK tool to connect to VNC servers"
-HOMEPAGE="https://launchpad.net/gtkvncviewer"
-SRC_URI="https://launchpad.net/${PN}/trunk/0.4/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/gconf-python:2
- dev-python/gnome-keyring-python
- dev-python/pygtk:2
- net-libs/gtk-vnc[python]"
-DEPEND="${RDEPEND}"
-
-src_install() {
- dodir /usr/share/gtkvncviewer
- domenu data/gtkvncviewer.desktop
- rm -f data/gtkvncviewer.desktop
- insinto /usr/share/gtkvncviewer
- doins -r locale data gtkvncviewer.py
- doman gtkvncviewer.1
- dodoc AUTHORS CHANGELOG TODO
- make_wrapper gtkvncviewer "/usr/bin/python2 ${PN}.py" "/usr/share/${PN}"
- validate_desktop_entries
-}
-
-pkg_postinst() { fdo-mime_desktop_database_update; }
-pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/net-misc/gtkvncviewer/metadata.xml b/net-misc/gtkvncviewer/metadata.xml
deleted file mode 100644
index cc712acb151a..000000000000
--- a/net-misc/gtkvncviewer/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- gtkvncviewer
-
-
diff --git a/net-misc/identicurse/Manifest b/net-misc/identicurse/Manifest
deleted file mode 100644
index 4e4c9fcec02f..000000000000
--- a/net-misc/identicurse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST identicurse-0.9.tar.bz2 62278 SHA256 27caaf2e2af1fdcb3428aa811d7a03d2104f13fb9055b3ef612a7d4c70352ebb SHA512 5c81527d9905537bb73453ec2ef561a34f7cf3a5db4200a778df02c9f523d681286a092e4a417d61ba68ac30d2f8e9aac6db43ab34ee1fba97c8c3717aa04a7c WHIRLPOOL 5995d929d465e9d3c29cb60b526d9728e53ef8ef008996c6bb0fb93eb185fc2d0ec97c0951da3c0657a95198afa983db04fc3be6db6ddb6654fc2e9908cfdf76
diff --git a/net-misc/identicurse/files/0.9-config_json_path.patch b/net-misc/identicurse/files/0.9-config_json_path.patch
deleted file mode 100644
index 08f985f1eebd..000000000000
--- a/net-misc/identicurse/files/0.9-config_json_path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@
-
- license="GPLv3+",
-
-- data_files=[('identicurse',['README', 'conf/config.json'])],
-+ data_files=[('share/identicurse',['conf/config.json'])],
- packages=find_packages('src'),
- package_dir={'': 'src'},
- include_package_data=True,
---- a/src/identicurse/identicurse.py
-+++ b/src/identicurse/identicurse.py
-@@ -156,7 +156,7 @@
- else:
- import getpass, time
- # no config yet, so let's build one
-- config.config.load(os.path.join(self.path, "config.json"))
-+ config.config.load(os.path.join("/", "usr", "share", "identicurse", "config.json"))
- print "No config was found, so we will now run through a few quick questions to set up a basic config for you (which will be saved as %s so you can manually edit it later). If the default (where defaults are available, they're stated in []) is already fine for any question, just press Enter without typing anything, and the default will be used." % (config.config.filename)
- print "This version of IdentiCurse supports OAuth login. Using OAuth to log in means that you do not need to enter your username and password."
- use_oauth = raw_input("Use OAuth [Y/n]? ").upper()
diff --git a/net-misc/identicurse/files/identicurse-gzipped_readme.patch b/net-misc/identicurse/files/identicurse-gzipped_readme.patch
deleted file mode 100644
index b4575ef07b97..000000000000
--- a/net-misc/identicurse/files/identicurse-gzipped_readme.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Point the online help to /usr/share/identicurse/README.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612976
-Author: Alessio Treglia
-
---- a/src/identicurse/tabbage.py
-+++ b/src/identicurse/tabbage.py
-@@ -225,6 +225,8 @@ class Help(Tab):
- def __init__(self, window, identicurse_path):
- self.name = "Help"
- self.path = os.path.join(identicurse_path, "README")
-+ if not os.path.isfile(self.path):
-+ self.path = '/usr/share/identicurse/README'
- Tab.__init__(self, window)
-
- def update(self):
diff --git a/net-misc/identicurse/identicurse-0.9.ebuild b/net-misc/identicurse/identicurse-0.9.ebuild
deleted file mode 100644
index 428b27e56d80..000000000000
--- a/net-misc/identicurse/identicurse-0.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils versionator
-
-MY_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="A simple Identi.ca client with a curses-based UI"
-HOMEPAGE="http://identicurse.net"
-SRC_URI="http://identicurse.net/release/${MY_PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="dev-python/oauth"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-gzipped_readme.patch \
- "${FILESDIR}"/${PV}-config_json_path.patch
- rm -rf src/oauth #405735
- distutils_src_prepare
-}
diff --git a/net-misc/identicurse/metadata.xml b/net-misc/identicurse/metadata.xml
deleted file mode 100644
index 12ad87b21b83..000000000000
--- a/net-misc/identicurse/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
- A simple Identi.ca client with a curses-based UI.
-
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
index 7dcdb9e9a7ab..34f802c03407 100644
--- a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
@@ -36,8 +36,8 @@ pkg_setup() {
}
src_prepare() {
- sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties"
- sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties"
+ sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+ sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
}
src_install() {
diff --git a/net-misc/nut-monitor/Manifest b/net-misc/nut-monitor/Manifest
deleted file mode 100644
index 8a2062573aa9..000000000000
--- a/net-misc/nut-monitor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nut-monitor-1.3.tar.gz 31338 SHA256 a2e23b0372d170a9a67d55227ed4a0a6a9ae1505ad23b2004782ed9964567502 SHA512 637e43671cf508d42f1dd6d85b60d66eb4974d14f36af4a606b45be2175e9b9d431bb46d8e68fe8598cdbb241a307377715725d3991a2f41ea418f4877302a5b WHIRLPOOL ba1cc8f5b2e5ea8f92459704d9c975bc9890e868d7f3822c901b0300362531172dc3ff5f38387b5fbeee7484dc9b1fa541a914528b74c6c3920eabf4a53816db
diff --git a/net-misc/nut-monitor/files/nut-monitor-1.3-paths.patch b/net-misc/nut-monitor/files/nut-monitor-1.3-paths.patch
deleted file mode 100644
index 00fd0ded3d3f..000000000000
--- a/net-misc/nut-monitor/files/nut-monitor-1.3-paths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/scripts/python/app/NUT-Monitor
-+++ b/scripts/python/app/NUT-Monitor
-@@ -70,7 +70,7 @@
- ( cmd_opts, args ) = opt_parser.parse_args()
-
-
-- self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" )
-+ self.__glade_file = '/usr/share/nut-monitor/gui-1.3.glade'
-
- self.__widgets["interface"] = gtk.glade.XML( self.__glade_file, "window1", APP )
- self.__widgets["main_window"] = self.__widgets["interface"].get_widget("window1")
-@@ -103,11 +103,11 @@
-
- # Create the tray icon and connect it to the show/hide method...
- self.__widgets["status_icon"] = gtk.StatusIcon()
-- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
-+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut-monitor/pixmaps/on_line.png" )
- self.__widgets["status_icon"].set_visible( True )
- self.__widgets["status_icon"].connect( "activate", self.tray_activated )
-
-- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
-+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut-monitor/pixmaps/on_line.png" )
-
- # Define interface callbacks actions
- self.__callbacks = { "on_window1_destroy" : self.quit,
-@@ -265,8 +265,8 @@
- #-------------------------------------------------------------------
- # Change the status icon and tray icon
- def change_status_icon( self, icon="on_line", blink=False ) :
-- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
-- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
-+ self.__widgets["status_icon"].set_from_file( "/usr/share/nut-monitor/pixmaps/%s.png" % icon )
-+ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut-monitor/pixmaps/%s.png" % icon )
- self.__widgets["status_icon"].set_blinking( blink )
-
- #-------------------------------------------------------------------
-@@ -719,9 +719,9 @@
-
- for k,v in vars.iteritems() :
- if ( rwvars.has_key( k ) ) :
-- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" )
-+ icon_file = "/usr/share/nut-monitor/pixmaps/var-rw.png"
- else :
-- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" )
-+ icon_file = "/usr/share/nut-monitor/pixmaps/var-ro.png"
-
- icon = gtk.gdk.pixbuf_new_from_file( icon_file )
- self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] )
diff --git a/net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch b/net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch
deleted file mode 100644
index 92d6833ee1ff..000000000000
--- a/net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- NUT-Monitor~ 2012-04-03 12:04:09.000000000 +0200
-+++ NUT-Monitor 2012-04-03 12:05:32.949730947 +0200
-@@ -888,7 +888,7 @@
-
- # Init the localisation
- APP = "NUT-Monitor"
-- DIR = "locale"
-+ DIR = "/usr/share/locale"
-
- gettext.bindtextdomain( APP, DIR )
- gettext.textdomain( APP )
diff --git a/net-misc/nut-monitor/metadata.xml b/net-misc/nut-monitor/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/nut-monitor/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild b/net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild
deleted file mode 100644
index 2e430a9de4ca..000000000000
--- a/net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-DESCRIPTION="A graphical application to monitor and manage UPSes connected to a NUT server"
-HOMEPAGE="http://www.lestat.st/informatique/projets/nut-monitor-en/"
-SRC_URI="http://www.lestat.st/_media/informatique/projets/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="linguas_fr"
-
-RDEPEND="dev-python/pygtk
- dev-python/pynut"
-DEPEND=""
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-paths.patch
- epatch "${FILESDIR}"/${P}-paths2.patch
- python_convert_shebangs -r 2 .
-}
-
-src_install() {
- dobin NUT-Monitor
- dosym NUT-Monitor /usr/bin/${PN}
-
- insinto /usr/share/nut-monitor
- doins gui-${PV}.glade
-
- dodir /usr/share/nut-monitor/pixmaps
- insinto /usr/share/nut-monitor/pixmaps
- doins pixmaps/*
-
- doicon ${PN}.png
- domenu ${PN}.desktop
-
- dodoc README
-
- if use linguas_fr; then
- insinto /usr/share/locale/fr/LC_MESSAGES/
- doins locale/fr/LC_MESSAGES/NUT-Monitor.mo
- fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
index de00dcb64c63..b73f522234d9 100644
--- a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
IUSE="gnutls java +opengl pam server +xorgmodule"
RDEPEND="virtual/jpeg:0
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
deleted file mode 100644
index 12a4c204fe1b..000000000000
--- a/net-misc/tightvnc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tightvnc-1.3.10_javasrc.tar.gz 89641 SHA256 465a6c90d362029152ea16d0b8e2c29f772b06eeec6c561278390f73d64ec6ec SHA512 e33366b45f06b6522dce79e2f43bc4d7ffa00577f7a1a56026f9e869de7e61838093fdc7e9c4dace326652d9416c2267f6d211ac639095ffd1c4ba38dddb8851 WHIRLPOOL 8ba7a6545a105687989f469400d0d76d68e6a1f33462cf4aa725282d8c6c5ebd01a2c0f269dbd924a9272af81423321a85be8b24abf484962d990b21138d3451
-DIST tightvnc-1.3.10_unixsrc.tar.bz2 1780510 SHA256 f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d SHA512 b5b3d5d532feffc07db2d48d3416e1a0d1b1b15bdb8ff801ed42042d4b99f34365e10e3b005bc15cc6e0a33c429db8976c227a1854e1af5e10bcb60e17a69b87 WHIRLPOOL 3ede45e5e480c93384d331f80beefac723925014cf29f94b4b12c3ce6d78daca38ff7f4279411db76c83dca0ab1733310b877836e55a5f2084e826dbabbe1d23
-DIST tightvnc.png 495 SHA256 dfe4eaf3f68a4905b3ab90e7cae528449c7d13a4f712f97d8855058ed9cc3fc4 SHA512 a05f8cabdae9625718d1f9cb52c0893c4a3cd784cb074dee51b68bc617eb59759a4e8849113a4b385dfcea9d3e3b099adb564a6655d6b7f4c5cc87e275714065 WHIRLPOOL 152fcb14f72a2907d3a0751f478033a3c3d0d9a73f6aa371315cd76d73ccda32c4e62bf005828ccb19926d813bb9f65cc8cd27575bf63ebb280377b4412ffea9
diff --git a/net-misc/tightvnc/files/1.3.10-sparc.patch b/net-misc/tightvnc/files/1.3.10-sparc.patch
deleted file mode 100644
index 26b7bddae75b..000000000000
--- a/net-misc/tightvnc/files/1.3.10-sparc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur vnc_unixsrc.orig/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
---- vnc_unixsrc.orig/Xvnc/programs/Xserver/include/servermd.h 2009-11-04 18:44:50.000000000 +0000
-+++ vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h 2009-11-04 18:47:48.000000000 +0000
-@@ -421,6 +421,20 @@
-
- #endif /* Linux/PPC */
-
-+#if defined (linux) && defined(__sparc__)
-+
-+#define IMAGE_BYTE_ORDER MSBFirst
-+#define BITMAP_BIT_ORDER MSBFirst
-+#define GLYPHPADBYTES 4
-+#define GETLEFTBITS_ALIGNMENT 1
-+
-+#define AVOID_MEMORY_READ
-+#define LARGE_INSTRUCTION_CACHE
-+#define FAST_CONSTANT_OFFSET_MODE
-+#define SHARED_IDCACHE
-+
-+#endif /* Linux/sparc */
-+
- #if defined(__MACH__) && defined(__POWERPC__)
-
- #define IMAGE_BYTE_ORDER MSBFirst
\ No newline at end of file
diff --git a/net-misc/tightvnc/files/1.3.9-arm.patch b/net-misc/tightvnc/files/1.3.9-arm.patch
deleted file mode 100644
index a238e29379c6..000000000000
--- a/net-misc/tightvnc/files/1.3.9-arm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur vnc_unixsrc.orig/Xvnc/config/cf/Imake.cf vnc_unixsrc/Xvnc/config/cf/Imake.cf
---- vnc_unixsrc.orig/Xvnc/config/cf/Imake.cf 2008-09-24 18:50:40.000000000 +0200
-+++ vnc_unixsrc/Xvnc/config/cf/Imake.cf 2008-09-24 18:51:37.000000000 +0200
-@@ -711,7 +711,7 @@
- # undef __alpha__
- # endif /* __alpha__ */
- # ifdef __arm__
--# define Arm32Architecture
-+# define ArmArchitecture
- # undef arm
- # undef __arm
- # undef __arm__
diff --git a/net-misc/tightvnc/files/1.3.9-fbsd.patch b/net-misc/tightvnc/files/1.3.9-fbsd.patch
deleted file mode 100644
index bc527a802aed..000000000000
--- a/net-misc/tightvnc/files/1.3.9-fbsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Xvnc/include/Xos.bak 2007-03-23 18:26:14 +0100
-+++ Xvnc/include/Xos.h 2007-03-23 18:26:22 +0100
-@@ -150,11 +150,6 @@
- #endif
- #endif /* X_NOT_POSIX else */
-
--#ifdef CSRG_BASED
--#include
--#include
--#endif /* CSRG_BASED */
--
- /*
- * Get struct timeval
- */
-
---- Xvnc/config/imake/imakemdep.h~ 2003-02-19 09:39:54 -0700
-+++ Xvnc/config/imake/imakemdep.h 2007-06-27 09:54:44 -0600
-@@ -253,7 +253,10 @@
- #ifdef _CRAY
- #define DEFAULT_CPP "/lib/pcpp"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+#if defined(__FreeBSD__)
-+#define DEFAULT_CPP "/usr/bin/cpp"
-+#endif
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
- #if defined(__sgi) && defined(__ANSI_CPP__)
diff --git a/net-misc/tightvnc/files/1.3.9-sh.patch b/net-misc/tightvnc/files/1.3.9-sh.patch
deleted file mode 100644
index db76917f4e42..000000000000
--- a/net-misc/tightvnc/files/1.3.9-sh.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur vnc_unixsrc.orig/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
---- vnc_unixsrc.orig/Xvnc/config/cf/linux.cf 2009-01-01 11:41:14.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/linux.cf 2009-01-01 11:44:08.000000000 +0100
-@@ -43,7 +43,8 @@
- #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
- defined(SparcArchitecture) || defined(ArmArchitecure) || \
- defined(i386Architecture) || defined(s390Architecture) || \
-- defined(s390xArchitecture) || defined(MipsArchitecture)
-+ defined(s390xArchitecture) || defined(MipsArchitecture) || \
-+ defined(SuperHArchitecture)
- #define DefaultLinuxCLibMajorVersion 6
- #else
- #define DefaultLinuxCLibMajorVersion 5
-@@ -312,6 +313,14 @@
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* Arm */
-
-+#ifdef SuperHArchitecture
-+#define DefaultCCOptions -fsigned-char
-+#define OptimizedCDebugFlags -O2
-+#define LinuxMachineDefines -D__sh__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+#endif /* SuperH */
-+
- #ifdef SparcArchitecture
- #define OptimizedCDebugFlags -O2
- #define LinuxMachineDefines -D__sparc__
\ No newline at end of file
diff --git a/net-misc/tightvnc/files/README.JavaViewer b/net-misc/tightvnc/files/README.JavaViewer
deleted file mode 100644
index acb96bd9c064..000000000000
--- a/net-misc/tightvnc/files/README.JavaViewer
+++ /dev/null
@@ -1,423 +0,0 @@
-
-TightVNC Java Viewer version 1.2.7
-==================================
-
-Copyright (C) 2001,2002 HorizonLive.com, Inc. All Rights Reserved.
-Copyright (C) 2001,2002 Constantin Kaplinsky. All Rights Reserved.
-Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
-
-This software is distributed under the GNU General Public Licence as
-published by the Free Software Foundation. See the file LICENCE.TXT for the
-conditions under which this software is made available. TightVNC also
-contains code from other sources. See the Acknowledgements section below, and
-the individual files for details of the conditions under which they are made
-available.
-
-
-Compiling from the sources
-==========================
-
-To compile all the .java files to .class files, simply do:
-
- % make all
-
-This will also generate a JAR (Java archive) file containing all the classes.
-Most JVM (Java Virtual Machine) implementations are able to use either a set
-of .class files, or the JAR archive.
-
-
-Installation
-============
-
-There are three basic ways to use TightVNC Java viewer:
-
- 1. Running applet as part of TightVNC server installation.
-
- Both the Unix and Windows versions of TightVNC servers include small
- built-in HTTP server which can serve Java viewer to Web clients. This
- enables easy Web access to the shared desktop without need to install
- any software on the client computer. Unix and Windows versions of
- TightVNC servers are different in the way they store the .class and .jar
- files: the Unix server (Xvnc) is able to serve any set of files present
- in a particular directory, while the Windows server (WinVNC) has all the
- .class and .jar files inside the WinVNC executable file. Therefore, for
- Xvnc, it's enough to copy the files into a correct directory, but for
- WinVNC, the server binaries should be rebuild if the built-in Java
- viewer should be updated.
-
- To install the Java viewer under Xvnc, copy all the .class files, the
- .jar file and the .vnc files to an installation directory (e.g.
- /usr/local/vnc/classes):
-
- cp *.class *.jar *.vnc /usr/local/vnc/classes
-
- Also, make sure that the vncserver script is configured to point to the
- installation directory (see the Xvnc manual page for the description of
- the -httpd command-line option).
-
- 2. Running applet hosted on a standalone Web server.
-
- Another possibility to use the Java viewer is to install it under a
- fully-functional HTTP server such as Apache or IIS. Obviously, this
- method requires running an HTTP server, and due to the Java security
- restrictions, it's also required that the server should be installed on
- the same machine which is running the TightVNC server. In this case,
- installation is simply copying the .class and .jar files into a
- directory that is under control of the HTTP server. Also, an HTML page
- should be created which will act as a the base document for the viewer
- applet (see an example named index.html in this distribution).
-
- 3. Running the viewer as a standalone application.
-
- Finally, the Java viewer can be executed locally on the client machine,
- but this method requires installation of either JRE (Java Runtime
- Environment) or JDK (Java Development Kit). If all the .class files are
- in the current directory, the Java viewer can be executed like this,
- from the command line:
-
- java VncViewer HOST vnchost PORT 5900
-
- The parameters HOST and PORT are required, but there is a number of
- optional parameters as well (see the Parameters section below).
-
-Parameters
-==========
-
-TightVNC Java viewer supports a number of parameters allowing you to
-customize its behaviour. Most parameter names copy settings available from
-the Options frame in the Java viewer. Both parameter names and their values
-are case-insensitive, with one exception for the "PASSWORD" parameter. Here
-is the full list of parameters supported in TightVNC Java viewer:
-
---> "HOST" (no GUI equivalent)
-
- Value: host name or IP address of the VNC server.
- Default: in applet mode, the host from which the applet was loaded.
-
- This parameter tells the viewer which server to connect to. Normally,
- it's not needed, because default Java security policy allow connections
- from applets to the only one host anyway, and that is the host from which
- the applet was loaded.
-
---> "PORT" (no GUI equivalent)
-
- Value: TCP port number on the VNC server.
- Default: none.
-
- This parameter is required in all cases. Note that this port is not the
- one used for HTTP connection from the browser, it is the port used for
- RFB connection. Usually, VNC servers use ports 58xx for HTTP connections,
- and ports 59xx for RFB connections. Thus, most likely, this parameter
- should be set to something like 5900, 5901 etc.
-
---> "PASSWORD"
-
- Value: session password in plan text.
- Default: none, ask user.
-
- DO NOT EVER USE THIS PARAMETER, unless you really know what you are
- doing. It's extremely dangerous from the security point of view. When
- this parameter is set, the viewer won't ever ask for a password.
-
---> "ENCPASSWORD"
-
- Value: encrypted session password in hex-ascii.
- Default: none, ask user.
-
- The same as the "PASSWORD" parameter but DES-encrypted using a fixed key.
- Its value should be represented in hex-ascii e.g. "494015f9a35e8b22".
- This parameter has higher priority over the "PASSWORD" parameter. DO NOT
- EVER USE THIS PARAMETER, unless you really know what you are doing. It's
- extremely dangerous from the security point of view, and encryption does
- not actually help here since the decryption key is always known.
-
---> "Encoding"
-
- Values: "Raw", "RRE", "CoRRE", "Hextile", "Zlib", "Tight".
- Default: "Tight".
-
- The preferred encoding. "Hextile" is a good choice for fast networks,
- while "Tight" is better suited for low-bandwidth connections. From the
- other side, the "Tight" decoder in TightVNC Java viewer seems to be more
- efficient than "Hextile" decoder so it's possible that this default
- setting can be ok for fast networks too.
-
---> "Compression level"
-
- Values: "Default", "1", "2", "3", "4", "5", "6", "7", "8", "9".
- Default: "Default". ;-)
-
- Use specified compression level for "Tight" and "Zlib" encodings. Level 1
- uses minimum of CPU time on the server but achieves weak compression
- ratios. Level 9 offers best compression but may be slow in terms of CPU
- time consumption on the server side. Use high levels with very slow
- network connections, and low levels when working over higher-speed
- networks. The "Default" value means that the server's default compression
- level should be used.
-
---> "JPEG image quality"
-
- Values: "JPEG off", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9".
- Default: "6".
-
- Use the specified image quality level in "Tight" encoding. Quality level
- 0 denotes bad image quality but very impressive compression ratios, while
- level 9 offers very good image quality at lower compression ratios. If
- the value is "JPEG off", the server will not use lossy JPEG compression
- in "Tight" encoding.
-
---> "Cursor shape updates"
-
- Values: "Enable", "Ignore", "Disable".
- Default: "Enable".
-
- Cursor shape updates is a protocol extension used to handle remote cursor
- movements locally on the client side, saving bandwidth and eliminating
- delays in mouse pointer movement. Note that current implementation of
- cursor shape updates does not allow a client to track mouse cursor
- position at the server side. This means that clients would not see mouse
- cursor movements if mouse was moved either locally on the server, or by
- another remote VNC client. Set this parameter to "Disable" if you always
- want to see real cursor position on the remote side. Setting this option
- to "Ignore" is similar to "Enable" but the remote cursor will not be
- visible at all. This can be a reasonable setting if you don't care about
- cursor shape and don't want to see two mouse cursors, one above another.
-
---> "Use CopyRect"
-
- Values: "Yes", "No".
- Default: "Yes".
-
- The "CopyRect" encoding saves bandwidth and drawing time when parts of
- the remote screen are moving around. Most likely, you don't want to
- change this setting.
-
---> "Restricted colors"
-
- Values: "Yes", "No".
- Default: "No".
-
- If set to "No", then 24-bit color format is used to represent pixel data.
- If set to "Yes", then only 8 bits are used to represent each pixel. 8-bit
- color format can save bandwidth, but colors may look very inaccurate.
-
---> "Mouse buttons 2 and 3"
-
- Values: "Normal", "Reversed".
- Default: "Normal".
-
- If set to "Reversed", then right mouse button (button 2) will act as it
- was middle mouse button (button 3), and vice versa.
-
---> "View only"
-
- Values: "Yes", "No".
- Default: "No".
-
- If set to "Yes", then all keyboard and mouse events in the desktop window
- will be silently ignored and will not be passed to the remote side.
-
---> "Share desktop"
-
- Values: "Yes", "No".
- Default: "Yes".
-
- Share the connection with other clients on the same VNC server. The exact
- behaviour in each case depends on the server configuration.
-
---> "Open new window" (no GUI equivalent, applicable only in the applet mode)
-
- Values: "Yes", "No".
- Default: "No".
-
- Operate in a separate window. This makes possible resizing the desktop,
- and adds scroll bars when necessary. If the server supports variable
- desktop size, the window will resize automatically when remote desktop
- size changes.
-
---> "Show controls" (no GUI equivalent)
-
- Values: "Yes", "No".
- Default: "Yes".
-
- Set to "No" if you want to get rid of that button panel at the top.
-
---> "Offer relogin" (no GUI equivalent, not applicable in the applet mode)
-
- Values: "Yes", "No".
- Default: "Yes".
-
- If set to "No", the buttons "Login again" and "Close window" won't be
- shown on disconnects or after an error has occured.
-
---> "Show offline desktop" (no GUI equivalent)
-
- Values: "Yes", "No".
- Default: "No".
-
- If set to "Yes", the viewer would continue to display desktop even
- if the remote side has closed the connection. In this case, if the
- button panel is enabled, then the "Disconnect" button would be
- changed to "Hide desktop" after the connection is lost.
-
---> "Defer screen updates" (no GUI equivalent)
-
- Value: time in milliseconds.
- Default: "20".
-
- When updating the desktop contents after receiving an update from server,
- schedule repaint within the specified number of milliseconds. Small delay
- helps to coalesce several small updates into one drawing operation,
- improving CPU usage. Set this parameter to 0 to disable deferred updates.
-
---> "Defer cursor updates" (no GUI equivalent)
-
- Value: time in milliseconds.
- Default: "10".
-
- When updating the desktop after moving the mouse, schedule repaint within
- the specified number of milliseconds. This setting makes sense only when
- "Cursor shape updates" parameter is set to "Enable". Small delay helps to
- coalesce several small updates into one drawing operation, improving CPU
- usage. Set this parameter to 0 to disable deferred cursor updates.
-
---> "Defer update requests" (no GUI equivalent)
-
- Value: time in milliseconds.
- Default: "50".
-
- After processing an update received from server, wait for the specified
- number of milliseconds before requesting next screen update. Such delay
- will end immediately on every mouse or keyboard event if not in the "view
- only" mode. Small delay helps the server to coalesce several small
- updates into one framebuffer update, improving both bandwidth and CPU
- usage. Increasing the parameter value does not affect responsiveness on
- mouse and keyboard events, but causes delays in updating the screen when
- there is no mouse and keyboard activity on the client side.
-
---> "SocketFactory" (no GUI equivalent)
-
- Value: name of the class.
- Default: none.
-
- This option provides the way to define an alternate I/O implementation.
- The dynamically referenced class must implement a SocketFactory
- interface, and create a Socket, as configured by this parameter. See the
- source in the SocketFactory.class.
-
-
-RECORDING VNC SESSIONS
-======================
-
-Current version of the TightVNC Java viewer is able to record VNC (RFB)
-sessions in files for later playback. The data format in saved session files
-is compatible with the rfbproxy program written by Tim Waugh. Most important
-thing about session recording is that it's supported only if Java security
-manager allows access to local filesystem. Typically, it would not work for
-unsigned applets. To use this feature, either use TightVNC Java viewer as a
-standalone application (Java Runtime Environment or Java Development Kit
-should be installed), or as a signed applet. The code checks if it's possible
-to support session recording, and if everything's fine, the new "Record"
-button should appear in the button panel. Pressing this button opens new
-window which controls session recording. The GUI is pretty self-explained.
-
-Other important facts about session recording:
-
---> All sessions are recorded in the 24-bit color format. If you use
- restricted colors (8-bit format), it will be temporarly switched to
- 24-bit mode during session recording.
-
---> All sessions are recorded with cursor shape updates turned off. This is
- necessary to represent remote cursor movements in recorded sessions.
-
---> Closing and re-opening the recording control window does not affect the
- recording. It's not necessary to keep that window open during recording a
- session.
-
---> Avoid using Zlib encoding when recording sessions. It's ok if you started
- recording BEFORE the connection to the VNC server has been established,
- but if you started recording during an active session, all Zlib sessions
- will be saved Raw-encoded (that is, without compression at all). Zlib
- decoding depends on the pixel data received earlier, thus saving the data
- received from the server at an arbitrary moment is not sufficient to
- decompress it correctly. And there is no way to say Zlib decoder to reset
- decompressor's state -- that's a limitation of the Zlib encoder. The
- viewer could re-compress raw pixel data again before saving Zlib-encoded
- sessions, but unfortunately Java API does not allow to flush zlib data
- streams making it impossible to save Zlib-encoded RFB pixel data without
- using native code.
-
---> Usually, Tight encoding is the most suitable one for session recording,
- but some of the issues described above for the Zlib encoding affect the
- Tight encoding as well. Unlike Zlib sessions, Tight-encoded sessions are
- always saved Tight-encoded, but the viewer has to re-compress parts of
- data to synchronize encoder's and decoder's zlib streams. And, due to
- Java zlib API limitations, zlib streams' states have to be reset on each
- compressed rectangle, causing compression ratios to be lower than in the
- original VNC session. If you want to achieve the best possible
- performance, turn recording on BEFORE connecting to the VNC server,
- otherwise CPU usage and compression ratios may be notably less efficient.
-
-
-HINTS
-=====
-
---> To refresh remote desktop in the view-only mode, press "r" or "R"
- on the keyboard.
-
-
-ACKNOWLEDGEMENTS
-================
-
-This distribution contains Java DES software by Dave Zimmerman
- and Jef Poskanzer . This is:
-
- Copyright (c) 1996 Widget Workshop, Inc. All Rights Reserved.
-
- Permission to use, copy, modify, and distribute this software and its
- documentation for NON-COMMERCIAL or COMMERCIAL purposes and without fee
- is hereby granted, provided that this copyright notice is kept intact.
-
- WIDGET WORKSHOP MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE
- SUITABILITY OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT
- NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE, OR NON-INFRINGEMENT. WIDGET WORKSHOP SHALL NOT BE
- LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING,
- MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
-
- THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE
- CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE
- PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
- NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE
- SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
- SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE
- PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). WIDGET
- WORKSHOP SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF
- FITNESS FOR HIGH RISK ACTIVITIES.
-
- Copyright (C) 1996 by Jef Poskanzer . 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.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
-
- Visit the ACME Labs Java page for up-to-date versions of this and other
- fine Java utilities: http://www.acme.com/java/
diff --git a/net-misc/tightvnc/files/server-CVE-2007-1003.patch b/net-misc/tightvnc/files/server-CVE-2007-1003.patch
deleted file mode 100644
index 0f97c11dc4dc..000000000000
--- a/net-misc/tightvnc/files/server-CVE-2007-1003.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- vnc_unixsrc/Xvnc/programs/Xserver/Xext/xcmisc.c.cve-2007-1003 2000-06-11 06:00:51.000000000 -0600
-+++ vnc_unixsrc/Xvnc/programs/Xserver/Xext/xcmisc.c 2007-03-22 07:07:34.000000000 -0600
-@@ -41,6 +41,12 @@ from the X Consortium.
- #include "swaprep.h"
- #include "xcmiscstr.h"
-
-+#if HAVE_STDINT_H
-+#include
-+#elif !defined(UINT32_MAX)
-+#define UINT32_MAX 0xffffffffU
-+#endif
-+
- static unsigned char XCMiscCode;
-
- static void XCMiscResetProc(
-@@ -135,7 +141,10 @@ ProcXCMiscGetXIDList(client)
-
- REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
-
-- pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
-+ if (stuff->count > UINT32_MAX / sizeof(XID))
-+ return BadAlloc;
-+
-+ pids = (XID *)Xalloc(stuff->count * sizeof(XID));
- if (!pids)
- {
- return BadAlloc;
-@@ -156,7 +165,7 @@ ProcXCMiscGetXIDList(client)
- client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
- WriteSwappedDataToClient(client, count * sizeof(XID), pids);
- }
-- DEALLOCATE_LOCAL(pids);
-+ Xfree(pids);
- return(client->noClientException);
- }
-
diff --git a/net-misc/tightvnc/files/server-CVE-2007-1351-1352.patch b/net-misc/tightvnc/files/server-CVE-2007-1351-1352.patch
deleted file mode 100644
index 4c9a1adcb2fd..000000000000
--- a/net-misc/tightvnc/files/server-CVE-2007-1351-1352.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- vnc_unixsrc/Xvnc/lib/font/fontfile/fontdir.c.cve-2007-1351-1352 2000-06-11 06:00:53.000000000 -0600
-+++ vnc_unixsrc/Xvnc/lib/font/fontfile/fontdir.c 2007-03-28 16:08:03.000000000 -0600
-@@ -35,11 +35,19 @@ in this Software without prior written a
- #include "fntfilst.h"
- #include
-
-+#if HAVE_STDINT_H
-+#include
-+#elif !defined(INT32_MAX)
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
- Bool
- FontFileInitTable (table, size)
- FontTablePtr table;
- int size;
- {
-+ if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec)))
-+ return FALSE;
- if (size)
- {
- table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size);
---- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c.cve-2007-1351-1352 2000-06-11 06:00:52.000000000 -0600
-+++ vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c 2007-03-28 16:06:06.000000000 -0600
-@@ -59,6 +59,12 @@ from the X Consortium.
- #include "bitmap.h"
- #include "bdfint.h"
-
-+#if HAVE_STDINT_H
-+#include
-+#elif !defined(INT32_MAX)
-+#define INT32_MAX 0x7fffffff
-+#endif
-+
- #define INDICES 256
- #define MAXENCODING 0xFFFF
- #define BDFLINELEN 1024
-@@ -271,6 +277,11 @@ bdfReadCharacters(file, pFont, pState, b
- bdfError("invalid number of CHARS in BDF file\n");
- return (FALSE);
- }
-+ if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
-+ bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
-+ sizeof(CharInfoRec));
-+ goto BAILOUT;
-+ }
- ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
- if (!ci) {
- bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.10-aarch64.patch b/net-misc/tightvnc/files/tightvnc-1.3.10-aarch64.patch
deleted file mode 100644
index fa96b7d61478..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.10-aarch64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Add aarch64 (arm64) support
-Author: Colin Watson
-Forwarded: no
-Last-Update: 2014-03-18
-
-Index: b/Xvnc/config/cf/Imake.cf
-===================================================================
---- a/Xvnc/config/cf/Imake.cf
-+++ b/Xvnc/config/cf/Imake.cf
-@@ -700,6 +700,10 @@
- # define s390Architecture
- # undef __s390__
- # endif /* s390 */
-+# ifdef __aarch64__
-+# define AArch64Architecture
-+# undef __aarch64__
-+# endif /* __arch64__ */
- # ifdef __alpha
- # define AlphaArchitecture
- # undef __alpha
-Index: b/Xvnc/config/cf/linux.cf
-===================================================================
---- a/Xvnc/config/cf/linux.cf
-+++ b/Xvnc/config/cf/linux.cf
-@@ -305,6 +305,14 @@
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* PowerPCArchitecture */
-
-+#ifdef AArch64Architecture
-+#define DefaultCCOptions -fsigned-char
-+#define OptimizedCDebugFlags -O2
-+#define LinuxMachineDefines -D__aarch64__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-+#endif /* AArch64Architecture */
-+
- #ifdef ArmArchitecture
- #define DefaultCCOptions -fsigned-char
- #define OptimizedCDebugFlags -O2
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.10-java-build.patch b/net-misc/tightvnc/files/tightvnc-1.3.10-java-build.patch
deleted file mode 100644
index 42815ac13343..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.10-java-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur vnc_javasrc.orig/Makefile vnc_javasrc/Makefile
---- vnc_javasrc.orig/Makefile 2009-03-07 14:15:55.000000000 +0100
-+++ vnc_javasrc/Makefile 2009-03-07 14:16:22.000000000 +0100
-@@ -4,7 +4,6 @@
-
- CP = cp
- JC = javac
--JCFLAGS = -target 1.1 -source 1.2
- JAR = jar
- ARCHIVE = VncViewer.jar
- MANIFEST = MANIFEST.MF
-@@ -32,7 +31,7 @@
- all: $(CLASSES) $(ARCHIVE)
-
- $(CLASSES): $(SOURCES)
-- $(JC) $(JCFLAGS) -O $(SOURCES)
-+ $(JC) $(JAVACFLAGS) -O $(SOURCES)
-
- $(ARCHIVE): $(CLASSES) $(MANIFEST)
- $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.10-more-arm64-fixes.patch b/net-misc/tightvnc/files/tightvnc-1.3.10-more-arm64-fixes.patch
deleted file mode 100644
index 9dc275f1e675..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.10-more-arm64-fixes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: more arm64 fixes
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=37;bug=769364;filename=debian_arm64.patch;att=1
-Bug-Debian: http://bugs.debian.org/769364
-Bug-Ubuntu: http://bugs.launchpad.net/bugs/1429198
-Author: Riku Voipio
-Last-Update: 2016-03-23
-
-Index: tightvnc-1.3.9/Xvnc/include/Xmd.h
-===================================================================
---- tightvnc-1.3.9.orig/Xvnc/include/Xmd.h
-+++ tightvnc-1.3.9/Xvnc/include/Xmd.h
-@@ -59,7 +59,7 @@ SOFTWARE.
- #ifdef CRAY
- #define WORD64 /* 64-bit architecture */
- #endif
--#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__) || defined(__powerpc64__)
-+#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)
- #define LONG64 /* 32/64-bit architecture */
- #endif
- #ifdef __sgi
-Index: tightvnc-1.3.9/Xvnc/programs/Xserver/include/servermd.h
-===================================================================
---- tightvnc-1.3.9.orig/Xvnc/programs/Xserver/include/servermd.h
-+++ tightvnc-1.3.9/Xvnc/programs/Xserver/include/servermd.h
-@@ -405,6 +405,26 @@ SOFTWARE.
-
- #endif /* linux/m68k */
-
-+#if defined (linux) && defined(__aarch64__)
-+# define BITMAP_SCANLINE_UNIT 64
-+# define BITMAP_SCANLINE_PAD 64
-+# define LOG2_BITMAP_PAD 6
-+# define LOG2_BYTES_PER_SCANLINE_PAD 3
-+
-+/* Add for handling protocol XPutImage and XGetImage; see comment in
-+ * Alpha section.
-+ */
-+#define INTERNAL_VS_EXTERNAL_PADDING
-+#define BITMAP_SCANLINE_UNIT_PROTO 32
-+
-+#define BITMAP_SCANLINE_PAD_PROTO 32
-+#define LOG2_BITMAP_PAD_PROTO 5
-+#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2
-+#define GLYPHPADBYTES 4
-+#define GETLEFTBITS_ALIGNMENT 1
-+
-+#endif /* linux/aarch64 */
-+
- #if defined (linux) && defined(__powerpc__)
-
- #ifdef __powerpc64__
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.10-pathfixes.patch b/net-misc/tightvnc/files/tightvnc-1.3.10-pathfixes.patch
deleted file mode 100644
index f61a74902294..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.10-pathfixes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- vncserver.orig 2009-03-06 17:33:16.000000000 +0100
-+++ vncserver 2009-03-06 17:35:39.000000000 +0100
-@@ -32,10 +32,11 @@
- $geometry = "1024x768";
- $depth = 24;
- $desktopName = "X";
--$vncClasses = "/usr/local/vnc/classes";
-+$vncClasses = "/usr/share/tightvnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/Type1/";
- $authType = "-rfbauth $vncUserDir/passwd";
-+$colorPath = "/usr/share/X11/rgb";
-
- # Read configuration from the system-wide and user files if present.
-
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.10-ppc64el-support.patch b/net-misc/tightvnc/files/tightvnc-1.3.10-ppc64el-support.patch
deleted file mode 100644
index e05e5bc6af7b..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.10-ppc64el-support.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 25adb1614419b72a986c229cb01870c1b3e38c0b Mon Sep 17 00:00:00 2001
-From: Lauri Kasanen
-Date: Fri, 5 Jun 2015 07:45:09 -0300
-Subject: [PATCH 2/2] Add ppc64el support
-
-Signed-off-by: Lauri Kasanen
----
- Xvnc/config/cf/Imake.cf | 4 ++++
- Xvnc/config/cf/linux.cf | 8 +++++++-
- Xvnc/include/Xmd.h | 2 +-
- Xvnc/programs/Xserver/include/servermd.h | 23 +++++++++++++++++++++++
- 4 files changed, 35 insertions(+), 2 deletions(-)
-
-diff --git a/Xvnc/config/cf/Imake.cf b/Xvnc/config/cf/Imake.cf
-index f1f6724..cbe9ef3 100644
---- a/Xvnc/config/cf/Imake.cf
-+++ b/Xvnc/config/cf/Imake.cf
-@@ -720,6 +720,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
- # define Mc68020Architecture
- # undef mc68000
- # endif /* mc68000 */
-+# ifdef __powerpc64__
-+# define Ppc64Architecture
-+# undef __powerpc64__
-+# endif
- # ifdef powerpc
- # define PpcArchitecture
- # undef powerpc
-diff --git a/Xvnc/config/cf/linux.cf b/Xvnc/config/cf/linux.cf
-index c0e2586..e5f1f2f 100644
---- a/Xvnc/config/cf/linux.cf
-+++ b/Xvnc/config/cf/linux.cf
-@@ -289,7 +289,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* s390xArchitecture */
-
--#ifdef PowerPCArchitecture
-+#ifdef Ppc64Architecture
-+#define DefaultCCOptions -fsigned-char
-+#define OptimizedCDebugFlags -O2
-+#define LinuxMachineDefines -D__powerpc64__
-+#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-+#elif defined(PowerPCArchitecture)
- #define DefaultCCOptions -fsigned-char
- #define OptimizedCDebugFlags -O2
- #define LinuxMachineDefines -D__powerpc__
-diff --git a/Xvnc/include/Xmd.h b/Xvnc/include/Xmd.h
-index 3cf9db1..704d252 100644
---- a/Xvnc/include/Xmd.h
-+++ b/Xvnc/include/Xmd.h
-@@ -59,7 +59,7 @@ SOFTWARE.
- #ifdef CRAY
- #define WORD64 /* 64-bit architecture */
- #endif
--#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
-+#if defined(__alpha) || defined(__alpha__) || defined(__x86_64__) || defined(__powerpc64__)
- #define LONG64 /* 32/64-bit architecture */
- #endif
- #ifdef __sgi
-diff --git a/Xvnc/programs/Xserver/include/servermd.h b/Xvnc/programs/Xserver/include/servermd.h
-index 5066c1d..cc9f485 100644
---- a/Xvnc/programs/Xserver/include/servermd.h
-+++ b/Xvnc/programs/Xserver/include/servermd.h
-@@ -407,8 +407,31 @@ SOFTWARE.
-
- #if defined (linux) && defined(__powerpc__)
-
-+#ifdef __powerpc64__
-+# define BITMAP_SCANLINE_UNIT 64
-+# define BITMAP_SCANLINE_PAD 64
-+# define LOG2_BITMAP_PAD 6
-+# define LOG2_BYTES_PER_SCANLINE_PAD 3
-+
-+/* Add for handling protocol XPutImage and XGetImage; see comment in
-+ * Alpha section.
-+ */
-+#define INTERNAL_VS_EXTERNAL_PADDING
-+#define BITMAP_SCANLINE_UNIT_PROTO 32
-+
-+#define BITMAP_SCANLINE_PAD_PROTO 32
-+#define LOG2_BITMAP_PAD_PROTO 5
-+#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2
-+#endif /* linux/ppc64 */
-+
-+#if defined(__LITTLE_ENDIAN__)
-+#define IMAGE_BYTE_ORDER LSBFirst
-+#define BITMAP_BIT_ORDER LSBFirst
-+#else
- #define IMAGE_BYTE_ORDER MSBFirst
- #define BITMAP_BIT_ORDER MSBFirst
-+#endif
-+
- #define GLYPHPADBYTES 4
- #define GETLEFTBITS_ALIGNMENT 1
-
---
-2.1.4
-
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-darwin.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-darwin.patch
deleted file mode 100644
index e5f7aa7016cf..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.8-darwin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- vnc_unixsrc/Xvnc/config/cf/darwin.cf.orig 2005-11-05 16:42:53.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/darwin.cf 2005-11-05 16:46:52.000000000 +0100
-@@ -106,7 +106,6 @@
- # endif
- #endif
-
--#define StandardDefines -DCSRG_BASED
- #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-
---- vnc_unixsrc/Xvnc/config/cf/vnclibs.def.orig 2005-11-05 17:11:41.000000000 +0100
-+++ vnc_unixsrc/Xvnc/config/cf/vnclibs.def 2005-11-05 17:17:21.000000000 +0100
-@@ -11,7 +11,11 @@
- /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
- VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
- #else
-+# if HasLibCrypt == YES
- VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
-+# else
-+VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
-+# endif
- #endif
-
- VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-imake-tmpdir.patch
deleted file mode 100644
index 9d5ccc58ad76..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.8-imake-tmpdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- vnc_unixsrc/Xvnc/config/imake/imake.c.orig 2000-06-11 14:00:51.000000000 +0200
-+++ vnc_unixsrc/Xvnc/config/imake/imake.c 2003-09-01 22:59:25.000000000 +0200
-@@ -913,12 +913,25 @@
- static void get_libc_version(inFile)
- FILE* inFile;
- {
-- char *aout = tmpnam (NULL);
-+ char aout[PATH_MAX];
- FILE *fp;
- const char *format = "%s -o %s -x c -";
- char *cc;
- int len;
- char *command;
-+ char *tmpdir;
-+ int tmpfd;
-+
-+ if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX-13))
-+ strcpy(aout, tmpdir);
-+ else
-+ strcpy(aout, "/tmp");
-+ strcat(aout, "/imakeXXXXXX");
-+
-+ if((tmpfd = mkstemp(aout)) == -1) {
-+ perror("mkstemp");
-+ abort();
-+ }
-
- cc = getenv ("CC");
- if (cc == NULL)
-@@ -930,6 +943,7 @@
- if (snprintf (command , len, format, cc, aout) == len)
- abort ();
-
-+ close(tmpfd);
- fp = popen (command, "w");
- if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
- || pclose (fp) != 0)
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-mips.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-mips.patch
deleted file mode 100644
index 422a998d5aa6..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.8-mips.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -cr vnc_unixsrc.orig/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
-*** vnc_unixsrc.orig/Xvnc/config/cf/linux.cf Wed Mar 20 02:49:23 2002
---- vnc_unixsrc/Xvnc/config/cf/linux.cf Sat Nov 4 19:01:06 2006
-***************
-*** 43,49 ****
- #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
- defined(SparcArchitecture) || defined(ArmArchitecure) || \
- defined(i386Architecture) || defined(s390Architecture) || \
-! defined(s390xArchitecture)
- #define DefaultLinuxCLibMajorVersion 6
- #else
- #define DefaultLinuxCLibMajorVersion 5
---- 43,49 ----
- #if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
- defined(SparcArchitecture) || defined(ArmArchitecure) || \
- defined(i386Architecture) || defined(s390Architecture) || \
-! defined(s390xArchitecture) || defined(MipsArchitecture)
- #define DefaultLinuxCLibMajorVersion 6
- #else
- #define DefaultLinuxCLibMajorVersion 5
-***************
-*** 261,266 ****
---- 261,273 ----
- #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- #endif /* AlphaArchitecture */
-
-+ #ifdef MipsArchitecture
-+ #define OptimizedCDebugFlags -O2
-+ #define LinuxMachineDefines -D__mips__
-+ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
-+ #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+ #endif /* MipsArchitecture */
-+
- #ifdef Mc68020Architecture
- #define OptimizedCDebugFlags -O2
- #define LinuxMachineDefines -D__mc68000__
-diff -cr vnc_unixsrc.orig/Xvnc/programs/Xserver/cfb/Imakefile vnc_unixsrc/Xvnc/programs/Xserver/cfb/Imakefile
-*** vnc_unixsrc.orig/Xvnc/programs/Xserver/cfb/Imakefile Tue Mar 19 21:16:03 2002
---- vnc_unixsrc/Xvnc/programs/Xserver/cfb/Imakefile Sat Nov 4 19:01:49 2006
-***************
-*** 10,24 ****
- /* cfb8cppl.c MUST come last to avoid confusing makedepend */
- PSZSRCS = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c cfb8cppl.c
- PSZOBJS = cfb8bit.o cfbteblt8.o cfbglrop8.o cfbpush8.o cfbrctstp8.o cfb8cppl.o
-- #ifdef MipsArchitecture
-- #ifndef ArcArchitecture
-- #ifndef Mips64Architecture
-- STIPPLESRC = stipmips.s stipmipste.s
-- STIPPLEOBJ = stipmips.o stipmipste.o
-- STIPPLEDEF = -DHAS_STIPPLE_CODE
-- #endif
-- #endif
-- #endif
- #ifdef SparcArchitecture
- STIPPLESRC = stipsparc.s stipsparcte.s
- STIPPLEOBJ = stipsparc.o stipsparcte.o
---- 10,15 ----
-***************
-*** 128,136 ****
- LinkSourceFile(cfbpush8.c,LinkDirectory)
- LinkSourceFile(cfbrctstp8.c,LinkDirectory)
- LinkSourceFile(cfbteblt8.c,LinkDirectory)
-- #ifdef MipsArchitecture
-- LinkSourceFile(stipmips.s,LinkDirectory)
-- #endif
- #ifdef SparcArchitecture
- LinkSourceFile(stipsparc.s,LinkDirectory)
- #endif
---- 119,124 ----
-***************
-*** 186,202 ****
- #if PixelSize == 8
- ObjectFromSpecialSource(cfbglrop8,cfbglblt8,-DGLYPHROP)
-
-- #ifdef MipsArchitecture
-- stipmipste.s: stipmips.s
-- $(RM) $@
-- $(LN) stipmips.s stipmipste.s
-- clean::
-- $(RM) stipmipste.s
--
-- stipmipste.o: stipmipste.s
-- $(AS) -o $@ -DTETEXT stipmipste.s
-- #endif
--
- #ifdef SparcArchitecture
- stipsparcte.s: stipsparc.s
- $(RM) $@
---- 174,179 ----
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.8-pathfixes.patch b/net-misc/tightvnc/files/tightvnc-1.3.8-pathfixes.patch
deleted file mode 100644
index d9fa5aae30b8..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.8-pathfixes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- vncserver.old 2006-08-10 13:01:07.000000000 +0200
-+++ vncserver 2006-09-05 19:31:30.000000000 +0200
-@@ -36,16 +36,16 @@
- $geometry = "1024x768";
- $depth = 24;
- $desktopName = "X";
--$vncClasses = "/usr/local/vnc/classes";
-+$vncClasses = "/usr/share/tightvnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
--$fontPath = "unix/:7100";
-+$fontPath = "unix/:-1";
- $authType = "-rfbauth $vncUserDir/passwd";
-
- # Here is another example of setting the font path:
--# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/Type1/";
-
- # X colors database path is optional, uncomment and edit to use:
--# $colorPath = "/usr/lib/X11/rgb";
-+$colorPath = "/usr/share/X11/rgb";
-
- # You might wish to make your vnc directory under /tmp, to make sure
- # passwords are always kept on the local filesystem. To do that, just
diff --git a/net-misc/tightvnc/files/tightvnc-1.3.9-java-build.patch b/net-misc/tightvnc/files/tightvnc-1.3.9-java-build.patch
deleted file mode 100644
index 8503a30c50cf..000000000000
--- a/net-misc/tightvnc/files/tightvnc-1.3.9-java-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- vnc_javasrc/Makefile.bak 2008-09-11 21:17:37.000000000 +1200
-+++ vnc_javasrc/Makefile 2008-09-11 21:18:30.000000000 +1200
-@@ -4,7 +4,6 @@
-
- CP = cp
- JC = javac
--JCFLAGS = -target 1.1
- JAR = jar
- ARCHIVE = VncViewer.jar
- MANIFEST = MANIFEST.MF
-@@ -32,7 +31,7 @@
- all: $(CLASSES) $(ARCHIVE)
-
- $(CLASSES): $(SOURCES)
-- $(JC) $(JCFLAGS) -O $(SOURCES)
-+ $(JC) $(JAVACFLAGS) -O $(SOURCES)
-
- $(ARCHIVE): $(CLASSES) $(MANIFEST)
- $(JAR) cfm $(ARCHIVE) $(MANIFEST) $(CLASSES)
diff --git a/net-misc/tightvnc/files/tightvnc.confd b/net-misc/tightvnc/files/tightvnc.confd
deleted file mode 100644
index 757f4b989f80..000000000000
--- a/net-misc/tightvnc/files/tightvnc.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/vnc
-
-# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display".
-# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
-# DISPLAYS="myuser:1"
-
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
-# VNC_OPTS=""
-
diff --git a/net-misc/tightvnc/files/tightvnc.initd b/net-misc/tightvnc/files/tightvnc.initd
deleted file mode 100644
index 465b686b2845..000000000000
--- a/net-misc/tightvnc/files/tightvnc.initd
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-depend() {
- need net
-}
-
-checkconfig() {
- if [ -n "${DISPLAYS}" ]; then
- if [ $1 = "start" ]; then
- local user
- for user in $DISPLAYS; do
- if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
- eerror "There are no passwords defined for user ${user%%:*}."
- return 1
- elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
- eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}"
- eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
- return 1
- elif [ -e "/tmp/.X${user##*:}-lock" ]; then
- eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock"
- eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
- return 1
- fi
- done
- fi
- return 0
- else
- eerror 'Please define $DISPLAYS in /etc/conf.d/vnc'
- return 1
- fi
-}
-
-start() {
- checkconfig start || return 1
- ebegin "Starting TightVNC server"
- for user in $DISPLAYS; do
- su -s /bin/sh ${user%%:*} -c "cd ~${user%%:*} && vncserver :${user##*:} $VNC_OPTS" &>/dev/null
- done
- eend $?
-}
-
-stop() {
- checkconfig stop || return 2
- ebegin "Stopping TightVNC server"
- for user in $DISPLAYS; do
- su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null
- done
- eend $?
-}
-
-restart() {
- svc_stop
- svc_start
-}
diff --git a/net-misc/tightvnc/metadata.xml b/net-misc/tightvnc/metadata.xml
deleted file mode 100644
index 46809ce60263..000000000000
--- a/net-misc/tightvnc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
- vnc-tight
-
-
diff --git a/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild b/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
deleted file mode 100644
index c7a9ca89a290..000000000000
--- a/net-misc/tightvnc/tightvnc-1.3.10-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs java-pkg-opt-2
-
-IUSE="java tcpd server"
-
-S="${WORKDIR}/vnc_unixsrc"
-DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops"
-SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2
- mirror://gentoo/${PN}.png
- java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="alpha amd64 arm ~mips ppc ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0"
-
-CDEPEND="media-fonts/font-misc-misc
- virtual/jpeg
- server? (
- media-fonts/font-cursor-misc
- x11-apps/rgb
- x11-apps/xauth
- x11-apps/xsetroot
- )
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt
- tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.4 )
- x11-proto/xextproto
- x11-proto/xproto
- server? (
- x11-proto/inputproto
- x11-proto/kbproto
- x11-proto/printproto
- )
- >=x11-misc/imake-1
- x11-misc/gccmakedep
- x11-misc/makedepend
- !net-misc/tigervnc"
-
-pkg_setup() {
- if ! use server;
- then
- echo
- einfo "The 'server' USE flag will build tightvnc's server."
- einfo "If '-server' is chosen only the client is built to save space."
- einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.3.10-pathfixes.patch" # fixes bug 78385 and 146099
- epatch "${FILESDIR}/${PN}-1.3.8-imake-tmpdir.patch" # fixes bug 23483
- epatch "${FILESDIR}/${PN}-1.3.8-darwin.patch" # fixes bug 89908
- epatch "${FILESDIR}/${PN}-1.3.8-mips.patch"
- epatch "${FILESDIR}"/server-CVE-2007-1003.patch
- epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
- epatch "${FILESDIR}"/1.3.9-fbsd.patch
- epatch "${FILESDIR}"/1.3.9-arm.patch
- epatch "${FILESDIR}"/1.3.9-sh.patch
- epatch "${FILESDIR}"/${PV}-sparc.patch
- sed -e "s:\\(/etc/\\|/usr/share/\\):${EPREFIX}\\1:g" -i vncserver || die
-
- if use java; then
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}-1.3.10-java-build.patch"
- fi
-}
-
-src_compile() {
- xmkmf -a || die "xmkmf failed"
-
- emake -j1 CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" World
-
- if use server; then
- cd Xvnc || die
- econf
-
- if use tcpd; then
- local myextra="-lwrap"
- emake -j1 EXTRA_LIBRARIES="${myextra}" \
- CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" \
- EXTRA_DEFINES="-DUSE_LIBWRAP=1"
- else
- emake -j1 CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
- fi
- fi
-
- if use java; then
- cd "${WORKDIR}/vnc_javasrc" || die
- emake -j1 JAVACFLAGS="$(java-pkg_javac-args)" all
- fi
-
-}
-
-src_install() {
- # the web based interface and the java viewer need the java class files
- if use java; then
- java-pkg_newjar "${WORKDIR}/vnc_javasrc/VncViewer.jar"
- java-pkg_dolauncher "${PN}-java"
- insinto /usr/share/${PN}/classes
- doins "${WORKDIR}"/vnc_javasrc/*.vnc || die
- dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/${PN}/classes/VncViewer.jar
- fi
-
- dodir /usr/share/man/man1 /usr/bin
- ./vncinstall "${ED}"/usr/bin "${ED}"/usr/share/man || die "vncinstall failed"
-
- if use server; then
- newconfd "${FILESDIR}"/tightvnc.confd vnc
- newinitd "${FILESDIR}"/tightvnc.initd vnc
- else
- rm -f "${ED}"/usr/bin/vncserver || die
- rm -f "${ED}"/usr/share/man/man1/{Xvnc,vncserver}* || die
- fi
-
- newicon "${DISTDIR}"/tightvnc.png vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer Network
-
- dodoc ChangeLog README WhatsNew
- use java && dodoc "${FILESDIR}"/README.JavaViewer
- newdoc vncviewer/README README.vncviewer
-}
diff --git a/net-misc/tightvnc/tightvnc-1.3.10-r3.ebuild b/net-misc/tightvnc/tightvnc-1.3.10-r3.ebuild
deleted file mode 100644
index a79912e165c2..000000000000
--- a/net-misc/tightvnc/tightvnc-1.3.10-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs java-pkg-opt-2
-
-IUSE="java tcpd server"
-
-S="${WORKDIR}/vnc_unixsrc"
-DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops"
-SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2
- mirror://gentoo/${PN}.png
- java? ( mirror://sourceforge/vnc-tight/${P}_javasrc.tar.gz )"
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0"
-
-CDEPEND="media-fonts/font-misc-misc
- virtual/jpeg
- server? (
- media-fonts/font-cursor-misc
- x11-apps/rgb
- x11-apps/xauth
- x11-apps/xsetroot
- )
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt
- tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.4 )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.4 )
- x11-proto/xextproto
- x11-proto/xproto
- server? (
- x11-proto/inputproto
- x11-proto/kbproto
- x11-proto/printproto
- )
- >=x11-misc/imake-1
- x11-misc/gccmakedep
- x11-misc/makedepend
- !net-misc/tigervnc"
-
-pkg_setup() {
- if ! use server;
- then
- echo
- einfo "The 'server' USE flag will build tightvnc's server."
- einfo "If '-server' is chosen only the client is built to save space."
- einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.3.10-pathfixes.patch" # fixes bug 78385 and 146099
- epatch "${FILESDIR}/${PN}-1.3.8-imake-tmpdir.patch" # fixes bug 23483
- epatch "${FILESDIR}/${PN}-1.3.8-darwin.patch" # fixes bug 89908
- epatch "${FILESDIR}/${PN}-1.3.8-mips.patch"
- epatch "${FILESDIR}"/server-CVE-2007-1003.patch
- epatch "${FILESDIR}"/server-CVE-2007-1351-1352.patch
- epatch "${FILESDIR}"/1.3.9-fbsd.patch
- epatch "${FILESDIR}"/1.3.9-arm.patch
- epatch "${FILESDIR}"/1.3.9-sh.patch
- epatch "${FILESDIR}"/${P}-ppc64el-support.patch
- epatch "${FILESDIR}"/${P}-aarch64.patch
- epatch "${FILESDIR}"/${P}-more-arm64-fixes.patch
-
- sed -e "s:\\(/etc/\\|/usr/share/\\):${EPREFIX}\\1:g" -i vncserver || die
-
- if use java; then
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PN}-1.3.10-java-build.patch"
- fi
-}
-
-src_compile() {
- xmkmf -a || die "xmkmf failed"
-
- emake -j1 CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" World
-
- if use server; then
- cd Xvnc || die
- econf
-
- if use tcpd; then
- local myextra="-lwrap"
- emake -j1 EXTRA_LIBRARIES="${myextra}" \
- CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" \
- EXTRA_DEFINES="-DUSE_LIBWRAP=1"
- else
- emake -j1 CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
- fi
- fi
-
- if use java; then
- cd "${WORKDIR}/vnc_javasrc" || die
- emake -j1 JAVACFLAGS="$(java-pkg_javac-args)" all
- fi
-
-}
-
-src_install() {
- # the web based interface and the java viewer need the java class files
- if use java; then
- java-pkg_newjar "${WORKDIR}/vnc_javasrc/VncViewer.jar"
- java-pkg_dolauncher "${PN}-java"
- insinto /usr/share/${PN}/classes
- doins "${WORKDIR}"/vnc_javasrc/*.vnc || die
- dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/${PN}/classes/VncViewer.jar
- fi
-
- dodir /usr/share/man/man1 /usr/bin
- ./vncinstall "${ED}"/usr/bin "${ED}"/usr/share/man || die "vncinstall failed"
-
- if use server; then
- newconfd "${FILESDIR}"/tightvnc.confd vnc
- newinitd "${FILESDIR}"/tightvnc.initd vnc
- else
- rm -f "${ED}"/usr/bin/vncserver || die
- rm -f "${ED}"/usr/share/man/man1/{Xvnc,vncserver}* || die
- fi
-
- newicon "${DISTDIR}"/tightvnc.png vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer Network
-
- dodoc ChangeLog README WhatsNew
- use java && dodoc "${FILESDIR}"/README.JavaViewer
- newdoc vncviewer/README README.vncviewer
-}
diff --git a/net-misc/yajhfc/Manifest b/net-misc/yajhfc/Manifest
deleted file mode 100644
index 94a3011756fb..000000000000
--- a/net-misc/yajhfc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST yajhfc-0_5_2.jar 1902262 SHA256 7182a694b1ee6310b94ca7e5ca913cc381c463101dd2d004a92f4c86fb3a4d7e SHA512 0c0ba609a15dd8e79743d4afea75350ba5626676e3fa2dd24835d8d661c894e910ab1df7c69b05f9db4519ffcd3491b774cad89a2b48597e78e23720414c4e73 WHIRLPOOL 971454666b46beb2fc4aebdf8b69e9a47f32eb87e0ed9eefb1c822f2c6791bc38346645acc611aca37797d49389c5965809cb5e10bd1ec4bd01241f0167f48dd
-DIST yajhfc-0_5_7-src.zip 3577450 SHA256 896f394dabe60238114b2e91f40a595e052185b14105b00f073994cb1b454dcc SHA512 9177e959810df9ab005f2ed380275f6683aa22e0b6209d50a96d8f60018c0dc1d624dc400ad6ac2625688d57ecb84401f26dd66b145da518c0c5287c0af4e9f1 WHIRLPOOL 7e75333ea99eab1aa42937a97b0584a8f71a8b126d55e15111a0a460afa5e999d0510fb0d57f245c2b9cd38a92cc4bb1b26850617b15bb29dfd23d05960e7bdb
diff --git a/net-misc/yajhfc/metadata.xml b/net-misc/yajhfc/metadata.xml
deleted file mode 100644
index f6f4f563b211..000000000000
--- a/net-misc/yajhfc/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-Client for Hylafax+ Server.
-
-
diff --git a/net-misc/yajhfc/yajhfc-0.5.2.ebuild b/net-misc/yajhfc/yajhfc-0.5.2.ebuild
deleted file mode 100644
index 2e126b29b848..000000000000
--- a/net-misc/yajhfc/yajhfc-0.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils java-pkg-opt-2 versionator
-
-MY_P="${PN}-${PV}.jar"
-MY_P="${MY_P/_/}"
-MY_P="${MY_P/./_}"
-MY_P="${MY_P/./_}"
-
-DESCRIPTION="Yet another Java HylaFAX Plus Client"
-HOMEPAGE="http://www.yajhfc.de/"
-SRC_URI="http://download.yajhfc.de/releases/${MY_P}"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND=">=virtual/jdk-1.4"
-RDEPEND="${COMMON_DEPEND} >=virtual/jre-1.4"
-DEPEND="${COMMON_DEPEND} virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- echo "java -jar /usr/bin/${MY_P}" > "${WORKDIR}"/h.h
- newbin "${WORKDIR}/h.h" "yajhfc"
- newbin "${DISTDIR}/${MY_P}" "${MY_P}"
-}
diff --git a/net-misc/yajhfc/yajhfc-0.5.7.ebuild b/net-misc/yajhfc/yajhfc-0.5.7.ebuild
deleted file mode 100644
index d49aa58ec854..000000000000
--- a/net-misc/yajhfc/yajhfc-0.5.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}-${PV}"
-MY_P="${MY_P/_/}"
-MY_P="${MY_P/./_}"
-MY_P="${MY_P/./_}"
-
-DESCRIPTION="Yet another Java HylaFAX Plus Client"
-HOMEPAGE="http://www.yajhfc.de/"
-SRC_URI="http://download.yajhfc.de/releases/${MY_P}-src.zip"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/gnu-hylafax:0
- dev-java/tablelayout:0"
-RDEPEND="${COMMON_DEPEND} >=virtual/jre-1.6"
-DEPEND="${COMMON_DEPEND} >=virtual/jdk-1.6 virtual/pkgconfig app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="gnu-hylafax,tablelayout"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
- rm build.xml || die
- rm -rv "${S}"/jna-src "${S}"/mac-src || die # contains win32/mac only code
-
- cp -r java1-src/* src || die
- cp -r java6-src/* src || die
-
- # this method is missing in the gnu-hylafax api despite they use the same upstream version
- sed -i -e 's/client.setCharacterEncoding.*//g' src/yajhfc/HylaClientManager.java || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- pushd src || die
- find -type f -not -name "*.java" -not -name "*.class" | xargs jar uf "${S}"/${PN}.jar || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_dolauncher ${PN} --jar ${PN}.jar --main yajhfc.Launcher
-}
diff --git a/net-nds/389-admin/389-admin-1.1.31-r1.ebuild b/net-nds/389-admin/389-admin-1.1.31-r1.ebuild
deleted file mode 100644
index 3f7d2b7ef6e6..000000000000
--- a/net-nds/389-admin/389-admin-1.1.31-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WANT_AUTOMAKE="1.9"
-
-MY_PV=${PV/_rc/.rc}
-MY_PV=${MY_PV/_a/.a}
-
-inherit eutils multilib autotools depend.apache
-
-DESCRIPTION="389 Directory Server (admin)"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ipv6 selinux"
-
-# TODO snmp agent init script
-
-COMMON_DEPEND=">=app-admin/389-admin-console-1.1.0
- >=app-admin/389-ds-console-1.1.0
- app-misc/mime-types
- dev-libs/389-adminutil
- dev-libs/cyrus-sasl
- dev-libs/icu:=
- dev-libs/nss[utils]
- || ( <=dev-libs/nspr-4.8.3-r3[ipv6?] >=dev-libs/nspr-4.8.4 )
- dev-libs/svrcore
- net-analyzer/net-snmp[ipv6?]
- net-nds/openldap
- selinux? (
- sys-apps/checkpolicy
- sys-apps/policycoreutils
- )
- >=sys-libs/db-4.2.52
- sys-libs/pam
- sys-apps/tcp-wrappers[ipv6?]
- www-apache/mod_nss
- www-servers/apache:2[apache2_modules_actions,apache2_modules_alias,apache2_modules_auth_basic,apache2_modules_authz_default,apache2_modules_cgi,apache2_modules_mime_magic,apache2_modules_rewrite,apache2_modules_setenvif,suexec,threads]"
-RDEPEND="
- ${COMMON_DEPEND}
- www-client/lynx
- selinux? ( sec-policy/selinux-base-policy )
-"
-DEPEND="sys-apps/sed ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_apache2
-
-src_prepare() {
- # as per 389 documentation, when 64bit, export USE_64
- use amd64 && export USE_64=1
-
- epatch "${FILESDIR}/1.1.11_rc1/0001-gentoo-apache-names.patch"
- epatch "${FILESDIR}/1.1.11_rc1/0003-find-mod_nss.m4.patch"
- epatch "${FILESDIR}/1.1.11_rc1/0004-rpath-fix.configure.ac.patch"
- # Configuration fixes
- epatch "${FILESDIR}/${PN}-cfgstuff-1.patch"
-
- sed -e "s!SUBDIRS!# SUBDIRS!g" -i Makefile.am || die "sed failed"
- # Setup default user/group, in this case it's dirsrv
- sed -e "s!nobody!dirsrv!g" -i configure.ac || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- # stub autoconf triplet :(
- local myconf=""
- use debug && myconf="--enable-debug"
- use selinux && myconf="${myconf} --with-selinux"
-
- econf \
- --enable-threading \
- --disable-rpath \
- --with-adminutil=/usr \
- --with-apr-config \
- --with-apxs=${APXS} \
- --with-fhs \
- --with-httpd=${APACHE_BIN} \
- --with-openldap \
- ${myconf} || die "econf failed"
-}
-
-src_install () {
-
- emake DESTDIR="${D}" install || die "emake failed"
- keepdir /var/log/dirsrv/admin-serv
-
- # remove redhat style init script.
- rm -rf "${D}"/etc/rc.d
- rm -rf "${D}"/etc/default
-
- # install gentoo style init script.
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- # remove redhat style wrapper scripts
- # and install gentoo scripts.
- rm -rf "${D}"/usr/sbin/*-ds-admin
- dosbin "${FILESDIR}"/*-ds-admin || die "cannot install gentoo start/stop scripts"
-
- # In this version build systems for modules is delete :(
- # manually install modules, not using apache-modules eclass
- # because use bindled library
-
- # install mod_admserv
- exeinto "${APACHE_MODULESDIR}"
- doexe "${S}/.libs"/mod_admserv.so || die "internal ebuild error: mod_admserv not found"
-
- insinto "${APACHE_MODULES_CONFDIR}"
- newins "${FILESDIR}/1.1.11_rc1"/48_mod_admserv.conf 48_mod_admserv \
- || die "internal ebuild error: 48_mod_admserv.conf not found"
-
- # install mod_restard
- exeinto "${APACHE_MODULESDIR}"
- doexe "${S}/.libs"/mod_restartd.so || die "internal ebuild error: mod_restartd not found"
-
- insinto "${APACHE_MODULES_CONFDIR}"
- newins "${FILESDIR}/1.1.11_rc1"/48_mod_restartd.conf 48_mod_restartd \
- || die "internal ebuild error: 48_mod_restard.conf not found"
-
- if use selinux; then
- local POLICY_TYPES="targeted"
- cd "${S}"/selinux || die
- cp /usr/share/selinux/${POLICY_TYPES}/include/Makefile . || die
- make || die "selinux policy compile failed"
- insinto /usr/share/selinux/${POLICY_TYPES}
- doins -r "${S}/selinux/"*.pp
- fi
-
-}
-
-pkg_postinst() {
-
- # show setup information
- elog "Once you configured www-servers/apache as written above,"
- elog "you need to run (as root): /usr/sbin/setup-ds-admin.pl"
- elog
-
- # show security and sysctl info
- elog "It is recommended to setup net.ipv4.tcp_keep_alive_time"
- elog "in /etc/sysctl.conf (or via sysctl -w && sysctl -p) to a reasonable"
- elog "value (in milliseconds) to avoid temporary server congestions"
- elog "from lost client connections"
- elog
-
- # /etc/security/limits.conf settings
- elog "It is also recommended to fine tune the maximum open files"
- elog "settings inside /etc/security/limits.conf:"
- elog "* soft nofile 2048"
- elog "* hard nofile 4096"
- elog
-
- elog "To start 389 Directory Server Administration Interface at boot"
- elog "please add 389-admin service to the default runlevel:"
- elog
- elog " rc-update add 389-admin default"
- elog
-
- elog "for 389 Directory Server Admin interface to work, you need"
- elog "to setup a FQDN hostname and use it while running /usr/sbin/setup-ds-admin.pl"
- elog
-
-}
diff --git a/net-nds/389-admin/Manifest b/net-nds/389-admin/Manifest
deleted file mode 100644
index 195a76174c60..000000000000
--- a/net-nds/389-admin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 389-admin-1.1.31.tar.bz2 647098 SHA256 79c8c0133f72be4915fec8a4f2490bc21480de5fae77070f2ce13b1d9f28872f SHA512 631cd286a817a9e862adc610464d1c1f7a7af8dbade4cc2d8535330f81591d65df4773b6dbce0256470002165640fe73b49c20ee5093f71e5121d2cfa15ca9c4 WHIRLPOOL bff158c3d2201d8723faf340e21e3fdbeaaa62bbefac033b1f5ac981bd17a2e83f0507908b3919af1911b519442da75a96164b73d4df6953227973feaaab047e
diff --git a/net-nds/389-admin/files/1.1.11_rc1/0001-gentoo-apache-names.patch b/net-nds/389-admin/files/1.1.11_rc1/0001-gentoo-apache-names.patch
deleted file mode 100644
index 9f145d959894..000000000000
--- a/net-nds/389-admin/files/1.1.11_rc1/0001-gentoo-apache-names.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur m4.orig/httpd.m4 m4/httpd.m4
---- m4.orig/httpd.m4 2009-10-25 14:10:24.398721002 +0200
-+++ m4/httpd.m4 2009-10-25 14:12:54.463219758 +0200
-@@ -58,12 +58,12 @@
- *) APACHE22= ;;
- esac
-
--httpdconf=${httpd_root}/${httpd_conf_rel}
-+httpdconf=/etc/apache2/httpd.conf
-
- mimemagic=`grep MIMEMagicFile $httpdconf|grep -v \^# | awk '{print $2}'`
- if test ! -f "$mimemagic" ; then
- # assume relative to root
-- mimemagic=${httpd_root}/${mimemagic}
-+ mimemagic=/etc/apache2/magic
- fi
-
- # check for mime.types file
diff --git a/net-nds/389-admin/files/1.1.11_rc1/0003-find-mod_nss.m4.patch b/net-nds/389-admin/files/1.1.11_rc1/0003-find-mod_nss.m4.patch
deleted file mode 100644
index 5a15e1dbf606..000000000000
--- a/net-nds/389-admin/files/1.1.11_rc1/0003-find-mod_nss.m4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/mod_nss.m4.orig 2010-01-14 23:05:29.000000000 +0200
-+++ m4/mod_nss.m4 2010-01-24 20:58:47.086937825 +0200
-@@ -52,7 +52,7 @@
-
- # else, parse httpd.conf or httpconfdir/nss.conf
- if test -z "$modnssbindir" ; then
-- nsspcache=`grep NSSPassPhraseHelper $httpdconf|awk '{print $2}'`
-+ nsspcache=`grep -R NSSPassPhraseHelper /etc/apache2/* |awk '{print $2}'`
- if test -z "$nsspcache" ; then
- nsspcache=`grep NSSPassPhraseHelper $httpd_root/conf.d/* | awk '{print $2}'`
- fi
diff --git a/net-nds/389-admin/files/1.1.11_rc1/0004-rpath-fix.configure.ac.patch b/net-nds/389-admin/files/1.1.11_rc1/0004-rpath-fix.configure.ac.patch
deleted file mode 100644
index d74c345363f1..000000000000
--- a/net-nds/389-admin/files/1.1.11_rc1/0004-rpath-fix.configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac.orig 2010-01-25 01:34:58.296824267 +0200
-+++ configure.ac 2010-01-25 01:36:16.101825667 +0200
-@@ -433,13 +433,10 @@
-
- if test "$enable_rpath" != "yes" ; then
- AC_MSG_NOTICE([Fixing libtool to remove automatic rpath to $libdir . . .])
-- cp -p libtool libtool.orig
-- cp -p libtool libtool.tmp
-+ cp -p ./libtool libtool.orig
-+ cp -p ./libtool libtool.tmp
- sed -e '/^runpath_var/ d' \
-- -e '/^hardcode_libdir_flag_spec/ d' \
-- libtool > libtool.tmp
-- cp -p libtool.tmp libtool
-- rm -f libtool.tmp
-+ -e '/^hardcode_libdir_flag_spec/ d' -i ./libtool
- fi
-
- AC_CONFIG_FILES([Makefile])
diff --git a/net-nds/389-admin/files/1.1.11_rc1/0010-gentoo_selinux_makefile.patch b/net-nds/389-admin/files/1.1.11_rc1/0010-gentoo_selinux_makefile.patch
deleted file mode 100644
index f7856efce231..000000000000
--- a/net-nds/389-admin/files/1.1.11_rc1/0010-gentoo_selinux_makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4.orig/selinux.m4 2010-03-11 23:18:19.697503404 +0200
-+++ m4/selinux.m4 2010-03-11 23:19:04.653503112 +0200
-@@ -27,7 +27,7 @@
- with_selinux=yes
- AC_MSG_RESULT(yes)
- AC_SUBST(with_selinux)
-- if test ! -f "/usr/share/selinux/devel/Makefile"; then
-+ if test ! -f "/usr/share/selinux/targeted/include/Makefile"; then
- AC_MSG_ERROR([SELinux development tools (selinux-policy) not found])
- fi
- ],
diff --git a/net-nds/389-admin/files/1.1.11_rc1/48_mod_admserv.conf b/net-nds/389-admin/files/1.1.11_rc1/48_mod_admserv.conf
deleted file mode 100644
index 4a3f296f48e5..000000000000
--- a/net-nds/389-admin/files/1.1.11_rc1/48_mod_admserv.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-
- LoadModule mod_admserv modules/mod_admserv.so
-
diff --git a/net-nds/389-admin/files/1.1.11_rc1/48_mod_restartd.conf b/net-nds/389-admin/files/1.1.11_rc1/48_mod_restartd.conf
deleted file mode 100644
index 1d0d2f37825d..000000000000
--- a/net-nds/389-admin/files/1.1.11_rc1/48_mod_restartd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- LoadModule restartd_module modules/mod_restartd.so
-
-
diff --git a/net-nds/389-admin/files/389-admin-cfgstuff-1.patch b/net-nds/389-admin/files/389-admin-cfgstuff-1.patch
deleted file mode 100644
index 783f4772f7f1..000000000000
--- a/net-nds/389-admin/files/389-admin-cfgstuff-1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 389-admin-1.1.11.rc1.orig/admserv/cfgstuff/httpd-2.2.conf.in
-+++ 389-admin-1.1.11.rc1/admserv/cfgstuff/httpd-2.2.conf.in
-@@ -143,7 +143,7 @@ LoadModule file_cache_module @moddir@/mo
- LoadModule mem_cache_module @moddir@/mod_mem_cache.so
- LoadModule cgi_module @moddir@/mod_cgi.so
- LoadModule restartd_module @admmoddir@/mod_restartd.so
--LoadModule nss_module @nssmoddir@/libmodnss.so
-+LoadModule nss_module @moddir@/mod_nss.so
- LoadModule admserv_module @admmoddir@/mod_admserv.so
-
- ### Section 2: 'Main' server configuration
-@@ -389,15 +389,7 @@ ServerSignature On
- # Alias.
- #
-
--
--#
--# Additional to mod_cgid.c settings, mod_cgid has Scriptsock
--# for setting UNIX socket for communicating with cgid.
--#
--Scriptsock @piddir@/admin-serv.cgisock
--
--
--# and this one is for mod_restartd because mod_cgid will consume the other one
-+# Setup mod_admserv socket handle
- Scriptsock @piddir@/admin-serv.cgisock
-
- #
---- 389-admin-1.1.11.rc1.orig/admserv/cfgstuff/httpd.conf.in
-+++ 389-admin-1.1.11.rc1/admserv/cfgstuff/httpd.conf.in
-@@ -142,7 +142,7 @@ LoadModule file_cache_module @moddir@/mo
- LoadModule mem_cache_module @moddir@/mod_mem_cache.so
- LoadModule cgi_module @moddir@/mod_cgi.so
- LoadModule restartd_module @admmoddir@/mod_restartd.so
--LoadModule nss_module @nssmoddir@/libmodnss.so
-+LoadModule nss_module @moddir@/mod_nss.so
- LoadModule admserv_module @admmoddir@/mod_admserv.so
-
- ### Section 2: 'Main' server configuration
-@@ -388,15 +388,7 @@ ServerSignature On
- # Alias.
- #
-
--
--#
--# Additional to mod_cgid.c settings, mod_cgid has Scriptsock
--# for setting UNIX socket for communicating with cgid.
--#
--Scriptsock @piddir@/admin-serv.cgisock
--
--
--# and this one is for mod_restartd because mod_cgid will consume the other one
-+# Setup mod_admserv socket handle
- Scriptsock @piddir@/admin-serv.cgisock
-
- #
diff --git a/net-nds/389-admin/files/389-admin.confd b/net-nds/389-admin/files/389-admin.confd
deleted file mode 100644
index 2f3e92affe2e..000000000000
--- a/net-nds/389-admin/files/389-admin.confd
+++ /dev/null
@@ -1,73 +0,0 @@
-# /etc/conf.d/389-admin: config file for /etc/init.d/389-admin
-
-# When you install a module it is easy to activate or deactivate the modules
-# and other features of apache using the APACHE2_OPTS line. Every module should
-# install a configuration in /etc/dirsrv/admin-serv. In that file will have an
-# directive where NNN is the option to enable that module.
-#
-# Here are the options available in the default configuration:
-#
-# AUTH_DIGEST Enables mod_auth_digest
-# AUTHNZ_LDAP Enables authentication through mod_ldap (available if USE=ldap)
-# CACHE Enables mod_cache
-# DAV Enables mod_dav
-# ERRORDOCS Enables default error documents for many languages.
-# INFO Enables mod_info, a useful module for debugging
-# LANGUAGE Enables content-negotiation based on language and charset.
-# LDAP Enables mod_ldap (available if USE=ldap)
-# MANUAL Enables /manual/ to be the apache manual (available if USE=docs)
-# MEM_CACHE Enables default configuration mod_mem_cache
-# PROXY Enables mod_proxy
-# SSL Enables SSL (available if USE=ssl)
-# SUEXEC Enables running CGI scripts (in USERDIR) through suexec.
-# USERDIR Enables /~username mapping to /home/username/public_html
-#
-#
-# The following two options provide the default virtual host for the HTTP and
-# HTTPS protocol. YOU NEED TO ENABLE AT LEAST ONE OF THEM, otherwise apache
-# will not listen for incomming connections on the approriate port.
-#
-# DEFAULT_VHOST Enables name-based virtual hosts, with the default
-# virtual host being in /var/www/localhost/htdocs
-# SSL_DEFAULT_VHOST Enables default vhost for SSL (you should enable this
-# when you enable SSL)
-#
-APACHE2_OPTS="-D DEFAULT_VHOST -D LANGUAGE -D INFO -D SUEXEC"
-
-# Extended options for advanced uses of Apache ONLY
-# You don't need to edit these unless you are doing crazy Apache stuff
-# As not having them set correctly, or feeding in an incorrect configuration
-# via them will result in Apache failing to start
-# YOU HAVE BEEN WARNED.
-
-# PID file
-#PIDFILE=/var/run/dirsrv/admin-serv.pid
-
-# timeout for startup/shutdown checks
-#TIMEOUT=10
-
-# ServerRoot setting
-#SERVERROOT=/usr/lib/apache2
-
-# Configuration file location
-# - If this does NOT start with a '/', then it is treated relative to
-# $SERVERROOT by Apache
-#CONFIGFILE=/etc/dirsrv/admin-serv/httpd.conf
-
-# Location to log startup errors to
-# They are normally dumped to your terminal.
-#STARTUPERRORLOG="/var/log/dirsrv/admin-serv/startuperror.log"
-
-# A command that outputs a formatted text version of the HTML at the URL
-# of the command line. Designed for lynx, however other programs may work.
-#LYNX="lynx -dump"
-
-# The URL to your server's mod_status status page.
-# Required for status and fullstatus
-#STATUSURL="http://localhost/server-status"
-
-# Method to use when reloading the server
-# Valid options are 'restart' and 'graceful'
-# See https://httpd.apache.org/docs/2.2/stopping.html for information on
-# what they do and how they differ.
-#RELOAD_TYPE="graceful"
diff --git a/net-nds/389-admin/files/389-admin.initd b/net-nds/389-admin/files/389-admin.initd
deleted file mode 100644
index 45420ea4c38d..000000000000
--- a/net-nds/389-admin/files/389-admin.initd
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="configdump configtest fullstatus graceful gracefulstop modules reload"
-
-depend() {
- need net 389-ds
- use mysql dns logger netmount postgresql
- after sshd
-}
-
-configtest() {
- ebegin "Checking Apache Configuration of 389 Directory Server Admin"
- checkconfig
- eend ${?}
-}
-
-checkconfd() {
- PIDFILE="${PIDFILE:-/var/run/dirsrv/admin-serv.pid}"
- TIMEOUT=${TIMEOUT:-10}
-
- SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
- if [ ! -d ${SERVERROOT} ]; then
- eerror "SERVERROOT does not exist: ${SERVERROOT}"
- return 1
- fi
-
- CONFIGFILE="${CONFIGFILE:-/etc/dirsrv/admin-serv/httpd.conf}"
- [ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}"
- if [ ! -r "${CONFIGFILE}" ]; then
- eerror "Unable to read configuration file: ${CONFIGFILE}"
- return 1
- fi
-
- APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
- APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
- [ -n "${STARTUPERRORLOG}" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
-
- APACHE2="/usr/sbin/apache2"
-}
-
-checkconfig() {
- checkconfd || return 1
-
- ${APACHE2} ${APACHE2_OPTS} -t 1>/dev/null 2>&1
- ret=${?}
- if [ $ret -ne 0 ]; then
- eerror "389 Directory Server Admin (Apache2) has detected a syntax error in your configuration files:"
- ${APACHE2} ${APACHE2_OPTS} -t
- fi
-
- return $ret
-}
-
-start() {
- checkconfig || return 1
-
- [ -f /var/log/dirsrv/admin-serv/ssl_scache ] && rm /var/log/dirsrv/admin-serv/ssl_scache
-
- ebegin "Starting 389 Directory Server Admin (apache2)"
- ${APACHE2} ${APACHE2_OPTS} -k start
- [ "${?}" != "0" ] && eend "${?}" && return 1
-
- let i=0
- while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
- sleep 1 && let i++
- done
-
- test $i -le ${TIMEOUT}
- eend ${?}
-}
-
-stop() {
- checkconfd || return 1
-
- ebegin "Stopping 389 Directory Server Admin (apache2)"
- ${APACHE2} ${APACHE2_OPTS} -k stop
-
- let i=0
- while pidof "${APACHE2}" >/dev/null && [ $i -lt ${TIMEOUT} ]; do
- sleep 1 && let i++
- done
-
- test $i -le ${TIMEOUT}
- eend ${?}
-}
-
-reload() {
- RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
-
- checkconfig || return 1
- service_started "${SVCNAME}" || return
-
- if [ "${RELOAD_TYPE}" = "restart" ]; then
- ebegin "Restarting 389 Directory Server Admin (apache2)"
- ${APACHE2} ${APACHE2_OPTS} -k restart
- eend ${?}
- elif [ "${RELOAD_TYPE}" = "graceful" ]; then
- ebegin "Gracefully restarting 389 Directory Server Admin (apache2)"
- ${APACHE2} ${APACHE2_OPTS} -k graceful
- eend ${?}
- else
- eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/dirsrv-admin"
- fi
-}
-
-graceful() {
- checkconfig || return 1
- service_started "${SVCNAME}" || return
- ebegin "Gracefully restarting 389 Directory Server Admin (apache2)"
- ${APACHE2} ${APACHE2_OPTS} -k graceful
- eend ${?}
-}
-
-gracefulstop() {
- checkconfig || return 1
-
- # zap!
- if service_started "${SVCNAME}"; then
- mark_service_stopped "${SVCNAME}"
- fi
-
- ebegin "Gracefully stopping 389 Directory Server Admin (apache2)"
- ${APACHE2} ${APACHE2_OPTS} -k graceful-stop
- eend ${?}
-}
-
-modules() {
- checkconfig || return 1
-
- ${APACHE2} ${APACHE2_OPTS} -M 2>&1
-}
-
-fullstatus() {
- LYNX="${LYNX:-lynx -dump}"
- STATUSURL="${STATUSURL:-http://localhost/server-status}"
-
- if ! service_started "${SVCNAME}"; then
- eerror "${SVCNAME} not started"
- elif ! type -p ${LYNX} 2>&1 >/dev/null; then
- eerror "lynx not found! you need to emerge www-client/lynx"
- else
- ${LYNX} ${STATUSURL}
- fi
-}
-
-configdump() {
- LYNX="${LYNX:-lynx -dump}"
- INFOURL="${INFOURL:-http://localhost/server-info}"
-
- checkconfd || return 1
-
- if ! service_started "${SVCNAME}"; then
- eerror "${SVCNAME} not started"
- else
- echo "${APACHE2} started with '${APACHE2_OPTS}'"
- for i in config server list; do
- ${LYNX} "${INFOURL}/?${i}" | sed '/Apache Server Information/d;/^[[:space:]]\+[_]\+$/Q'
- done
- fi
-}
diff --git a/net-nds/389-admin/files/restart-ds-admin b/net-nds/389-admin/files/restart-ds-admin
deleted file mode 100644
index 1f0cb71769d2..000000000000
--- a/net-nds/389-admin/files/restart-ds-admin
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007-2009, Mario Fetka
-#
-# Licensed under the GNU General Public License, v2
-
-rc-config restart 389-admin
diff --git a/net-nds/389-admin/files/start-ds-admin b/net-nds/389-admin/files/start-ds-admin
deleted file mode 100644
index 1131e1d41880..000000000000
--- a/net-nds/389-admin/files/start-ds-admin
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007-2009, Mario Fetka
-#
-# Licensed under the GNU General Public License, v2
-
-rc-config start 389-admin
diff --git a/net-nds/389-admin/files/stop-ds-admin b/net-nds/389-admin/files/stop-ds-admin
deleted file mode 100644
index 31f841f5e932..000000000000
--- a/net-nds/389-admin/files/stop-ds-admin
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007-2009, Mario Fetka
-#
-# Licensed under the GNU General Public License, v2
-
-rc-config stop 389-admin
diff --git a/net-nds/389-admin/metadata.xml b/net-nds/389-admin/metadata.xml
deleted file mode 100644
index e83037a8a395..000000000000
--- a/net-nds/389-admin/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-389 Administration Server is an HTTP agent that provides management features
-for 389 Directory Server. It provides some management web apps that can
-be used through a web browser. It provides the authentication, access control,
-and CGI utilities used by the console.
-
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 5e2a6049e336..8ea3b52e996c 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,2 +1,3 @@
DIST hplip-3.14.10-plugin.run 1869038 SHA256 b395b480ad86b9f27b6a2f63b6ecb00beb78e762a6137efb81dc1104837f9b81 SHA512 3e5bea924e989d902aea0de182941be692a124ba8c27f53ce2e4f137308bad8373462c6128c26716e481e758f76533163d311a2676df034c1b15d6ef6ed008be WHIRLPOOL 18375de4cc92cb73bcaa109927bd34f8487938b02472f0b7adbf44ad4688e5c6a1d030077b1e3c14f15f9b8e4cc86d195b0195e2d08121f746c62624db4658db
DIST hplip-3.16.3-plugin.run 2084271 SHA256 b7edef2a1c5c0a5e001deb4a18c0ef7202e653596e97144b8908ae093818070f SHA512 2ae8aeb40c2604a2c6b9725700f9addf7a82e819d603631158a5d5feac931248e53e7533178100df1fc12b0dc2340cb3ae0d85f145cd023a311f77bbe67e7c7f WHIRLPOOL 928117f862030eca9c3e5813eb8c4db66570923695b0c7af17df1992f339d2478f42af67ca0e0eb8cfa1d7425b522082fde3b8c829c3f5167e1ec503c95a986b
+DIST hplip-3.16.8-plugin.run 2087862 SHA256 dd0b67fc1958bcf30c7ec7cb013d36d8071db6f78cc531e2169d139ba29117eb SHA512 f7ca720f343aef9b0d2fd4b3ded909c63fd6d7abce10060d5854b73c63d4a7c4e50c38da55728a53103dddac651068a242e07ae54be84b0ff6cb61fadba35245 WHIRLPOOL 5da94f21d59b51dcec1241046d1f9b7e4a44a8a9d56a4d5d615d2b117487556e67749c72a7d33e81536c0e25652614f88c0c8c6a8a65dcc45a6feac6da03293e
diff --git a/net-print/hplip-plugin/hplip-plugin-3.16.8.ebuild b/net-print/hplip-plugin/hplip-plugin-3.16.8.ebuild
new file mode 100644
index 000000000000..8408448871b0
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.16.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ ~net-print/hplip-${PV}
+ virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+ /usr/share/hplip/fax/plugins/fax_marvell.so
+ /usr/share/hplip/prnt/plugins/hbpl1.so
+ /usr/share/hplip/prnt/plugins/lj.so
+ /usr/share/hplip/scan/plugins/bb_marvell.so
+ /usr/share/hplip/scan/plugins/bb_soapht.so
+ /usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+ local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+ insinto "${HPLIP_HOME}"/data/firmware
+ doins *.fw.gz
+
+ for plugin in *-${hplip_arch}.so; do
+ local plugin_type=prnt
+ case "${plugin}" in
+ fax_*) plugin_type=fax ;;
+ bb_*) plugin_type=scan ;;
+ esac
+
+ exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+ newexe ${plugin} ${plugin/-${hplip_arch}}
+ done
+
+ mkdir -p "${ED}/var/lib/hp/"
+ cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+ [plugin]
+ installed = 1
+ eula = 1
+ version = ${PV}
+ _EOF_
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 70413916299d..808f76d5ec8d 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,4 +3,5 @@ DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a
DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
DIST hplip-3.16.5-patches-1.tar.xz 8200 SHA256 98866e57a247e7a30d9cd584ed9411aa79a6185294a73b4cc5961efe9a5e5fa6 SHA512 36d33da5fc4105183cbc5137845ddccd8ab2b6abbff053a3a51f3da61c26c2d9d48dcb735345fb453abd67b6a0797aa337102c366cce037bc7006599b20b1646 WHIRLPOOL 8ac91bdefeb177c092b1d6de16474e8e1da57ad046dbc579f14fd40a27d1837d9bf142573137ef8d91c37dc7b03ca908fd5bfad23a9815af2015b521091c2700
+DIST hplip-3.16.8.tar.gz 22942175 SHA256 a9da67ae51c17487a8d725eb9c0bf9c6f0416e1fffa7db6cdff5302b1c556ceb SHA512 213a39739834eca4e8b247706394cbeb6cf4ada547711d7b3e9187a43e8da8988b1b3efebdffb709cb73bc9ca863200d1405297d5797260eafae6a68531dc15f WHIRLPOOL ce6c00b8602589c7c16e6e6efb4ac47999c45f95519817f728be2bcdc1269916a5ff6e1f67a45a8f51cd16834ecdf599dfbd0ac18946aa68532b286560ba9956
DIST hplip-3.16.9.tar.gz 23057361 SHA256 cc8cf2a7baa1403cddd6503f120c58780c786b42fad073da6caec7535d3797a6 SHA512 801bf6578759b1204eb8ede376ee0a22a12c7821ceafeb8c84a2aa5596bfccef222a15af896c33ba46c53b3e4776629efee264b6d67487cbf197b028d22b68ff WHIRLPOOL 3374e43630a39c245541180ac9e6b76431687f5b977271a4bc09cd8de897bfc992ab43ab5235bb4806da33a65d22aeb0ea2783fa52501aaafdd142e229621492
diff --git a/net-print/hplip/hplip-3.16.8.ebuild b/net-print/hplip/hplip-3.16.8.ebuild
new file mode 100644
index 000000000000..e991e1ff1018
--- /dev/null
+++ b/net-print/hplip/hplip-3.16.8.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit eutils linux-info python-single-r1 readme.gentoo-r1 udev autotools
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-3.16.5-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde -libusb0 minimal parport policykit +qt4 qt5 scanner +snmp static-ppds X"
+
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+
+COMMON_DEPEND="
+ virtual/jpeg:0
+ hpijs? (
+ || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] )
+ )
+ >=net-print/cups-1.4.0
+ !minimal? (
+ ${PYTHON_DEPS}
+ !libusb0? ( virtual/libusb:1 )
+ libusb0? ( virtual/libusb:0 )
+ scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+ fax? ( >=sys-apps/dbus-1.6.8-r1 )
+ snmp? (
+ net-analyzer/net-snmp
+ dev-libs/openssl:0
+ )
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+ >=app-text/ghostscript-gpl-8.71-r3
+ policykit? ( sys-auth/polkit )
+ !minimal? (
+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ kernel_linux? ( virtual/udev )
+ scanner? (
+ >=dev-python/reportlab-3.1.44-r2[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+ X? ( || (
+ kde? ( kde-misc/skanlite )
+ media-gfx/xsane
+ media-gfx/sane-frontends
+ ) )
+ )
+ fax? ( >=dev-python/reportlab-3.1.44-r2[${PYTHON_USEDEP}] )
+ qt4? ( >=dev-python/PyQt4-4.11.1[dbus,X,${PYTHON_USEDEP}] )
+ qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,${PYTHON_USEDEP}] )
+ )"
+
+REQUIRED_USE="
+ !minimal? ( ${PYTHON_REQUIRED_USE} )
+ !minimal? ( qt4? ( !qt5 ) )
+"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+ use !minimal && python-single-r1_pkg_setup
+
+ ! use qt4 && ! use qt5 && ewarn "You need USE=qt4 or USE=qt5 for the hplip GUI."
+
+ use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+ if ! use hpcups && ! use hpijs ; then
+ ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+ ewarn "which is probably not what you want."
+ ewarn "You will almost certainly not be able to print."
+ fi
+
+ if use minimal ; then
+ ewarn "Installing driver portions only, make sure you know what you are doing."
+ ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+ ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+ else
+ use parport && linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ eapply "${WORKDIR}/patches"
+
+ default
+
+ if use !minimal ; then
+ python_export EPYTHON PYTHON
+ python_fix_shebang .
+ fi
+
+ # Make desktop files follow the specification
+ # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+ sed -i -e '/^Categories=/s/Application;//' \
+ -e '/^Encoding=.*/d' hplip.desktop.in || die
+ sed -i -e '/^Categories=/s/Application;//' \
+ -e '/^Version=.*/d' \
+ -e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+ # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+ # https://bugs.launchpad.net/hplip/+bug/500086
+ local udevdir=$(get_udevdir)
+ sed -i -e "s|/etc/udev|${udevdir}|g" \
+ $(find . -type f -exec grep -l /etc/udev {} +) || die
+
+ # Force recognition of Gentoo distro by hp-check
+ sed -i \
+ -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+ installer/core_install.py || die
+
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp || die
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || die
+ mv ${i}.temp ${i} || die
+ done
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf drv_build minimal_build
+
+ if use qt4 || use qt5 ; then
+ myconf="${myconf} --enable-gui-build"
+ else
+ myconf="${myconf} --disable-gui-build"
+ fi
+
+ if use fax || use qt4 || use qt5 ; then
+ myconf="${myconf} --enable-dbus-build"
+ else
+ myconf="${myconf} --disable-dbus-build"
+ fi
+
+ if use libusb0 ; then
+ myconf="${myconf} --enable-libusb01_build"
+ else
+ myconf="${myconf} --disable-libusb01_build"
+ fi
+
+ if use hpcups ; then
+ drv_build="$(use_enable hpcups hpcups-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-cups-ppd-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ else
+ drv_build="${drv_build} --enable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+ else
+ drv_build="--disable-hpcups-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+
+ if use hpijs ; then
+ drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-foomatic-ppd-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ else
+ drv_build="${drv_build} --enable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+ else
+ drv_build="${drv_build} --disable-hpijs-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+
+ if use minimal ; then
+ if use hpijs ; then
+ minimal_build="--enable-hpijs-only-build"
+ else
+ minimal_build="--disable-hpijs-only-build"
+ fi
+ if use hpcups ; then
+ minimal_build="${minimal_build} --enable-hpcups-only-build"
+ else
+ minimal_build="${minimal_build} --disable-hpcups-only-build"
+ fi
+ fi
+
+ econf \
+ --disable-cups11-build \
+ --disable-lite-build \
+ --disable-foomatic-rip-hplip-install \
+ --disable-shadow-build \
+ --disable-qt3 \
+ --disable-udev_sysfs_rules \
+ --with-cupsbackenddir=$(cups-config --serverbin)/backend \
+ --with-cupsfilterdir=$(cups-config --serverbin)/filter \
+ --with-docdir=/usr/share/doc/${PF} \
+ --with-htmldir=/usr/share/doc/${PF}/html \
+ ${myconf} \
+ ${drv_build} \
+ ${minimal_build} \
+ $(use_enable doc doc-build) \
+ $(use_enable fax fax-build) \
+ $(use_enable parport pp-build) \
+ $(use_enable scanner scan-build) \
+ $(use_enable snmp network-build) \
+ $(use_enable qt4) \
+ $(use_enable qt5) \
+ $(use_enable policykit)
+}
+
+src_install() {
+ # disable parallel install
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
+ # default
+
+ # Installed by sane-backends
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+ rm -f "${D}"/etc/sane.d/dll.conf || die
+
+ rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+ rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+ # Remove hal fdi files
+ rm -rf "${D}"/usr/share/hal || die
+
+ prune_libtool_files --all
+
+ if use !minimal ; then
+ python_export EPYTHON PYTHON
+ python_optimize "${D}"/usr/share/hplip
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/net-proxy/http-replicator/http-replicator-3.0-r6.ebuild b/net-proxy/http-replicator/http-replicator-3.0-r6.ebuild
index 17982d05481a..770647b9cf14 100644
--- a/net-proxy/http-replicator/http-replicator-3.0-r6.ebuild
+++ b/net-proxy/http-replicator/http-replicator-3.0-r6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~sparc ~x86"
PATCHES=(
"${FILESDIR}/http-replicator-3.0-sighup.patch"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 1189166f64ec..311b201b626b 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Maciej Mrozowski (1 Sept 2016)
+# Workaround until resolved upstream (bug #586840)
+>=dev-games/simgear-2016.2.1 dns
+
# Pawel Hajdan jr (20 Aug 2016)
# Chromium GYP build is no longer supported - always use GN.
>=www-client/chromium-54 gn
diff --git a/profiles/package.mask b/profiles/package.mask
index 7fbe58db2e67..ce7d50a8bc19 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -231,309 +231,19 @@ dev-lang/php:5.5
dev-php/pecl-http:0
=dev-php/pecl-mailparse-2.1.6-r1
-
-# Pacho Ramos (21 Aug 2016)
-# Ugly buildsystem, hard to bump, orphan (#462670). Removal in a month.
-x11-misc/ardesia
-
-# Pacho Ramos (21 Aug 2016)
-# Removal in a month, bug #463662
-# NP-Hardass (05 Feb 2016)
-# Security issues.
-app-admin/389-ds-console
-net-nds/389-admin
-app-admin/389-admin-console
-www-apps/389-dsgw
-
-# Pacho Ramos (21 Aug 2016)
-# Unmaintained, pending major version bump, doesn't integrate well with
-# portage, bug #477798. Removal in a month.
-app-benchmarks/phoronix-test-suite
-
-# Pacho Ramos (21 Aug 2016)
-# Upstream dead, not needed with apache-2.4, bug #480310. Removal in a
-# month.
-www-apache/mod_fastcgi
-
-# Pacho Ramos (21 Aug 2016)
-# Upstream dead, buggy, removal in a month (#484290)
-media-video/dvd-slideshow
-
-# Pacho Ramos (21 Aug 2016)
-# Dead for ages, relies on obsolete libs. Try to use to better maintained
-# alternatives (like handbrake), bug #485320. Removal in a month.
-media-video/arista
-
-# Pacho Ramos (21 Aug 2016)
-# Incompatible with bluez-5, dead for ages, bug #500722. Removal in a month.
-app-mobilephone/obex-data-server
-
-# Pacho Ramos (21 Aug 2016)
-# Dead since 2011, needs a major version bump, bug #505050. Removal in a
-# month.
-media-video/xvideoservicethief
-
-# Pacho Ramos (21 Aug 2016)
-# Unmaintained, broken in several ways, try to use linux-firmware, bug
-# #508848. Removal in a month.
-media-tv/linuxtv-dvb-firmware
-
-# Pacho Ramos (21 Aug 2016)
-# Unmaintained, nothing needs this, collides with
-# sphinxcontrib-programoutput, bug #512496. Removal in a month.
-dev-python/sphinxcontrib-plantuml
-
-# Pacho Ramos (21 Aug 2016)
-# Dead since 2002, buggy (#513044). Removal in a month.
-app-benchmarks/piozone
-
-# Pacho Ramos (21 Aug 2016)
-# Broken in several ways for ages, bug #514074. Removal in a month.
-dev-ada/asis-gpl
-dev-lang/gnat-gpl
-
-# Pacho Ramos (21 Aug 2016)
-# Dead, doesn't build, bug #514830. Removal in a month.
-x11-misc/xac
-
-# Pacho Ramos (21 Aug 2016)
-# Dead for ages, needs multiple obsolete libs, bug #515078. Removal in a
-# month.
-app-cdr/gnomebaker
-
# Pacho Ramos (21 Aug 2016)
# Needs fixing (#515944), nothing needs this in the tree. Removal in a
# month.
dev-lang/regina-rexx
-# Pacho Ramos (21 Aug 2016)
-# Dead for ages, unclear security status, bug #521664
-# Removal in a month.
-www-servers/webfs
-
-# Pacho Ramos (21 Aug 2016)
-# Dead for ages, broken, bug #527268. Removal in a month.
-app-misc/ddccontrol
-app-misc/ddccontrol-db
-
-# Pacho Ramos (21 Aug 2016)
-# Broken (#530756), removal in a month.
-dev-libs/log4c
-
-# Pacho Ramos (21 Aug 2016)
-# Doesn't work (#532668), dead for ages. Removal in a month.
-net-misc/googlecl
-
-# Pacho Ramos (21 Aug 2016)
-# Remove dead plugins that became obsolete with apache-2.4 (#532782 and
-# others). Removal in a month.
-www-apache/mod_anonymize_ip
-www-apache/mod_auth_cookie_mysql2
-www-apache/mod_auth_imap2
-www-apache/mod_auth_mysql
-www-apache/mod_auth_nufw
-www-apache/mod_auth_token
-www-apache/mod_cband
-www-apache/mod_ftpd
-www-apache/mod_layout
-www-apache/mod_loadavg
-www-apache/mod_proxy_fcgi
-www-apache/mod_proxy_html
-www-apache/mod_slotlimit
-www-apache/mod_tcl
-
-# Pacho Ramos (21 Aug 2016)
-# Security issues (#534184), removal in a month.
-app-misc/run-mailcap
-
-# Pacho Ramos (21 Aug 2016)
-# Broken (#536710), upstream dead and unmaintained. Removal in a month.
-x11-libs/fxscintilla
-dev-ruby/fxruby
-
-# Pacho Ramos (21 Aug 2016)
-# Dead for ages, librsvg should be used instead, bug #537918. Removal in a
-# month.
-x11-libs/libsvg-cairo
-media-gfx/xsvg
-media-libs/libsvg
-
-# Pacho Ramos (21 Aug 2016)
-# Broken on libav/ffmpeg updates, upstream dead, unmaintained (#540214).
-# Removal in a month.
-media-libs/libdlna
-
-# Pacho Ramos (21 Aug 2016)
-# Fails to compile (#544002), unmaintained, nothing needs this in the tree.
-# Removal in a month.
-dev-lang/io
-
-# Pacho Ramos (21 Aug 2016)
-# Obsolete for years in favour of plain libsoup usage. Removal in a month.
-net-libs/libsoup-gnome
-
-# Pacho Ramos (21 Aug 2016)
-# Fails to build (#555568). Removal in a month.
-app-i18n/scim-skk
-
-# Pacho Ramos (21 Aug 2016)
-# This was merged into sys-apps/systemd, USE=gnuefi (#556734).
-# Alternatively, see sys-boot/systemd-boot for a standalone version.
-# Removal in a month.
-sys-boot/gummiboot
-
-# Pacho Ramos (21 Aug 2016)
-# Fails to build (#557452), nothing requires this in the tree. Removal in a
-# month.
-media-plugins/audacious-dumb
-
-# Pacho Ramos (21 Aug 2016)
-# Dead, unmaintained, fails to build (#558068). Removal in a month.
-net-misc/yajhfc
-
-# Pacho Ramos (21 Aug 2016)
-# Outdated, unmaintained, use linux-firmware instead (#561996). Removal in a
-# month.
-sys-firmware/iwl6000-ucode
-
# Pacho Ramos (21 Aug 2016)
# Security issues (#562898)
=app-admin/lsyncd-2.1.5
-# Pacho Ramos (21 Aug 2016)
-# Dead, not compatible with wxGTK3 (#564088). Removal in a month.
-games-mud/wxmud
-
-# Pacho Ramos (21 Aug 2016)
-# Dead for ages, broken (#566628). Removal in a month.
-app-pda/coldsync
-
-# Pacho Ramos (21 Aug 2016)
-# Broken (#570062), upstream stopped its development years ago in favour of
-# its java version. Removal in a month.
-media-sound/gnaural
-
-# Pacho Ramos (21 Aug 2016)
-# Fails to build (#575906), removal in a month.
-app-misc/slashtime
-
-# Pacho Ramos (21 Aug 2016)
-# Replaced by filebeat-bin, bug #579690. Removal in a month.
-app-admin/logstash-forwarder
-
-# Pacho Ramos (21 Aug 2016)
-# Fails to build (#583334), unmaintained, removal in a month.
-app-benchmarks/ltp
-
-# Pacho Ramos (21 Aug 2016)
-# Dead since 2010, unmaintained (#590142). Removal in a month.
-dev-libs/libmal
-app-pda/jpilot-syncmal
-
-# Pacho Ramos (21 Aug 2016)
-# Obsolete, requires lots of dead libs (#591104). Removal in a month.
-media-video/coriander
-
# Pacho Ramos (21 Aug 2016)
# Packages added without a maintainer:
#591110
dev-vcs/git-deps
-#591118
-app-arch/threadzip
-#591122
-media-video/pgcedit
-#591124
-dev-python/remoteobjects
-#591126
-net-dns/hesinfo
-
-# Pacho Ramos (21 Aug 2016)
-# Unmaintained packages, not needed by anything in the tree and that would
-# need migration to new python eclasses
-#591466
-app-text/lodgeit
-#591470
-dev-util/metro
-#591472
-mail-filter/isbg
-#591478
-net-misc/goog-sitemapgen
-#591480
-net-misc/gtkvncviewer
-#591482
-dev-python/pynut
-#591482
-net-misc/nut-monitor
-#591486
-sys-power/cpuspeedy
-#591488
-x11-misc/denu
-#591504
-net-misc/identicurse
-#591500
-app-pda/synce-sync-engine
-
-# Pacho Ramos (21 Aug 2016)
-# Dead since 2007, requires cdrkit, bug #591780
-app-cdr/mybashburn
-
-# Pacho Ramos (21 Aug 2016)
-# Dead since 2013, relies on obsolete libs (#591798), unmaintained. Removal
-# in a month.
-net-misc/gnome-rdp
-
-# Pacho Ramos (21 Aug 2016)
-# Multiple unresolved bugs (#368997), upstream doesn't take care of -1
-# branch for a long time. Use tigervnc instead.
-net-misc/tightvnc
-
-# Pacho Ramos (20 Aug 2016)
-# codecs are not usable, also really obsolete, bug #181959
-# Removal in a month.
-media-video/xanim
-
-# Pacho Ramos (20 Aug 2016)
-# Collides with ircii, this is dead since 1999, bug #247987
-# Removal in a month.
-net-irc/irc-client
-
-# Pacho Ramos (20 Aug 2016)
-# Needs a major version bump, completely outdated, bug #262902
-# Removal in a month.
-net-im/simpserver-bin
-
-# Pacho Ramos (20 Aug 2016)
-# Outdated, not compatible with current kernels (#263549).
-# Removal in a month.
-net-analyzer/portbunny
-
-# Pacho Ramos (20 Aug 2016)
-# Dead since 2008, ugly build system, incorrect deps (#298157).
-# Removal in a month.
-app-text/notecase
-
-# Pacho Ramos (20 Aug 2016)
-# Dead for ages, nothing needs it in the tree, fails to crosscompile
-# (#373347). Removal in a month.
-net-dialup/radiusclient
-
-# Pacho Ramos (20 Aug 2016)
-# Dead for ages, phantomjs should be used instead, bug #374943
-# Removal in a month.
-media-gfx/cutycapt
-
-# Pacho Ramos (20 Aug 2016)
-# Broken, needs someone to take care of it and update it, bug #421869
-# Removal in a month.
-www-misc/reflector
-
-# Pacho Ramos (20 Aug 2016)
-# Multiple QA issues, nothing needs it (#430690). Removal in a month.
-net-libs/wt
-
-# Pacho Ramos (20 Aug 2016)
-# Fails to build, bug #449964. Removal in a month.
-sci-physics/mpb
# Brian Evans (18 Aug 2016)
# Mask new MariaDB alphas for testing
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4e9d7d71efbb..91ad65c1fc39 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -258,10 +258,6 @@ app-backup/tsm:tsm_cit - IBM Tivoli Common Inventory Technology
app-backup/tsm:tsm_hw - Difference snapshot support for NetApp and N-Series file servers
app-benchmarks/filebench:auto-completion - Enable command-line autocompletion using dev-libs/libtecla.
app-benchmarks/jmeter:beanshell - Enable BeanShell scripting support
-app-benchmarks/ltp:expect - Build against the expect library for interactive testing
-app-benchmarks/ltp:open-posix - Build and install the POSIX testsuite
-app-benchmarks/ltp:pm - Build and install the power management testsuite
-app-benchmarks/ltp:rt - Build and install the realtime testsuite
app-benchmarks/ramspeed:pic - Force shared libraries to be built as PIC (this is slower)
app-benchmarks/sysbench:aio - Enable libaio support
app-cdr/backlite:mplayer - Add support for mplayer preview in addition to X11 and phonon
@@ -278,7 +274,6 @@ app-cdr/dvdisaster:debug - Enable memory debugging.
app-cdr/gaffitter:scripts - Install additional gaffitter scripts for external programs
app-cdr/k3b:emovix - Enable burning support for eMoviX images
app-cdr/mirage2iso:pinentry - Support app-crypt/pinentry password input backend.
-app-cdr/mybashburn:normalize - Add support for normalizing audio file volume levels
app-crypt/aespipe:asm - Enable assebly modules
app-crypt/aespipe:cpu_flags_x86_padlock - Use VIA padlock instructions, detected at run time, code still works on non-padlock processors
app-crypt/ccid:kobil-midentity - Build and install Kobil_mIDentity_switch tool
@@ -1094,7 +1089,6 @@ app-text/hyperestraier:mecab - Enable app-text/mecab support for Estraier
app-text/jmupdf:system-mupdf - Link against system version of app-text/mupdf
app-text/lcdf-typetools:kpathsea - Enable integration with kpathsea search library (TeX related)
app-text/libwpd:tools - Build miscellaneous tools
-app-text/lodgeit:vim - Install a vim plugin allowing to paste and download from within vim
app-text/mathtex:png - Generate png images by default instead of gif
app-text/mupdf:openssl - Use dev-libs/openssl crypto backend
app-text/pandoc:embed_data_files - Embed data files in binary for relocatable executable.
@@ -1721,16 +1715,6 @@ dev-lang/ghc:llvm - Enable llvm code generator for ghc (-fllvm).
dev-lang/gnat-gcc:acats - Installs ACATS source under LIBPATH.
dev-lang/go:gccgo - Enable bootstrapping using gccgo
dev-lang/icon:iplsrc - install the icon programming library source
-dev-lang/io:clutter - Build add-on for media-libs/clutter
-dev-lang/io:editline - Build add-on for dev-libs/libedit
-dev-lang/io:google - Build the google search add-on
-dev-lang/io:gui - Build the Flux GUI add-on
-dev-lang/io:http - Build http client add-on
-dev-lang/io:image - Build add-on for images support (jpeg, png, tiff)
-dev-lang/io:libxml2 - Build add-on for dev-libs/libxml2
-dev-lang/io:md5sum - Build md5sum add-on
-dev-lang/io:sha1 - Build sha1 add-on
-dev-lang/io:twitter - Build twitter add-on
dev-lang/lazarus:minimal - Don't build extra packages from the bigide component
dev-lang/logtalk:fop - Support for generating pdf documentation using fop
dev-lang/logtalk:gnupl - Support GNU Prolog back-end compiler
@@ -2686,9 +2670,6 @@ dev-util/kdevplatform:welcomepage - Enable welcome page, requires dev-qt/qtdecla
dev-util/ltrace:unwind - Use sys-libs/libunwind for frame unwinding support
dev-util/lttng-tools:ust - Support LTTng-UST (Userspace Tracing)
dev-util/mdds:valgrind - Add support for memory debugging using dev-util/valgrind
-dev-util/metro:ccache - Enable support for ccache
-dev-util/metro:git - Enable support for git snapshots
-dev-util/metro:threads - Enable support for pbzip2 tarball packing/unpacking
dev-util/mingw64-runtime:idl - Install idl files.
dev-util/mingw64-runtime:libraries - Build extra libraries.
dev-util/mingw64-runtime:tools - Build extra tools.
@@ -3033,7 +3014,7 @@ games-simulation/flightgear:jsbsim - Enables JSBSim Flight Dynamics Model (defau
games-simulation/flightgear:oldfdm - Enables deprecated Flight Dynamics Models (LaRCsim, UIUC)
games-simulation/flightgear:qt5 - Builds Qt5 launcher application
games-simulation/flightgear:udev - Enables event-based Input devices through virtual/udev
-games-simulation/flightgear:utils - Builds various utilities (fgpanel, terrasync, fgviewer among others)
+games-simulation/flightgear:utils - Builds various utilities (fgpanel, fgviewer among others)
games-simulation/flightgear:yasim - Enables YASim Flight Dynamics Model
games-simulation/openttd:aplaymidi - Enables midi music in game, using aplaymidi as an external player
games-simulation/openttd:dedicated - Build only the openttd server, and not the client.
@@ -4614,15 +4595,12 @@ media-tv/xmltv:za - South Africa tv listing grabber
media-video/aegisub:uchardet - Enable charset discovery via dev-libs/uchardet
media-video/aravis:X - Build the GTK+-based video viewer for aravis. This requires GStreamer and a few plugins but technically not the GST plugin for aravis.
media-video/aravis:gstreamer - Build the GStreamer plugin for aravis, but not the video viewer.
-media-video/arista:faac - Use external faac library for AAC encoding
-media-video/arista:nautilus - Add an entry in the Nautilus context menu to transcode media files for a specified device.
media-video/chaplin:transcode - Enable DVD ripping and transcoding
media-video/clive:clipboard - Support reading from X clipboard
media-video/clive:pager - Support pager!?
media-video/clive:password - Support password controlled sites
media-video/devede:mencoder - Prefer MPlayer mencoder over Libav avconv or FFmpeg ffmpeg for encoding.
media-video/dv2sub:kino - install kino plugin
-media-video/dvd-slideshow:themes - Install theme pack
media-video/dvdauthor:graphicsmagick - Use media-gfx/graphicsmagick instead of media-gfx/imagemagick
media-video/dvdrip:fping - Enables fping support for cluster rendering
media-video/dvdrip:subtitles - Enables support for subtitle ripping
@@ -4797,7 +4775,6 @@ media-video/obs-studio:imagemagick - Use ImageMagick for image loading instead o
media-video/ogmrip:ogm - Support for OGM container format
media-video/ogmrip:srt - Support for SRT subtitle format
media-video/parole:clutter - Compile in Clutter GTK+ support
-media-video/pgcedit:video - Add support for video preview
media-video/qgifer:imagemagick - Use imagemagick for image operations
media-video/qgifer:opencv3 - Use media-libs/opencv:0/3.0 for video operations instead media-libs/opencv:0/2.4
media-video/rtmpdump:gnutls - Use GnuTLS library instead of the default OpenSSL
@@ -5819,11 +5796,6 @@ net-libs/webkit-gtk:egl - Enable EGL support.
net-libs/webkit-gtk:geoloc - Enable geolocation support through app-misc/geoclue
net-libs/webkit-gtk:gles2 - Enable GLESv2 support.
net-libs/webkit-gtk:webgl - Build support for the WebGL HTML API using virtual/opengl
-net-libs/wt:extjs - Build Wt Ext library with JavaScript-only widgets (http://extjs.com/)
-net-libs/wt:fcgi - Compile in FCGI connector
-net-libs/wt:graphicsmagick - Enable GraphicsMagick, for supporting painting to raster images (PNG, GIF, ...) (WRasterImage)
-net-libs/wt:resources - Install resources directory
-net-libs/wt:server - Compile in stand-alone httpd connector
net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
net-libs/xrootd:fuse - Enable the sys-fs/fuse filesystem driver
net-libs/xrootd:http - Enable http protocol support
@@ -6320,7 +6292,6 @@ net-misc/teamviewer:system-wine - Use app-emulation/wine instead of bundled wine
net-misc/termpkg:uucp - Adds support for uucp style device locking
net-misc/tigervnc:server - Build TigerVNC server
net-misc/tigervnc:xorgmodule - Build the Xorg module
-net-misc/tightvnc:server - Build TightVNC server
net-misc/tinc:gui - Add GUI support, using dev-python/wxpython
net-misc/tinc:uml - Enable support for User Mode Linux Sockets
net-misc/tinc:vde - Enable Virtual Distributed Ethernet (VDE) based networking
@@ -7898,7 +7869,6 @@ www-apache/mod_security:jit - Add support for the PCRE Just-in-Time optimisation
www-apache/pwauth:domain-aware - Ignore leading domain names in username (Windows compat)
www-apache/pwauth:faillog - Log failed login attempts
www-apache/pwauth:ignore-case - Ignore string case in username (mostly Windows compat)
-www-apps/389-dsgw:adminserver - Install DSGW with Admin Server
www-apps/ampache:transcode - Install optional dependencies for transcoding support
www-apps/bitten:server - Install master instance that integrates itself with Trac
www-apps/blohg:git - Enable Git support
@@ -8228,7 +8198,6 @@ x11-libs/vte:glade - Provide integration with dev-util/glade.
x11-libs/wxGTK:gnome - Use gnome-base/libgnomeprintui for printing tasks.
x11-libs/wxGTK:gstreamer - Enable the wxMediaCtrl class for playing audio and video through gstreamer.
x11-libs/wxGTK:sdl - Use Simple Directmedia Layer (media-libs/libsdl) for audio.
-x11-misc/ardesia:cwiid - cwiid support: collection of Linux tools written in C for interfacing to the Nintendo Wiimote.
x11-misc/bumblebee:bbswitch - Add dependency on sys-power/bbswitch for PM feature
x11-misc/cdm:consolekit - Enable native consolekit support
x11-misc/colord:argyllcms - Enable ArgyllCMS sensor
diff --git a/sci-physics/mpb/Manifest b/sci-physics/mpb/Manifest
deleted file mode 100644
index 5f52a99d8cbd..000000000000
--- a/sci-physics/mpb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mpb-1.4.2.tar.gz 686488 SHA256 e44c0720a5969a879fb93e48f6098d4d87e2f99d6ef49711d822f4c2249ccd61 SHA512 4151612b8868b324353556f46aeccdce2726d8938ab8cf7404c36da68e90ec0de1799d4e23b2d5bbe5853d0c0329ba0ee1a2fdb2745aed43c34759084b62fbac WHIRLPOOL e0b256c06bdd2c7479723c0db6c434e645b6fbf1a052ebc2971203902f9bf09336b4bf69ec8c8f1cd9b4952672a28290b4ff66c44f56feae135d9cbf07284473
diff --git a/sci-physics/mpb/files/mpb-1.4.2-autotools.patch b/sci-physics/mpb/files/mpb-1.4.2-autotools.patch
deleted file mode 100644
index b6faf07d2bcf..000000000000
--- a/sci-physics/mpb/files/mpb-1.4.2-autotools.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -Nur mpb-1.4.2.orig/configure.ac mpb-1.4.2/configure.ac
---- mpb-1.4.2.orig/configure.ac 2003-03-04 02:38:41.000000000 +0000
-+++ mpb-1.4.2/configure.ac 2008-11-25 17:31:12.000000000 +0000
-@@ -6,15 +6,8 @@
- MPB_VERSION=1.4.2
- AC_SUBST(MPB_VERSION)
-
--AC_MSG_CHECKING([for vendor f77 to be used instead of g77])
--AC_MSG_RESULT()
--AC_CHECK_PROGS(F77, f77 xlf77 cf77 fort77 f90 xlf90)
- AC_PROG_F77
--
--# Get C compiler.
--AC_MSG_CHECKING([for vendor cc to be used instead of gcc])
--AC_MSG_RESULT()
--AC_CHECK_PROGS(CC, cc xlc) # prefer vendor cc, to stay in sync with Fortran
-+AC_F77_WRAPPERS
- AC_PROG_CC
-
- # Checks for programs.
-@@ -79,12 +72,6 @@
- echo "*********************** HERMITIAN EPS. ***********************"
- fi
-
--# Add lots of compiler warnings to check for if we are using gcc:
--# (The variable $GCC is set to "yes" by AC_PROG_CC if we are using gcc.)
--if test "$GCC" = "yes"; then
-- CFLAGS="$CFLAGS -Wall -W -Wbad-function-cast -Wcast-qual -Wpointer-arith -Wcast-align -pedantic"
--fi
--
- ##############################################################################
- # Checks for libraries:
- ##############################################################################
-@@ -203,6 +190,10 @@
- # how to run mpb-mpi in general
- fi
-
-+# Checks for header files.
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(unistd.h getopt.h)
-+
- ##############################################################################
- # Check for HDF5 library
- AC_ARG_WITH(hdf5, [AC_HELP_STRING([--without-hdf5],[do not use HDF5 output])], ok=$withval, ok=yes)
-@@ -349,9 +340,7 @@
- ]], [AC_MSG_RESULT(ok)], [AC_MSG_ERROR([libctl version ${LIBCTL_MAJOR}.${LIBCTL_MINOR}.${LIBCTL_BUGFIX} or later is required])])
-
- ##############################################################################
--# Checks for header files.
--AC_HEADER_STDC
--AC_CHECK_HEADERS(unistd.h getopt.h)
-+
-
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-diff -Nur mpb-1.4.2.orig/Makefile.in mpb-1.4.2/Makefile.in
---- mpb-1.4.2.orig/Makefile.in 2002-01-18 22:52:41.000000000 +0000
-+++ mpb-1.4.2/Makefile.in 2008-11-25 17:31:12.000000000 +0000
-@@ -2,6 +2,9 @@
-
- SHELL = @SHELL@
-
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
- CC = @CC@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
-diff -Nur mpb-1.4.2.orig/mpb-ctl/Makefile.in mpb-1.4.2/mpb-ctl/Makefile.in
---- mpb-1.4.2.orig/mpb-ctl/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/mpb-ctl/Makefile.in 2008-11-25 18:23:20.000000000 +0000
-@@ -13,6 +13,12 @@
-
- SHELL = @SHELL@
-
-+mandir = @mandir@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+
- ##############################################################################
-
- # Makefile.in for programs using libctl (assumes that autoconf is
-@@ -37,8 +43,8 @@
- ../src/util/util.a
-
- MY_LDFLAGS = # extra -L flags go here
--MY_CPPFLAGS = -I. -I../src/util -I../src/matrices -I../src/matrixio \
-- -I../src/maxwell
-+MY_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(top_srcdir)/src/matrixio \
-+ -I$(top_srcdir)/src/maxwell
- MY_DEFS = -DHAVE_CTL_HOOKS=1 -DHAVE_CTL_EXPORT_HOOK=1
-
- # The following variables should be detected and set by autoconf:
-@@ -134,11 +140,11 @@
-
- install-mpb: $(PROGRAM_NAME)
- $(INSTALL) -d $(prefix)/bin
-- $(INSTALL) -m 0755 -s .$(PROGRAM_NAME) $(prefix)/bin/`echo $(PROGRAM_NAME)|sed '$(transform)'`
-+ $(INSTALL) -m 0755 .$(PROGRAM_NAME) $(prefix)/bin/`echo $(PROGRAM_NAME)|sed '$(transform)'`
- $(INSTALL) -d $(prefix)/share/libctl/specs
- $(INSTALL) -m 0644 $(SPECIFICATION_FILE) $(prefix)/share/libctl/specs
- $(INSTALL) -d $(mandir)/man1
-- $(INSTALL) -m 0644 $(PROGRAM_NAME).1 $(mandir)/man1
-+ $(INSTALL) -m 0644 $(srcdir)/$(PROGRAM_NAME).1 $(mandir)/man1
-
- mpb-split-tmp:
- rm -f mpb-split-tmp
-@@ -149,7 +155,7 @@
- mpb_name=`echo mpb | sed '$(transform)'`; \
- $(INSTALL) -m 0755 mpb-split-tmp $(prefix)/bin/$${mpb_name}-split
- $(INSTALL) -d $(mandir)/man1
-- $(INSTALL) -m 0644 mpb-split.1 $(mandir)/man1
-+ $(INSTALL) -m 0644 $(srcdir)/mpb-split.1 $(mandir)/man1
-
- clean:
- rm -f $(ALL_OBJECTS) ctl-io.c ctl-io.h main.c geom.c \
-diff -Nur mpb-1.4.2.orig/src/matrices/Makefile.in mpb-1.4.2/src/matrices/Makefile.in
---- mpb-1.4.2.orig/src/matrices/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/src/matrices/Makefile.in 2008-11-25 17:31:12.000000000 +0000
-@@ -2,9 +2,11 @@
-
- SHELL = @SHELL@
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--CPPFLAGS = -I../util -I. @CPPFLAGS@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+
-+CPPFLAGS = -I$(top_srcdir)/src/util -I$(srcdir) -I. @CPPFLAGS@
- DEFS = @DEFS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-diff -Nur mpb-1.4.2.orig/src/matrixio/Makefile.in mpb-1.4.2/src/matrixio/Makefile.in
---- mpb-1.4.2.orig/src/matrixio/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/src/matrixio/Makefile.in 2008-11-25 17:31:12.000000000 +0000
-@@ -2,9 +2,11 @@
-
- SHELL = @SHELL@
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--CPPFLAGS = -I../util -I../matrices -I. @CPPFLAGS@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+
-+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(srcdir) -I. @CPPFLAGS@
- DEFS = @DEFS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-diff -Nur mpb-1.4.2.orig/src/maxwell/Makefile.in mpb-1.4.2/src/maxwell/Makefile.in
---- mpb-1.4.2.orig/src/maxwell/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/src/maxwell/Makefile.in 2008-11-25 17:31:12.000000000 +0000
-@@ -2,9 +2,11 @@
-
- SHELL = @SHELL@
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--CPPFLAGS = -I../util -I../matrices @CPPFLAGS@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+
-+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I. @CPPFLAGS@
- DEFS = @DEFS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-diff -Nur mpb-1.4.2.orig/src/util/Makefile.in mpb-1.4.2/src/util/Makefile.in
---- mpb-1.4.2.orig/src/util/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/src/util/Makefile.in 2008-11-25 17:31:12.000000000 +0000
-@@ -2,9 +2,11 @@
-
- SHELL = @SHELL@
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--CPPFLAGS = -I. @CPPFLAGS@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+
-+CPPFLAGS = -I$(top_srcdir) -I. @CPPFLAGS@
- DEFS = @DEFS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-diff -Nur mpb-1.4.2.orig/tests/Makefile.in mpb-1.4.2/tests/Makefile.in
---- mpb-1.4.2.orig/tests/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/tests/Makefile.in 2008-11-25 17:31:58.000000000 +0000
-@@ -2,12 +2,14 @@
-
- SHELL = @SHELL@
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--CPPFLAGS = -I../src/util -I../src/matrices -I../src/maxwell @CPPFLAGS@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+
-+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(top_srcdir)/src/maxwell -I. @CPPFLAGS@
- DEFS = @DEFS@
--LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-+LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
- @SET_MAKE@
-
-@@ -15,11 +17,11 @@
- ../src/matrices/matrices.a \
- ../src/util/util.a
-
--all: blastest eigs_test maxwell_test malloctest normal_vectors
-+all:
-
- libs:
-
--check: all
-+check: blastest eigs_test maxwell_test malloctest normal_vectors
- rm -f blastest.out.test
- ./blastest | sed 's/\-0\.000\([ ,)]\)/ 0.000\1/g' | sed 's/\-0\.000$$/ 0.000/g' > blastest.out.test
- diff blastest.@SCALAR_TYPE@.out blastest.out.test
-diff -Nur mpb-1.4.2.orig/utils/Makefile.in mpb-1.4.2/utils/Makefile.in
---- mpb-1.4.2.orig/utils/Makefile.in 2002-09-14 23:20:55.000000000 +0100
-+++ mpb-1.4.2/utils/Makefile.in 2008-11-25 18:23:46.000000000 +0000
-@@ -1,13 +1,16 @@
- # Variables substituted by the autoconf configure script:
-
- SHELL = @SHELL@
-+mandir = @mandir@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-
--CC = @CC@
--CFLAGS = @CFLAGS@
--CPPFLAGS = -I../src/util -I../src/matrices -I../src/matrixio @CPPFLAGS@
-+CPPFLAGS = -I$(top_srcdir)/src/util -I$(top_srcdir)/src/matrices -I$(top_srcdir)/src/matrixio -I. @CPPFLAGS@
- DEFS = @DEFS@ -DMPB_VERSION='"'"@MPB_VERSION@"'"'
--LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-+LDFLAGS=@LDFLAGS@
- RANLIB = @RANLIB@
- @SET_MAKE@
-
-@@ -36,9 +39,9 @@
-
- install-mpb-data: mpb-data
- $(INSTALL) -d $(prefix)/bin
-- $(INSTALL) -m 0755 -s mpb-data $(prefix)/bin/`echo mpb-data|sed '$(transform)'`
-+ $(INSTALL) -m 0755 mpb-data $(prefix)/bin/`echo mpb-data|sed '$(transform)'`
- $(INSTALL) -d $(mandir)/man1
-- $(INSTALL) -m 0644 mpb-data.1 $(mandir)/man1
-+ $(INSTALL) -m 0644 $(srcdir)/mpb-data.1 $(mandir)/man1
-
- clean:
- rm -f mpb-data mpb-data.o core
diff --git a/sci-physics/mpb/files/mpb-1.4.2-guile18.patch b/sci-physics/mpb/files/mpb-1.4.2-guile18.patch
deleted file mode 100644
index 9cb73a099b8b..000000000000
--- a/sci-physics/mpb/files/mpb-1.4.2-guile18.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mpb-1.4.2.orig/mpb-ctl/field-smob.c mpb-1.4.2/mpb-ctl/field-smob.c
---- mpb-1.4.2.orig/mpb-ctl/field-smob.c 2012-08-07 20:56:24.538452994 -0700
-+++ mpb-1.4.2/mpb-ctl/field-smob.c 2012-08-07 20:56:43.713557380 -0700
-@@ -157,7 +157,7 @@
- boolean cur_fieldp(SCM obj)
- {
- if (SCM_NIMP(obj) && SCM_SYMBOLP(obj)) {
-- char *s = gh_symbol2newstr(obj, NULL);
-+ char *s = gh_symbol2newstr(obj);
- int ret = !strcmp(s, "cur-field");
- free(s);
- return ret;
diff --git a/sci-physics/mpb/files/mpb-1.4.2-headers.patch b/sci-physics/mpb/files/mpb-1.4.2-headers.patch
deleted file mode 100644
index 937e5fc373d4..000000000000
--- a/sci-physics/mpb/files/mpb-1.4.2-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur mpb-1.4.2.orig/mpb-ctl/matrix-smob.c mpb-1.4.2/mpb-ctl/matrix-smob.c
---- mpb-1.4.2.orig/mpb-ctl/matrix-smob.c 2002-09-13 19:27:35.000000000 +0100
-+++ mpb-1.4.2/mpb-ctl/matrix-smob.c 2008-11-25 18:20:11.000000000 +0000
-@@ -17,6 +17,7 @@
-
- #include
- #include
-+#include
-
- #include "../src/config.h"
-
diff --git a/sci-physics/mpb/metadata.xml b/sci-physics/mpb/metadata.xml
deleted file mode 100644
index 706eced531c0..000000000000
--- a/sci-physics/mpb/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- sci-physics@gentoo.org
- Gentoo Physics Project
-
-
- The MIT Photonic-Bands (MPB) package is a program for computing
- the band structures (dispersion relations) and electromagnetic modes of
- periodic dielectric structures, on both serial and parallel computers. It was
- developed by Steven G. Johnson at MIT in the Joannopoulos Ab Initio Physics
- group.
- This program computes definite-frequency eigenstates of Maxwell's
- equations in periodic dielectric structures for arbitrary wavevectors, using
- fully-vectorial and three-dimensional methods. It is especially
- designed for the study of photonic crystals (a.k.a. photonic
- band-gap materials), but is also applicable to many other problems
- in optics, such as waveguides and resonator systems.
- (For example, it can solve for the modes of waveguides with arbitrary
- cross-sections.)
-
-
diff --git a/sci-physics/mpb/mpb-1.4.2-r2.ebuild b/sci-physics/mpb/mpb-1.4.2-r2.ebuild
deleted file mode 100644
index 7eb255b57e63..000000000000
--- a/sci-physics/mpb/mpb-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Photonic band structure program"
-SRC_URI="http://ab-initio.mit.edu/mpb/${P}.tar.gz"
-HOMEPAGE="http://ab-initio.mit.edu/mpb/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples hdf5 mpi"
-
-SLOT="0"
-
-RDEPEND="virtual/lapack
- dev-scheme/guile
- sci-libs/libctl
- sci-libs/fftw:2.1[mpi?]
- sys-libs/readline
- hdf5? ( sci-libs/hdf5 )
- mpi? ( virtual/mpi )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-autotools.patch \
- "${FILESDIR}"/${P}-guile18.patch \
- "${FILESDIR}"/${P}-headers.patch
- cd "${S}"
- eautoreconf
- # version with inversion symmetry (mpbi).
- cp -r "${S}" "${S}_inv" || die
- # version with hermitian eps (mpbh).
- cp -r "${S}" "${S}_herm" || die
- # mpi versions (mpb-mpi).
- if use mpi; then
- cp -r "${S}" "${S}_mpi" || die
- cp -r "${S}" "${S}_inv_mpi" || die
- cp -r "${S}" "${S}_herm_mpi" || die
- fi
- tc-export CC
-}
-
-src_configure() {
- # enable legacy API for hdf-1.8
- use hdf5 && append-cflags -DH5_USE_16_API
- #
- local myconf=(
- --with-libctl="${EPREFIX}/usr/share/libctl"
- --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
- --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
- $(use_with hdf5)
- )
-
- econf "${myconf[@]}"
-
- cd "${S}_inv"
- econf "${myconf[@]}" \
- --with-inv-symmetry
-
- cd "${S}_herm"
- econf "${myconf[@]}" \
- --with-hermitian-eps
-
- if use mpi; then
- cd "${S}_mpi"
- econf "${myconf[@]}" \
- --with-mpi
- cd "${S}_inv_mpi"
- econf "${myconf[@]}" \
- --with-inv-symmetry \
- --with-mpi
- cd "${S}_herm_mpi"
- econf "${myconf[@]}" \
- --with-hermitian-eps \
- --with-mpi \
- CC=mpicc
- fi
-}
-
-src_compile() {
- local d
- for d in . _inv _herm; do
- cd "${S}${d}"
- emake -C mpb-ctl ctl-io.c
- emake
- done
- if use mpi; then
- for d in . _inv _herm; do
- cd "${S}${d}_mpi"
- emake -C mpb-ctl ctl-io.c CC=mpicc
- emake CC=mpicc LD=mpicc
- done
- fi
-}
-
-src_install() {
- einstall
- dodoc README NEWS AUTHORS COPYRIGHT ChangeLog TODO
- use doc && dohtml doc/*
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r mpb-ctl/examples
- fi
-
- newbin "${S}_inv"/mpb-ctl/.mpb mpbi
- newbin "${S}_herm"/mpb-ctl/.mpb mpbh
-
- einfo "Several versions of mpb have been installed:"
- einfo "mpb : regular version"
- einfo "mpbi: configured for inversion symmetry"
- einfo "mpbh: configured for hermitian epsilon"
- if use mpi; then
- newbin "${S}_mpi"/mpb-ctl/.mpb mpb-mpi
- newbin "${S}_inv_mpi"/mpb-ctl/.mpb mpbh-mpi
- newbin "${S}_herm_mpi"/mpb-ctl/.mpb mpbi-mpi
- einfo "mpb-mpi : regular version with mpi"
- einfo "mpbi-mpi: configured for inversion symmetry with mpi"
- einfo "mpbh-mpi: configured for hermitian epsilon with mpi"
- fi
-}
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index df392567ca9c..be9a38067229 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -3,3 +3,4 @@ DIST efibootmgr-0.12.tar.bz2 35816 SHA256 a66f5850677e86255d93cb1cead04c3c48a823
DIST efibootmgr-0.5.4.tar.gz 59121 SHA256 b562a47a4f5327494992f2ee6ae14a75c5aeb9b4a3a78a06749d5cd2917b8e71 SHA512 1fbc3bc442e848b7f6a7e5d8851d92efe271abd090cfeda253baf7b11b9f7b9e984b9703c02ed57f718d5de5b26ec45f1eaeff55b50e4a7bc9e25cf3a958c4ad WHIRLPOOL e17d2a2ecb666eb6644794b48535d8141ee2b79470cdb8d28c927032724efd59dcfdef278d6895bf3c3ec5af91ea559a2df1c938fb406fb2a8c0256a67da05a6
DIST efibootmgr-0.6.0.tar.gz 64995 SHA256 1c9b0852df7932c410865e296a38fe66e39a26e10c9c1a7ff34fca87f3e25f53 SHA512 f06d3094e41ef100f5bad746add6cad3f3c700e5d5ebe9481533e6ec1df07b3595132f835ffcbac853e3fb48d0fd03d572c84f54394ba094b6d0aa426ff2a02c WHIRLPOOL 0352318b9350f8ae789fbeda278a55d1b28edd17fcadbaf0f9f484cac7dd9826e55243b799d512aa30e99265e7dff87142f9054908157bd9dba001981c807943
DIST efibootmgr-13.tar.bz2 34326 SHA256 45d31914454bd4b8d9b2c4489c7f35c5e8588ea63a1cec5686b83a9633d678e1 SHA512 05d348d425f7c6a01920a1cebacbd05fa8e7e4c6a7f00a474a8d66bda9a4d37e199a0b1ce6486fcef8ebd195a057e4df0aac0e56e18d7ba35e7f6707c036843e WHIRLPOOL 3488916eb68504850222c4857c370a39df5c7c818f32ab31ddbb40ee3b46247f9c62bb32d8fdfe23c39893c82fc9f365afca8e8726234f3d1ed0187b6bf9dfb8
+DIST efibootmgr-14.tar.bz2 34972 SHA256 377ec16484414b80afd1b8a586153d7ef55ccf048638080101d49b7c77f37ad8 SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf WHIRLPOOL e5a6860130d9b12274cfe74a962a277989e9961cc8fb70372e8ac0831f79561e30fad0222154c957ed525cf930b912a1d731caff7ef5b2b0987c7cf8f28c4383
diff --git a/sys-boot/efibootmgr/efibootmgr-14.ebuild b/sys-boot/efibootmgr/efibootmgr-14.ebuild
new file mode 100644
index 000000000000..e3459f11428f
--- /dev/null
+++ b/sys-boot/efibootmgr/efibootmgr-14.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-space application to modify the EFI boot manager"
+HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
+SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils
+ >=sys-libs/efivar-25:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -i -e s/-Werror// Make.defaults || die
+}
+
+src_configure() {
+ tc-export CC
+}
diff --git a/sys-boot/gummiboot/Manifest b/sys-boot/gummiboot/Manifest
deleted file mode 100644
index 97fa2d15ff10..000000000000
--- a/sys-boot/gummiboot/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gummiboot-45.tar.xz 126376 SHA256 e3a6734c4c5acd3b42ec72dfc1214147c9f0ca74f08eeb44f969eb0d9b6d1e50 SHA512 09472a34ef8697a605c65462dde41ef09b1528a63b3a006f73a179ebeb16ac236adf9aaf8c8d7d3c411f3e3e029eb47ad916dc13f69ad9558c4277b1fa3d0619 WHIRLPOOL 04418cb9fd20df1a2bf77264bb766dc8542df8c1b05038ae780fbaa5dfb83e84f02cfd1adb20e22a032e9b0ad6e4654f40e25a67e5edf6b09e918c257930b9e1
-DIST gummiboot-48.tar.xz 131284 SHA256 e6b4b58c79cf600948d4d89a5324ced5736d7f20f7d3de74b2be8221123a9d40 SHA512 c3b3176f1b2fc0f5c8e196c9e63cf6ff6111d009c46a6311bd96367256cf4fbc28b46e3ae9ab4452cdc3b41d92fa978052b9803274b01ec3da72562076ea7737 WHIRLPOOL a9f2751a64a53b07a4d3fff17760f9ff38aed7ad4c0f60772b4b039d8b9a4ba50a9ef7006d28fc96d2653253ea9c65cb1e50391a467cb148684322e956d6fe05
diff --git a/sys-boot/gummiboot/files/48-sysmacros.patch b/sys-boot/gummiboot/files/48-sysmacros.patch
deleted file mode 100644
index aceee313f4e5..000000000000
--- a/sys-boot/gummiboot/files/48-sysmacros.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d7904d41506163d07d27dbfab1e514b75d172cee Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Wed, 24 Aug 2016 12:17:19 -0400
-Subject: [PATCH] setup: conditionally include sysmacros.h for major()
-
----
- configure.ac | 2 ++
- src/setup/setup.c | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 27bbe1d..27552c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,6 +72,8 @@ AS_IF([test x"$cross_compiling" = "xyes"], [], [
- AC_SUBST([QEMU_BIOS])
- ])
-
-+AC_HEADER_MAJOR
-+
- # ------------------------------------------------------------------------------
- dnl GNU EFI doesn't use relative paths: efi.h includes efibind.h which is in
- dnl ${ARCH} relative to efi.h. I can't find a way to get AC_CHECK_HEADERS to
-diff --git a/src/setup/setup.c b/src/setup/setup.c
-index 6a4275a..6bf8d86 100644
---- a/src/setup/setup.c
-+++ b/src/setup/setup.c
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-@@ -38,6 +39,13 @@
- #include
- #include
-
-+#ifdef MAJOR_IN_MKDEV
-+#include
-+#endif
-+#ifdef MAJOR_IN_SYSMACROS
-+#include
-+#endif
-+
- #include "efivars.h"
-
- #define ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
---
-2.9.3
-
diff --git a/sys-boot/gummiboot/gummiboot-45.ebuild b/sys-boot/gummiboot/gummiboot-45.ebuild
deleted file mode 100644
index 240c6340e78d..000000000000
--- a/sys-boot/gummiboot/gummiboot-45.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils linux-info
-
-DESCRIPTION="Minimalistic UEFI bootloader"
-HOMEPAGE="https://freedesktop.org/wiki/Software/gummiboot/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-apps/util-linux"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-boot/gnu-efi-3.0.2"
-
-pkg_pretend() {
- # CONFIG_EFI_STUB is required to boot a kernel with gummiboot
- local CONFIG_CHECK="~EFI_STUB"
- check_extra_config
-}
-
-src_prepare() {
- epatch_user
-}
diff --git a/sys-boot/gummiboot/gummiboot-48.ebuild b/sys-boot/gummiboot/gummiboot-48.ebuild
deleted file mode 100644
index bc51e1f95a6b..000000000000
--- a/sys-boot/gummiboot/gummiboot-48.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-WANT_LIBTOOL=none
-
-inherit autotools linux-info
-
-DESCRIPTION="Minimalistic UEFI bootloader"
-HOMEPAGE="https://freedesktop.org/wiki/Software/gummiboot/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-apps/util-linux"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-boot/gnu-efi-3.0.2"
-
-PATCHES=(
- "${FILESDIR}/48-sysmacros.patch"
-)
-
-pkg_pretend() {
- # CONFIG_EFI_STUB is required to boot a kernel with gummiboot
- local CONFIG_CHECK="~EFI_STUB"
- check_extra_config
-}
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/sys-boot/gummiboot/metadata.xml b/sys-boot/gummiboot/metadata.xml
deleted file mode 100644
index e907833a121c..000000000000
--- a/sys-boot/gummiboot/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 61a172bab054..cedfc02923f9 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
+ test? ( dev-python/lit[${PYTHON_USEDEP}] )
xml? ( virtual/pkgconfig )
!! clang-X.Y
# - clang, clang++, clang-cl -> clang*-X.Y
- # so we need to fix the two tools
+ # also in CHOST variant
for i in "${clang_tools[@]:1}"; do
rm "${ED%/}/usr/bin/${i}" || die
- dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
- dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+ dosym "clang-${clang_version}" "/usr/bin/${i}-${clang_version}"
+ dosym "${i}-${clang_version}" "/usr/bin/${i}"
done
- # now prepend ${CHOST} and let the multilib-build.eclass symlink it
- if ! multilib_is_native_abi; then
- # non-native? let's replace it with a simple wrapper
+ # now create wrappers for all supported ABIs
+ for abi in $(get_all_abis); do
+ local abi_flags=$(get_abi_CFLAGS "${abi}")
+ local abi_chost=$(get_abi_CHOST "${abi}")
for i in "${clang_tools[@]}"; do
- rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
- cat > "${T}"/wrapper.tmp <<-_EOF_
+ cat > "${T}"/wrapper.tmp <<-_EOF_ || die
#!${EPREFIX}/bin/sh
- exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+ exec "${i}-${clang_version}" ${abi_flags} "\${@}"
_EOF_
- newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+ newbin "${T}"/wrapper.tmp "${abi_chost}-${i}-${clang_version}"
+ dosym "${abi_chost}-${i}-${clang_version}" \
+ "/usr/bin/${abi_chost}-${i}"
done
+ done
+
+ # Remove unnecessary headers on FreeBSD, bug #417171
+ if use kernel_FreeBSD; then
+ rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
fi
}
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
multilib_src_install_all() {
if use python ; then
pushd bindings/python/clang >/dev/null || die
diff --git a/sys-devel/llvm/llvm-3.9.0.ebuild b/sys-devel/llvm/llvm-3.9.0.ebuild
index a5269d33ce38..8ead13ed6220 100644
--- a/sys-devel/llvm/llvm-3.9.0.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0.ebuild
@@ -426,18 +426,6 @@ src_install() {
)
if use clang; then
- # note: magic applied in multilib_src_install()!
- CLANG_VERSION=${PV%.*}
-
- MULTILIB_CHOST_TOOLS+=(
- /usr/bin/clang
- /usr/bin/clang++
- /usr/bin/clang-cl
- /usr/bin/clang-${CLANG_VERSION}
- /usr/bin/clang++-${CLANG_VERSION}
- /usr/bin/clang-cl-${CLANG_VERSION}
- )
-
MULTILIB_WRAPPED_HEADERS+=(
/usr/include/clang/Config/config.h
)
@@ -445,29 +433,11 @@ src_install() {
multilib-minimal_src_install
- # Remove unnecessary headers on FreeBSD, bug #417171
- if use kernel_FreeBSD && use clang; then
- rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
- fi
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- if multilib_is_native_abi; then
- # Symlink the gold plugin.
- if use gold; then
- dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
- dosym "../../../../$(get_libdir)/LLVMgold.so" \
- "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
- fi
- fi
-
- # apply CHOST and CLANG_VERSION to clang executables
- # they're statically linked so we don't have to worry about the lib
if use clang; then
+ # Apply CHOST and version suffix to clang tools
+ local clang_version=${PV%.*}
local clang_tools=( clang clang++ clang-cl )
- local i
+ local abi i
# cmake gives us:
# - clang-X.Y
@@ -477,24 +447,44 @@ multilib_src_install() {
# - clang-X.Y
# - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
# - clang, clang++, clang-cl -> clang*-X.Y
- # so we need to fix the two tools
+ # also in CHOST variant
for i in "${clang_tools[@]:1}"; do
rm "${ED%/}/usr/bin/${i}" || die
- dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
- dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+ dosym "clang-${clang_version}" "/usr/bin/${i}-${clang_version}"
+ dosym "${i}-${clang_version}" "/usr/bin/${i}"
done
- # now prepend ${CHOST} and let the multilib-build.eclass symlink it
- if ! multilib_is_native_abi; then
- # non-native? let's replace it with a simple wrapper
+ # now create wrappers for all supported ABIs
+ for abi in $(get_all_abis); do
+ local abi_flags=$(get_abi_CFLAGS "${abi}")
+ local abi_chost=$(get_abi_CHOST "${abi}")
for i in "${clang_tools[@]}"; do
- rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
- cat > "${T}"/wrapper.tmp <<-_EOF_
+ cat > "${T}"/wrapper.tmp <<-_EOF_ || die
#!${EPREFIX}/bin/sh
- exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+ exec "${i}-${clang_version}" ${abi_flags} "\${@}"
_EOF_
- newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+ newbin "${T}"/wrapper.tmp "${abi_chost}-${i}-${clang_version}"
+ dosym "${abi_chost}-${i}-${clang_version}" \
+ "/usr/bin/${abi_chost}-${i}"
done
+ done
+ fi
+
+ # Remove unnecessary headers on FreeBSD, bug #417171
+ if use kernel_FreeBSD && use clang; then
+ rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+ fi
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ if multilib_is_native_abi; then
+ # Symlink the gold plugin.
+ if use gold; then
+ dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+ dosym "../../../../$(get_libdir)/LLVMgold.so" \
+ "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
fi
fi
}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 6af306ea7bc7..471783794b06 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
libffi? ( virtual/pkgconfig )
ocaml? ( dev-ml/findlib
test? ( dev-ml/ounit ) )
+ test? ( $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
!! ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-3.18"
+
+src_prepare() {
+ default
+ sed -i -e s/-Werror// gcc.specs || die
+}
+
+src_configure() {
+ tc-export CC
+
+ # https://github.com/rhinstaller/efivar/issues/64
+ append-cflags -flto
+
+ tc-ld-disable-gold
+ export libdir="/usr/$(get_libdir)"
+ unset LIBS # Bug 562004
+}
+
+src_compile() {
+ # Avoid building static binary/libs
+ opts=(
+ BINTARGETS=efivar
+ STATICLIBTARGETS=
+ )
+ emake "${opts[@]}"
+}
+
+src_install() {
+ emake "${opts[@]}" DESTDIR="${D}" install
+}
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 0939b83d5326..98dbad31dffa 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -1,5 +1,5 @@
DIST freeipmi-1.2.2.tar.gz 3031730 SHA256 c8539a8225616e3e647b99903ef1243c5a6a4e1c7bd009399bd8bacf3b263b9c SHA512 86ea9a073ec275b3594e93c7e7fdef2b7214dcd3e696fdec4a017841d4bb7e2179a407d91aa11b26c952cf5b06262801b41293642ed38220d57112a37878a5f4 WHIRLPOOL 763a46cea7bfd1a5e18fae79094a73bd86173a73a8b8d150b3f938bc51c8da6c18db5105ece7ca8f3821254de19bc4e2b2429aac66b260c36426f789be176243
DIST freeipmi-1.4.3.tar.gz 3089282 SHA256 2d8701555f7fd5c3cdc0186e2e435d2ed7945047d22b66088f1e5417dcc35386 SHA512 88a2dec70696017407aac313628407200ee2c6600547fbff73c6880ae8d65cda166c8e00e0f4b7eaddc35f4376143b8fdb0b4ac284aba401c2592a95804e6cec WHIRLPOOL 36c05750f58d018768c82b2a9531892c8c933a7f7b92ea4513dd3527d27494993f82b59d621558bc2975585f51bc6b555b85e246bec1e79704947ac7591cf08b
DIST freeipmi-1.4.8.tar.gz 3185068 SHA256 9fa7e9df7f848445cf6035b26b4167a79711ecc05d8e96ab16bbec10b36e551b SHA512 3cd4acde402bbc945b007e31e7f8dad3ad4539d2cf00310e9168d7cec8024203a280c8ad91e3f08b86dfa9be536779969c5393c4523df2fe8eb904f765fcfc56 WHIRLPOOL ae4393fd36271238597f1602fbaaa6c975268291d26ae3303d9bb1b447cc40070ff4c66ac56a7c301f0544f69ab54eb49a9c6f81fdbdc83ab4d89f3f253b3701
-DIST freeipmi-1.5.2.tar.gz 3244661 SHA256 734fa260e71d11e0a607f8acc731b9492f7f7b2f5476bf2ec29ff34ecde4ee75 SHA512 287dbf9c2320dbc5dd4f62fab3502bda893fa9fc52bbb4ba1b3739ac2f9ab902a2b5ddca59501b7ded228ba2dd0a38d431e743127bacff421c3ffb15a909b70c WHIRLPOOL 2aa5ccd807fd93897da74da0187ef6cc9985f7f8ee15fadd8a0bf90c1eb26c76381a818275cc0cca3c170b17a631bd042336689ed05c2ff451b8fa912adaea64
DIST freeipmi-1.5.3.tar.gz 3245771 SHA256 5d36225b01cc965812e234e708d640381d030edf7689d4264d6f64c26a3c9868 SHA512 3dce3c0ab8e5479e49c2686480f96f5134a0f198e2730ad9f4a47ede434ec7dfb37de450737da5956ffd2fe10289a23448b9f36655a1402cb4392242a892c22a WHIRLPOOL 8274d34d7511f2d4f3571e91eb5a1d31e2af544f82e0505e15b5e469c22e1623f30aab5c384fd04f22e35758f76271970d7dd0ac08c0df446572902e772174fc
+DIST freeipmi-1.5.4.tar.gz 3249494 SHA256 6504a775d5d818c9353ecc7b2697596b29f8bc05e917b6f70157492fbddd1fd5 SHA512 dc1d87ef78270549e49df134cbf16967a3549b0c9e07c67c8296cb31e92bd22e8d8699d7622e28e27bb5b4d01ed9c328c88d6ce5cf3562de0c58c685b04687b5 WHIRLPOOL 13ba89f2953fb96ff341cd028ec5ebd186a0b2e589d4a940cb2a58ba37258edda6ee2e8efedcd0dccba86a492c6814437cf59d000e48dc723bdea1a6e6470ab6
diff --git a/sys-libs/freeipmi/freeipmi-1.5.2.ebuild b/sys-libs/freeipmi/freeipmi-1.5.4.ebuild
similarity index 100%
rename from sys-libs/freeipmi/freeipmi-1.5.2.ebuild
rename to sys-libs/freeipmi/freeipmi-1.5.4.ebuild
diff --git a/sys-libs/libomp/libomp-9999.ebuild b/sys-libs/libomp/libomp-9999.ebuild
index fe851f1c0c7d..245105c3a3d4 100644
--- a/sys-libs/libomp/libomp-9999.ebuild
+++ b/sys-libs/libomp/libomp-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
test? (
$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
sys-devel/llvm
- sys-devel/clang[${MULTILIB_USEDEP}]
+ >=sys-devel/clang-3.9.0
)"
python_check_deps() {
diff --git a/sys-libs/uclibc-ng/Manifest b/sys-libs/uclibc-ng/Manifest
index e8baa7e3fb78..2bf915202438 100644
--- a/sys-libs/uclibc-ng/Manifest
+++ b/sys-libs/uclibc-ng/Manifest
@@ -1,2 +1,3 @@
DIST uClibc-ng-1.0.16.tar.bz2 2769238 SHA256 f0ded5cb1ff7aac670ca9df931fc820648d91b27085a3efecc1b7f06d65f57f6 SHA512 05110f0b6651862f16b01d1b45d59258b93686a7635815f9e050ab6b8f0eb14581782c95f305649d62aa80e78060865620a5306a657ea7e9ac396c68d61347cb WHIRLPOOL d79830b46d4bcb2f19917da936a35443da95728c25a050e5a313f6a374669be8c29d5df12a6e9ac5efc65416a0206672a70c7b6d75cb3fdc4017220e32222bf3
DIST uClibc-ng-1.0.17.tar.bz2 2769872 SHA256 fb4ab60698256d110bf30678a4cb27f14b3cf6eae60ed4ad21b2de5cac8c0bf3 SHA512 de6c7bf2168fe76ad0fa3a59c2c4264040383683b4774e846c97c20802d92dc478d3fcf271800f008c5b2ee06d3f50baac47bc5f28b43366e418c65b11d3bdb4 WHIRLPOOL 430fcd6992097bcd995936e36450617d0d9f57182542ffc42f0bdf021a2e7c0a5c9f8bce50c498567e9219379ef80a20e444f872429ab36dc43eda11134a03f6
+DIST uClibc-ng-1.0.18.tar.bz2 2754404 SHA256 71b2d401025c1235a061cfc80d394760fb37f3611566e105b39dd034f6ed001c SHA512 579ddf4470d684979ba00b71545e7c34ca48d0ad58767222835f95c1401dea5435b6a945390c992e027cc59f2b419a9d835081d08c9d2e6db8b8ddeeed24f5cd WHIRLPOOL 60cd9cc03668af81988d603edc637a8d3dba8276bc0d71e6e915263119c8cf629d293e2da73a57def5b07732cd37f35527b1bc7d3ef01ff09dd6fcc2cf7d3a59
diff --git a/sys-libs/uclibc-ng/files/uclibc-compat-r1.patch b/sys-libs/uclibc-ng/files/uclibc-compat-r1.patch
new file mode 100644
index 000000000000..f47e0f9a0152
--- /dev/null
+++ b/sys-libs/uclibc-ng/files/uclibc-compat-r1.patch
@@ -0,0 +1,15 @@
+diff -Naur uClibc-ng-1.0.18.orig/ldso/ldso/Makefile.in uClibc-ng-1.0.18/ldso/ldso/Makefile.in
+--- uClibc-ng-1.0.18.orig/ldso/ldso/Makefile.in 2016-09-27 15:26:37.000000000 -0400
++++ uClibc-ng-1.0.18/ldso/ldso/Makefile.in 2016-10-01 06:31:44.106589780 -0400
+@@ -80,11 +80,6 @@
+ $(ldso:.$(ABI_VERSION)=): | $(top_builddir)lib
+ $(ldso:.$(ABI_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
+ $(call link.so,$(ldso_FULL_NAME),$(ABI_VERSION))
+- # link for backward compatibility
+- (cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME).so.0 )
+-ifeq ($(CONFIG_MIPS_NAN_2008),y)
+- (cd $(top_builddir)lib; ln -sf $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) $(UCLIBC_LDSO_NAME)-mipsn8.so.0)
+-endif
+
+ $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
+ $(Q)$(RM) $@
diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.18.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.18.ebuild
new file mode 100644
index 000000000000..8635e4093844
--- /dev/null
+++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.18.ebuild
@@ -0,0 +1,400 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic multilib savedconfig toolchain-funcs versionator
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://uclibc-ng.org/git/uclibc-ng"
+ inherit git-r3
+ MY_P=uclibc-ng-${PV}
+else
+ MY_P=uClibc-ng-${PV}
+fi
+
+DESCRIPTION="C library for developing embedded Linux systems"
+HOMEPAGE="http://www.uclibc-ng.org/"
+if [[ ${PV} != "9999" ]] ; then
+ PATCH_VER=""
+ SRC_URI="http://downloads.uclibc-ng.org/releases/${PV}/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug hardened iconv ipv6 rpc crosscompile_opts_headers-only"
+RESTRICT="strip"
+
+# 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage
+# will delete the ld.so sym link prematurely and break the system. So we
+# will hard block and give manual migration instructions.
+# 2) Currently uclibc and uclibc-ng's iconv are in bad shape. We've been using
+# the breakout library. The disadvantage here is that we have to sprinkle
+# LDFAGS=-liconv on build systems that need to link against libiconv.
+RDEPEND="
+ !!sys-libs/uclibc
+ iconv? ( dev-libs/libiconv )"
+
+S=${WORKDIR}/${MY_P}
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CHOST} == ${CTARGET} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+
+alt_build_kprefix() {
+ if [[ ${CBUILD} == ${CHOST} && ${CHOST} == ${CTARGET} ]] ; then
+ echo /usr/include
+ else
+ echo /usr/${CTARGET}/usr/include
+ fi
+}
+
+just_headers() {
+ use crosscompile_opts_headers-only && is_crosscompile
+}
+
+uclibc_endian() {
+ # XXX: this wont work for a toolchain which is bi-endian, but we
+ # dont have any such thing at the moment, so not a big deal
+ touch "${T}"/endian.s
+ $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+ case $(file "${T}"/endian.o) in
+ *" MSB "*) echo "BIG";;
+ *" LSB "*) echo "LITTLE";;
+ *) echo "NFC";;
+ esac
+ rm -f "${T}"/endian.{s,o}
+}
+
+kconfig_q_opt() {
+ local flag=$1; shift
+ case ${flag} in
+ y|n) ;;
+ *) flag=$(usex ${flag} y n) ;;
+ esac
+
+ local var="defs_${flag}"
+ eval "${var}+=( $* )"
+}
+
+get_opt() {
+ (
+ unset ${1}
+ . ${2:-"${S}"/.config}
+ echo ${!1}
+ )
+}
+
+make_oldconfig() {
+ yes "" 2>/dev/null | emake -s oldconfig >/dev/null
+}
+
+make_config() {
+ restore_config .config
+ if [ -f .config ]; then
+ make_oldconfig
+ return 0
+ else
+ ewarn "Could not locate user configfile, so we will save a default one"
+ fi
+
+ emake ARCH=$1 defconfig >/dev/null
+
+ local defs_{y,n}
+
+ # These are forced off
+ defs_n=(
+ DOASSERTS
+ DODEBUG_PT
+ HAS_NO_THREADS
+ PROPOLICE_BLOCK_ABRT
+ SSP_QUICK_CANARY
+ SUPPORT_LD_DEBUG_EARLY
+ UCLIBC_HAS_CTYPE_UNSAFE
+ UCLIBC_HAS_LOCALE
+ UCLIBC_HAS_SSP_COMPAT
+ )
+
+ # These are forced on
+ defs_y=(
+ COMPAT_ATEXIT
+ DO_C99_MATH
+ DO_XSI_MATH
+ FORCE_SHAREABLE_TEXT_SEGMENTS
+ LDSO_GNU_HASH_SUPPORT
+ LDSO_PRELINK_SUPPORT
+ LDSO_PRELOAD_FILE_SUPPORT
+ LDSO_RUNPATH_OF_EXECUTABLE
+ LDSO_STANDALONE_SUPPORT
+ MALLOC_GLIBC_COMPAT
+ PROPOLICE_BLOCK_SEGV
+ PTHREADS_DEBUG_SUPPORT
+ UCLIBC_HAS_ARC4RANDOM
+ UCLIBC_HAS_BACKTRACE
+ UCLIBC_HAS_BSD_RES_CLOSE
+ UCLIBC_HAS_CONTEXT_FUNCS
+ UCLIBC_HAS_CTYPE_CHECKED
+ UCLIBC_HAS_EXTRA_COMPAT_RES_STATE
+ UCLIBC_HAS_FENV
+ UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE
+ UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE
+ UCLIBC_HAS_FOPEN_LARGEFILE_MODE
+ UCLIBC_HAS_FTS
+ UCLIBC_HAS_FTW
+ UCLIBC_HAS_GETPT
+ UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
+ UCLIBC_HAS_GLIBC_CUSTOM_STREAMS
+ UCLIBC_HAS_GNU_GLOB
+ UCLIBC_HAS_HEXADECIMAL_FLOATS
+ UCLIBC_HAS_LIBNSL_STUB
+ UCLIBC_HAS_LIBRESOLV_STUB
+ UCLIBC_HAS_LIBUTIL
+ UCLIBC_HAS_NFTW
+ UCLIBC_HAS_OBSOLETE_BSD_SIGNAL
+ UCLIBC_HAS_OBSTACK
+ UCLIBC_HAS_PRINTF_M_SPEC
+ UCLIBC_HAS_PROGRAM_INVOCATION_NAME
+ UCLIBC_HAS_RESOLVER_SUPPORT
+ UCLIBC_HAS_SHA256_CRYPT_IMPL
+ UCLIBC_HAS_SHA512_CRYPT_IMPL
+ UCLIBC_HAS_SSP
+ UCLIBC_HAS_STUBS
+ UCLIBC_HAS_SYS_ERRLIST
+ UCLIBC_HAS_SYS_SIGLIST
+ UCLIBC_HAS_THREADS_NATIVE
+ UCLIBC_HAS_TZ_FILE_READ_MANY
+ UCLIBC_HAS_UTMP
+ UCLIBC_HAS_UTMPX
+ UCLIBC_HAS_WCHAR
+ UCLIBC_HAS_WORDEXP
+ UCLIBC_NTP_LEGACY
+ UCLIBC_SUPPORT_AI_ADDRCONFIG
+ UCLIBC_SUSV2_LEGACY
+ UCLIBC_SUSV3_LEGACY
+ UCLIBC_SUSV3_LEGACY_MACROS
+ UCLIBC_SUSV4_LEGACY
+ UCLIBC_USE_NETLINK
+ )
+
+ sed -i -e '/ARCH_.*_ENDIAN/d' .config
+ kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
+
+ kconfig_q_opt debug DODEBUG
+ kconfig_q_opt debug SUPPORT_LD_DEBUG
+ kconfig_q_opt debug UCLIBC_HAS_PROFILING
+
+ kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
+
+ kconfig_q_opt rpc UCLIBC_HAS_RPC
+ kconfig_q_opt rpc UCLIBC_HAS_FULL_RPC
+ kconfig_q_opt rpc UCLIBC_HAS_REENTRANT_RPC
+
+ kconfig_q_opt hardened UCLIBC_BUILD_NOEXECSTACK
+ kconfig_q_opt hardened UCLIBC_BUILD_NOW
+ kconfig_q_opt hardened UCLIBC_BUILD_PIE
+ kconfig_q_opt hardened UCLIBC_BUILD_RELRO
+ kconfig_q_opt hardened UCLIBC_BUILD_SSP
+
+ local count def
+ for count in 1 2 ; do
+ # Run twice as some config opts depend on others being enabled first.
+ for def in ${defs_y[@]} ; do
+ sed -i -e "s|.*\<${def}\>.*set|${def}=y|g" .config
+ done
+ for def in ${defs_n[@]} ; do
+ sed -i -e "s|${def}=y|# ${def} is not set|g" .config
+ done
+ make_oldconfig
+ done
+
+ einfo "Enabled options:"
+ for def in ${defs_y[@]} ; do
+ einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
+ done
+ einfo "Disabled options:"
+ for def in ${defs_n[@]} ; do
+ einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
+ done
+
+ # setup build and run paths
+ sed -i \
+ -e "/^CROSS_COMPILER_PREFIX/s|=.*|=\"${CTARGET}-\"|" \
+ -e "/^KERNEL_HEADERS/s|=.*|=\"$(alt_build_kprefix)\"|" \
+ -e "/^SHARED_LIB_LOADER_PREFIX/s|=.*|=\"/$(get_libdir)\"|" \
+ -e "/^DEVEL_PREFIX/s|=.*|=\"/usr\"|" \
+ -e "/^RUNTIME_PREFIX/s|=.*|=\"/\"|" \
+ -e "/^UCLIBC_EXTRA_CFLAGS/s|=.*|=\"${UCLIBC_EXTRA_CFLAGS}\"|" \
+ .config || die
+
+ make_oldconfig
+}
+
+pkg_setup() {
+ # Make sure our CHOST is a uclibc toolchain for native compiling
+ if [[ ${CHOST} == ${CTARGET} ]]; then
+ case ${CHOST} in
+ *-uclinux*|*-uclibc*) ;;
+ *) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
+ esac
+ fi
+
+ # uClibc-ng doesn't carry old Linux threads, and since we force
+ # threading our only choice is NPTL which requires i486 and later.
+ [[ ${CTARGET} == i386* ]] && die "i386 can't support Native Posix Threads (NPTL)."
+}
+
+src_prepare() {
+ local version subversion extraversion
+
+ # uclibc-ng tries to create a two sym link with ld.so,
+ # ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so
+ # where MAJOR_VERSION != 0 indicates the ABI verison.
+ # We want to get rid of this and just have ABI = 0.
+ eapply "${FILESDIR}"/uclibc-compat-r1.patch
+
+ # We need to change the major.minor.sublevel of uclibc-ng.
+ # Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
+ # If we really want the ABI bump, we'll have to hack the gcc
+ # spec file and change the '*link:' rule.
+ version=( $(get_version_components) )
+ if [[ -z ${version[1]} ]]; then
+ subversion=0
+ extraversion=0
+ else
+ subversion=${version[1]}
+ if [[ -z ${version[2]} ]]; then
+ extraversion=0
+ else
+ extraversion=.${version[2]}
+ fi
+ fi
+
+ sed -i \
+ -e "/^MAJOR_VERSION/s|:=.*|:= 0|" \
+ -e "/^MINOR_VERSION/s|:=.*|:= ${version[0]}|" \
+ -e "/^SUBLEVEL/s|:=.*|:= ${subversion}|" \
+ -e "/^EXTRAVERSION/s|:=.*|:= ${extraversion}|" \
+ Rules.mak || die
+
+ eapply_user
+}
+
+src_configure() {
+ # Map our toolchain arch name to the name expected by uClibc-ng.
+ local target=$(tc-arch)
+ case ${target} in
+ amd64) target="x86_64";;
+ arm) target="arm";;
+ mips) target="mips";;
+ ppc) target="powerpc";;
+ x86) target="i386";;
+ esac
+
+ # Do arch specific configuration by changing the defaults in
+ # extra/Configs/Config.. If these are not overridden
+ # by an save .config, they will be selected by default.
+
+ # For i386, i486, i586 and i686
+ local cpu
+ if [[ ${target} == "i386" ]]; then
+ [[ ${CTARGET} == i[456]86* ]] && cpu="${CTARGET:1:1}86"
+ sed -i -e "s|default CONFIG_686|default CONFIG_${cpu:-486}|" \
+ extra/Configs/Config.i386 || die
+ fi
+
+ # For arm
+ if [[ ${target} == "arm" ]]; then
+ sed -i -e '/Build for EABI/a \\tdefault y' extra/Configs/Config.arm
+ fi
+
+ # We set HOSTCC to the proper tuple rather than just 'gcc'
+ sed -i -e "s|^HOSTCC.*=.*|HOSTCC=$(tc-getBUILD_CC)|" Rules.mak
+
+ make_config ${target}
+
+ einfo
+ einfo "Runtime Prefix: /"
+ einfo "Devel Prefix: /usr"
+ einfo "Kernel Prefix: $(alt_build_kprefix)"
+ einfo "CBUILD: ${CBUILD}"
+ einfo "CHOST: ${CHOST}"
+ einfo "CTARGET: ${CTARGET}"
+ einfo "ABI: ${ABI}"
+ einfo "ENDIAN: $(uclibc_endian)"
+ einfo
+}
+
+src_compile() {
+ emake headers
+ just_headers && return 0
+
+ emake
+ if is_crosscompile ; then
+ emake -C utils hostutils
+ else
+ emake utils
+ fi
+}
+
+src_test() {
+ is_crosscompile && return 0
+
+ # assert test fails on pax/grsec enabled kernels
+ # normal vfork test fails in sandbox (both glibc/uclibc)
+ emake UCLIBC_ONLY=1 check
+}
+
+src_install() {
+ local sysroot=${D}
+ is_crosscompile && sysroot+="/usr/${CTARGET}"
+
+ local target="install"
+ just_headers && target="install_headers"
+ emake DESTDIR="${sysroot}" ${target}
+
+ save_config .config
+
+ # remove files coming from kernel-headers
+ rm -rf "${sysroot}"/usr/include/{linux,asm*}
+
+ # Make sure we install the sys-include symlink so that when
+ # we build a 2nd stage cross-compiler, gcc finds the target
+ # system headers correctly. See gcc/doc/gccinstall.info
+ if is_crosscompile ; then
+ dosym usr/include /usr/${CTARGET}/sys-include
+ if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig
+ newbin utils/ldd.host ${CTARGET}-ldd
+ fi
+ return 0
+ fi
+
+ emake DESTDIR="${D}" install_utils
+ dobin extra/scripts/getent
+ dodoc README docs/*.txt
+}
+
+pkg_postinst() {
+ is_crosscompile && return 0
+
+ if [ ! -e "${ROOT}"/etc/TZ ] ; then
+ ewarn "Please remember to set your timezone in /etc/TZ"
+ mkdir -p "${ROOT}"/etc
+ echo "UTC" > "${ROOT}"/etc/TZ
+ fi
+ [ "${ROOT}" != "/" ] && return 0
+ # update cache before reloading init
+ ldconfig
+ # reload init ...
+ /sbin/telinit U 2>/dev/null
+}
diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
index 2d3a09948faf..8635e4093844 100644
--- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
+++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild
@@ -260,7 +260,7 @@ src_prepare() {
# ld-uClibc.so.{0,MAJOR_VERSION} -> ld-uClibc-.so
# where MAJOR_VERSION != 0 indicates the ABI verison.
# We want to get rid of this and just have ABI = 0.
- eapply "${FILESDIR}"/uclibc-compat.patch
+ eapply "${FILESDIR}"/uclibc-compat-r1.patch
# We need to change the major.minor.sublevel of uclibc-ng.
# Upstream sets MAJOR_VERSION = 1 which breaks runtime linking.
diff --git a/sys-power/cpuspeedy/Manifest b/sys-power/cpuspeedy/Manifest
deleted file mode 100644
index 90071ea5626e..000000000000
--- a/sys-power/cpuspeedy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpuspeedy-0.4.1.tar.gz 17174 SHA256 5e9ff675b7895e2fa7186ec54c154dcdef7ca1153cf1fe5ef0df10fecb5846b0 SHA512 9abf4e0708cef2f3e65c809afe10fa4e2b88f5ccad2c22cf3a0e8682d80c7ffcd0edb8d38684d1ed4d9c239a1801c0c09fe0811e69b1c4f9a98b46cdb6efefb6 WHIRLPOOL 3d931ebf58e3499c54035016cb5040409375d098fa3c5990a74574b93bc0c0ba391337e178af863c9ac15e9da1fd8bd95668f13aacbdd34bce9aa8b666eaaee6
diff --git a/sys-power/cpuspeedy/cpuspeedy-0.4.1.ebuild b/sys-power/cpuspeedy/cpuspeedy-0.4.1.ebuild
deleted file mode 100644
index ea031526267c..000000000000
--- a/sys-power/cpuspeedy/cpuspeedy-0.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-PYTHON_DEPEND="2"
-inherit python
-
-DESCRIPTION="A simple and easy to use program to control the speed and the voltage of CPUs on the fly"
-HOMEPAGE="http://cpuspeedy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cpuspeedy/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- rm -f Makefile || die
- python_convert_shebangs -r $(python_get_version) .
-}
-
-src_install() {
- exeinto "$(python_get_sitedir)"/${PN}
- doexe src/*.py || die
-
- dodoc AUTHORS ChangeLog README || die
- doman doc/*.1 || die
-
- dosym "$(python_get_sitedir)"/${PN}/${PN}.py /usr/sbin/${PN} || die
-}
-
-pkg_postinst() {
- python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup ${PN}
-}
diff --git a/sys-power/cpuspeedy/metadata.xml b/sys-power/cpuspeedy/metadata.xml
deleted file mode 100644
index 8359880446b1..000000000000
--- a/sys-power/cpuspeedy/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-Cpuspeedy is a simple tool written in Python which allows you to change the clock speed and voltage of the CPUs
-using the Linux's CPUFreq driver
-(copyied off ref url)
-
-
- cpuspeedy
-
-
diff --git a/www-apache/mod_anonymize_ip/Manifest b/www-apache/mod_anonymize_ip/Manifest
deleted file mode 100644
index e495ef146fb3..000000000000
--- a/www-apache/mod_anonymize_ip/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_anonymize_ip-0.3.1.tar.gz 4049 SHA256 5ff3cf2098e2ea8f4e9028d028c03bcb876e7eb096ced7c21b281710a26f953d SHA512 43b108d6cb802fb5108d39a9b801d79ef5bf5e02ba0a07f4cd7030c96b74ec323b858b0239107153c9a64e22c061c2ffc9a9f7a3d9a2c03d0f6faa27789f1c6d WHIRLPOOL 259790426ee01dd3ecee7cf2e8901ae40abfa637b0138c0dfa3d03134f43bed575116885ae500eb598c76159ab305ad87d63e7b6cfb0a740c8c96ca2363f2b35
diff --git a/www-apache/mod_anonymize_ip/files/20_mod_anonymize_ip.conf b/www-apache/mod_anonymize_ip/files/20_mod_anonymize_ip.conf
deleted file mode 100644
index 258716ad73b2..000000000000
--- a/www-apache/mod_anonymize_ip/files/20_mod_anonymize_ip.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-LoadModule anonymize_ip_module modules/mod_anonymize_ip.so
-AnonymizeIP 8
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_anonymize_ip/metadata.xml b/www-apache/mod_anonymize_ip/metadata.xml
deleted file mode 100644
index fbd882a9f677..000000000000
--- a/www-apache/mod_anonymize_ip/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- hollow/mod_anonymize_ip
-
-
diff --git a/www-apache/mod_anonymize_ip/mod_anonymize_ip-0.3.1.ebuild b/www-apache/mod_anonymize_ip/mod_anonymize_ip-0.3.1.ebuild
deleted file mode 100644
index 9b834a40b290..000000000000
--- a/www-apache/mod_anonymize_ip/mod_anonymize_ip-0.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit apache-module
-
-GITHUB_AUTHOR="hollow"
-GITHUB_PROJECT="mod_anonymize_ip"
-GITHUB_COMMIT="c0d31d0"
-
-DESCRIPTION="mod_anonymize_ip is a simple module for anonymizing the client IP address"
-HOMEPAGE="https://github.com/hollow/mod_anonymize_ip"
-SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="20_${PN}"
-APACHE2_MOD_DEFINE="ANONYMIZE_IP"
-
-need_apache2_2
-
-S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
diff --git a/www-apache/mod_auth_cookie_mysql2/Manifest b/www-apache/mod_auth_cookie_mysql2/Manifest
deleted file mode 100644
index 4e3da3798222..000000000000
--- a/www-apache/mod_auth_cookie_mysql2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_auth_cookie_mysql2_1.0.tar.gz 7406 SHA256 85601beea7a6de0ba8ef466027e6783cebef05c4687dc50460d2fdb06f5babe4 SHA512 66ccffdcbae640c396305506ee588c86ffc937422ac36fc68af1e7977210b4c8a3e8090125facd8acf37667c720853774096d564e02d4ad186d14f714998e5b7 WHIRLPOOL 5ede56d86a10d8cfdf1dd5714c0cb9ea3cdc9c08f99f09575eb95ffb5e9d90b8e6e586d839b252510608376cb67197e000abdc4b2410def81e13b5449d7eeda9
diff --git a/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf b/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf
deleted file mode 100644
index 6bb94fa3e742..000000000000
--- a/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-
-LoadModule auth_cookie_mysql2_module modules/mod_auth_cookie_sql2.so
-
-# MOD_AUTH_COOKIE_MYSQL Configuration section.
-# For more information look at the configuration section at
-# http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/#configuration
-
-# The MOD_AUTH_COOKIE_MYSQL2 directives must be inside of a
-# block to work correctly!
-#
- # CookieAuth: Activates this module.
- # REQUIRED: Yes
- # Options: on|off
- #CookieAuth
-
- # CookieAuth_DBhost: Hostname or IP of the host where MySQL is running on.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_DBhost
-
- # CookieAuth_DBName: Name of the MySQL database.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_DBName
-
- # CookieAuth_DBTable: Table name in database.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_DBTable
-
- # CookieAuth_DBUser: MySQL username with permissions to database and table.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_DBUser
-
- # CookieAuth_DBPassword: password for user in CookieAuth_DBUser.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_DBPassword
-
- # CookieAuth_UsernameField: Field in MySQL table where username of session is stored.
- # This username is displayed as the "Remote Username" variable "REMOTE_USER" in Apache.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_UsernameField
-
- # CookieAuth_SessnameField: Field in MySQL table where session name is stored. This is
- # the name of the cookie!
- # REQUIRED: Yes
- # Options:
- #CookieAuth_SessnameField
-
- # CookieAuth_SessvalField: Field in MySQL table where session value (this is the value
- # which is compared with the cookie value) is stored.
- # REQUIRED: Yes
- # Options:
- #CookieAuth_SessvalField
-
- # Cookie_Auth_CookieName: If this option is set, only the cookie with this name is searched.
- # If it is not set, this module will search all cookies the browser sends and checks the name
- # against the values in the field set with CookieAuth_SessvalField.
- # REQUIRED: No
- # Options:
- #CookieAuth_CookieName
-
- # Cookie_Auth_ExpiryField: When this option is set, the current time of the webserver is
- # compared against this field in the database. This value is in the format of a Unix
- # timestamp (time in seconds since 01-01-1970)
- # REQUIRED: No
- # Options:
- #CookieAuth_ExpiryField
-
- # CookieAuth_RemoteIPField: When this option is set, the remote address of the connected
- # client is checked against this field. Only when the remote IP and the stored IP are
- # equal will the client be able to authorize.
- # REQUIRED: No
- # Options:
- #CookieAuth_RemoteIPField
-
- # CookieAuth_FailureURL: Normally, when the authorization fails the client gets an
- # "AUTHORIZATION REQUIRED" message from the webserver. With this option set you can
- # redirect the client to another URL.
- #
- # WARNING: This is a normal redirect for the browser. If you want an internal
- # redirect where the browser doesn't see the URL it's been redirected to
- # you should use the ErrorDocument directive. Example:
- # "ErrorDocument 401 /some_error.html"
- #
- # REQUIRED: No
- # Options:
- #CookieAuth_FailureURL
-#
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_cookie_mysql2/metadata.xml b/www-apache/mod_auth_cookie_mysql2/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_auth_cookie_mysql2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-1.0.ebuild b/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-1.0.ebuild
deleted file mode 100644
index 3f857ec4c30f..000000000000
--- a/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-DESCRIPTION="An Apache2 backend authentication module that uses cookies and MySQL"
-HOMEPAGE="http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/"
-SRC_URI="http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/mysql"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/-/_}"
-
-APXS2_ARGS="-DMODULE_NAME=mod_auth_cookie_mysql2 -DMODULE_NAME_module=auth_cookie_mysql2_module
- -I/usr/include/mysql -lmysqlclient -lz -c mod_auth_cookie_sql2.c mod_auth_cookie_sql2_mysql.c"
-APACHE2_MOD_FILE="${S}/.libs/mod_auth_cookie_sql2.so"
-APACHE2_MOD_CONF="55_${PN}"
-APACHE2_MOD_DEFINE="AUTH_COOKIE_MYSQL2"
-
-DOCFILES="README"
-
-need_apache2_2
diff --git a/www-apache/mod_auth_imap2/Manifest b/www-apache/mod_auth_imap2/Manifest
deleted file mode 100644
index ffb9f08e64b8..000000000000
--- a/www-apache/mod_auth_imap2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_auth_imap2-2.2.0.tar.gz 12787 SHA256 9642a13932010b9587d7b2263f21bed29602253bac18cb6c8847385d13d3cce0 SHA512 bfd547bc08b62a7a3ace3a634e5d0ae7ff2c27448c4732e1ee0f9a1b9cdafbdc366dfe3e1eb4edc8cfc37ee6211f8d68b1bbc33278015531519a46249c83c40d WHIRLPOOL 2a39b1720f099a0128dae9e1d80832facabd668baa2f880443bbd67e5d6545fa086122d3e068c85bffd20ba1326d23f9a53652dcbd1d9d8127fe54be2e5be94a
diff --git a/www-apache/mod_auth_imap2/files/10_mod_auth_imap.conf b/www-apache/mod_auth_imap2/files/10_mod_auth_imap.conf
deleted file mode 100644
index c82bf9e04518..000000000000
--- a/www-apache/mod_auth_imap2/files/10_mod_auth_imap.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-
-LoadModule auth_imap_module modules/mod_auth_imap.so
-
-
- # For Apache 2.2 the mod_auth_basic module is now set to
- # be authoritative, and must be disabled if other modules
- # are used for authentication.
- #AuthBasicAuthoritative Off
-
- # Turn on IMAP Authentication
- #Auth_IMAP_Enabled on
-
- # Give a name to the authentication domain, whatever you want:
- #AuthName "something.com"
-
- # Only basic authentication is supported for now:
- #AuthType Basic
-
- # If you feel like it, restrict the users or allow all "valid-user"
- #Require user user1 user2
-
- # Make IMAP Authentication authoritative for this .htaccess file:
- #Auth_IMAP_Authoritative on
-
- # Set the IMAP Server to which you want to connect (default=localhost):
- #Auth_IMAP_Server imap.something.com
-
- # Set the port on which the imap server is running (default=143):
- #Auth_IMAP_Port 143
-
- # Turn on some extra logging (login attempts, etc.) in Apache's Error Log
- #Auth_IMAP_Log on
-
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_imap2/metadata.xml b/www-apache/mod_auth_imap2/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_auth_imap2/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_auth_imap2/mod_auth_imap2-2.2.0.ebuild b/www-apache/mod_auth_imap2/mod_auth_imap2-2.2.0.ebuild
deleted file mode 100644
index aa36c707af83..000000000000
--- a/www-apache/mod_auth_imap2/mod_auth_imap2-2.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-MY_PN="${PN/imap2/imap}"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="An Apache2 module to provide authentication via an IMAP Mail server"
-HOMEPAGE="http://ben.brillat.net/projects/mod_auth_imap/"
-SRC_URI="http://ben.brillat.net/files/projects/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APXS2_ARGS="-c ${MY_PN}.c"
-
-APACHE2_MOD_CONF="10_${MY_PN}"
-APACHE2_MOD_DEFINE="AUTH_IMAP"
-APACHE2_MOD_FILE=".libs/${MY_PN}.so"
-
-DOCFILES="CHANGELOG README examples/*"
-
-need_apache2
diff --git a/www-apache/mod_auth_mysql/Manifest b/www-apache/mod_auth_mysql/Manifest
deleted file mode 100644
index 279999df809e..000000000000
--- a/www-apache/mod_auth_mysql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_auth_mysql-3.0.0.tar.gz 19257 SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4 SHA512 99e71b0df27966b1540be325c2e124e3f09e40b39afbc6757b539309358b9a52dbeae21f16429348db014f136a19b06859e82af7c5bb5130c6cb923138b79fc9 WHIRLPOOL 60538b9fa9d1e6baea874ad5b1fac0ec12e39dd11e465e197275177b6ea01c974baa1ba8d2ede688cf57ee155e80dfd909292b08b9751b372df1616818eabe89
diff --git a/www-apache/mod_auth_mysql/files/12_mod_auth_mysql.conf b/www-apache/mod_auth_mysql/files/12_mod_auth_mysql.conf
deleted file mode 100644
index f33ced4bdda0..000000000000
--- a/www-apache/mod_auth_mysql/files/12_mod_auth_mysql.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-
-LoadModule mysql_auth_module modules/mod_auth_mysql.so
-
-# mod_auth_mysql can be used to limit access to documents by checking
-# data in a MySQL database.
-
-# This will enable user-based MySQL authentication of everything
-# within /home/httpd. You'll need to do the following as the MySQL
-# root user beforehand:
-#
-# CREATE DATABASE auth;
-# USE auth;
-# CREATE TABLE users (
-# user_name CHAR(30) NOT NULL,
-# user_passwd CHAR(20) NOT NULL,
-# PRIMARY KEY (user_name)
-# );
-# GRANT SELECT
-# ON auth.users
-# TO authuser@localhost
-# IDENTIFIED BY 'PaSsW0Rd';
-#
-# INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'));
-#
-#
-# # If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-# # the following line:
-# #AuthBasicAuthoritative Off
-# AuthName "MySQL authenticated zone"
-# AuthType Basic
-#
-# AuthMySQLUser authuser
-# AuthMySQLPassword PaSsW0Rd
-# AuthMySQLDB auth
-# AuthMySQLUserTable users
-# AuthMySQLNameField user_name
-# AuthMySQLPasswordField user_passwd
-#
-# require valid-user
-#
-
-# This will enable group-based MySQL authentication of everything
-# within /home/httpd. You'll need to do the following as the MySQL
-# root user beforehand:
-#
-# CREATE DATABASE auth;
-# USE auth;
-# CREATE TABLE users (
-# user_name CHAR(30) NOT NULL,
-# user_passwd CHAR(20) NOT NULL,
-# user_group CHAR(20) NOT NULL,
-# PRIMARY KEY (user_name)
-# );
-# GRANT SELECT
-# ON auth.users
-# TO authuser@localhost
-# IDENTIFIED BY 'PaSsW0Rd';
-#
-# INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'), 'user');
-# INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'), 'admin');
-#
-#
-# # If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-# # the following line:
-# #AuthBasicAuthoritative Off
-# AuthName "MySQL group authenticated zone"
-# AuthType Basic
-#
-# AuthMySQLUser authuser
-# AuthMySQLPassword PaSsW0Rd
-# AuthMySQLDB auth
-# AuthMySQLUserTable users
-# AuthMySQLNameField user_name
-# AuthMySQLPasswordField user_passwd
-# AuthMySQLGroupField user_group
-#
-# require group admin
-#
-
-# Like the above this enables group-based MySQL authentication of
-# everything within /home/httpd, but this configuration allows users to
-# belong to more than one group. You'll need to do the following as
-# the MySQL root user beforehand:
-#
-# CREATE DATABASE auth;
-# USE auth;
-# CREATE TABLE users (
-# user_name CHAR(30) NOT NULL,
-# user_passwd CHAR(20) NOT NULL,
-# PRIMARY KEY (user_name)
-# );
-# CREATE TABLE groups (
-# user_name CHAR(30) NOT NULL,
-# user_group CHAR(20) NOT NULL,
-# PRIMARY KEY (user_name, user_group)
-# );
-# GRANT SELECT
-# ON auth.users
-# TO authuser@localhost
-# IDENTIFIED BY 'PaSsW0Rd';
-# GRANT SELECT
-# ON auth.groups
-# TO authuser@localhost
-# IDENTIFIED BY 'PaSsW0Rd';
-#
-# INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'));
-# INSERT INTO groups VALUES ('testuser', 'user');
-# INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'));
-# INSERT INTO groups VALUES ('testadmin', 'admin');
-# INSERT INTO groups VALUES ('testadmin', 'user');
-#
-#
-# # If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-# # the following line:
-# #AuthBasicAuthoritative Off
-# AuthName "MySQL group authenticated zone"
-# AuthType Basic
-#
-# AuthMySQLUser authuser
-# AuthMySQLPassword PaSsW0Rd
-# AuthMySQLDB auth
-# AuthMySQLUserTable users
-# AuthMySQLNameField user_name
-# AuthMySQLPasswordField user_passwd
-# AuthMySQLGroupTable groups
-# AuthMySQLGroupField user_group
-#
-# require group user
-#
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch b/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch
deleted file mode 100644
index 30881f878d23..000000000000
--- a/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Index: mod_auth_mysql-3.0.0/mod_auth_mysql.c
-===================================================================
---- mod_auth_mysql-3.0.0.orig/mod_auth_mysql.c
-+++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
-@@ -206,7 +206,7 @@
- #define SNPRINTF apr_snprintf
- #define PSTRDUP apr_pstrdup
- #define PSTRNDUP apr_pstrndup
-- #define STRCAT ap_pstrcat
-+ #define STRCAT apr_pstrcat
- #define POOL apr_pool_t
- #include "http_request.h" /* for ap_hook_(check_user_id | auth_checker)*/
- #include "ap_compat.h"
-@@ -237,7 +237,7 @@
- #define SNPRINTF ap_snprintf
- #define PSTRDUP ap_pstrdup
- #define PSTRNDUP ap_pstrndup
-- #define STRCAT ap_pstrcat
-+ #define STRCAT apr_pstrcat
- #define POOL pool
- #include
- #include "ap_sha1.h"
-@@ -589,87 +589,87 @@ static void * create_mysql_auth_dir_conf
- static
- command_rec mysql_auth_cmds[] = {
- AP_INIT_TAKE1("AuthMySQLHost", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlhost),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlhost),
- OR_AUTHCFG, "mysql server host name"),
-
- AP_INIT_TAKE1("AuthMySQLPort", ap_set_int_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlport),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlport),
- OR_AUTHCFG, "mysql server port number"),
-
- AP_INIT_TAKE1("AuthMySQLSocket", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlsocket),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlsocket),
- OR_AUTHCFG, "mysql server socket path"),
-
- AP_INIT_TAKE1("AuthMySQLUser", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqluser),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqluser),
- OR_AUTHCFG, "mysql server user name"),
-
- AP_INIT_TAKE1("AuthMySQLPassword", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlpasswd),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlpasswd),
- OR_AUTHCFG, "mysql server user password"),
-
- AP_INIT_TAKE1("AuthMySQLDB", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlDB),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlDB),
- OR_AUTHCFG, "mysql database name"),
-
- AP_INIT_TAKE1("AuthMySQLUserTable", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlpwtable),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlpwtable),
- OR_AUTHCFG, "mysql user table name"),
-
- AP_INIT_TAKE1("AuthMySQLGroupTable", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlgrptable),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlgrptable),
- OR_AUTHCFG, "mysql group table name"),
-
- AP_INIT_TAKE1("AuthMySQLNameField", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlNameField),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlNameField),
- OR_AUTHCFG, "mysql User ID field name within User table"),
-
- AP_INIT_TAKE1("AuthMySQLGroupField", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupField),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupField),
- OR_AUTHCFG, "mysql Group field name within table"),
-
- AP_INIT_TAKE1("AuthMySQLGroupUserNameField", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupUserNameField),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupUserNameField),
- OR_AUTHCFG, "mysql User ID field name within Group table"),
-
- AP_INIT_TAKE1("AuthMySQLPasswordField", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlPasswordField),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlPasswordField),
- OR_AUTHCFG, "mysql Password field name within table"),
-
- AP_INIT_TAKE1("AuthMySQLPwEncryption", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlEncryptionField),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlEncryptionField),
- OR_AUTHCFG, "mysql password encryption method"),
-
- AP_INIT_TAKE1("AuthMySQLSaltField", ap_set_string_slot,
-- (void*) APR_XtOffsetOf(mysql_auth_config_rec, mysqlSaltField),
-+ (void*) APR_OFFSETOF(mysql_auth_config_rec, mysqlSaltField),
- OR_AUTHCFG, "mysql salfe field name within table"),
-
- /* AP_INIT_FLAG("AuthMySQLKeepAlive", ap_set_flag_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlKeepAlive),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlKeepAlive),
- OR_AUTHCFG, "mysql connection kept open across requests if On"),
- */
- AP_INIT_FLAG("AuthMySQLAuthoritative", ap_set_flag_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlAuthoritative),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlAuthoritative),
- OR_AUTHCFG, "mysql lookup is authoritative if On"),
-
- AP_INIT_FLAG("AuthMySQLNoPasswd", ap_set_flag_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlNoPasswd),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlNoPasswd),
- OR_AUTHCFG, "If On, only check if user exists; ignore password"),
-
- AP_INIT_FLAG("AuthMySQLEnable", ap_set_flag_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlEnable),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlEnable),
- OR_AUTHCFG, "enable mysql authorization"),
-
- AP_INIT_TAKE1("AuthMySQLUserCondition", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlUserCondition),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlUserCondition),
- OR_AUTHCFG, "condition to add to user where-clause"),
-
- AP_INIT_TAKE1("AuthMySQLGroupCondition", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupCondition),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupCondition),
- OR_AUTHCFG, "condition to add to group where-clause"),
-
- AP_INIT_TAKE1("AuthMySQLCharacterSet", ap_set_string_slot,
-- (void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlCharacterSet),
-+ (void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlCharacterSet),
- OR_AUTHCFG, "mysql character set to be used"),
-
- { NULL }
diff --git a/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch b/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch
deleted file mode 100644
index e7f6eb31ef3f..000000000000
--- a/www-apache/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: mod_auth_mysql-3.0.0/mod_auth_mysql.c
-===================================================================
---- mod_auth_mysql-3.0.0.orig/mod_auth_mysql.c
-+++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
-@@ -288,6 +288,7 @@ static short pw_crypted(POOL * pool, con
- static short pw_aes(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
- #endif
- static short pw_sha1(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
-+static short pw_apr(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
- static short pw_plain(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
-
- static char * format_remote_host(request_rec * r, char ** parm);
-@@ -318,7 +319,8 @@ static encryption encryptions[] = {{"cry
- #if _AES
- {"aes", SALT_REQUIRED, pw_aes},
- #endif
-- {"sha1", NO_SALT, pw_sha1}};
-+ {"sha1", NO_SALT, pw_sha1},
-+ {"apr", NO_SALT, pw_apr}};
- typedef struct { /* User formatting patterns */
- char pattern; /* Pattern to match */
- char * (*func)(request_rec * r, char ** parm);
-@@ -856,6 +858,12 @@ static short pw_sha1(POOL * pool, const
- return strcasecmp(bin2hex(pool, scrambled_sent_pw, enc_len), real_pw) == 0;
- }
-
-+/* checks passwords from htpasswd */
-+static short pw_apr(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
-+ /* apr_password_validate will do the job */
-+ return apr_password_validate(sent_pw, real_pw) == APR_SUCCESS;
-+}
-+
- /* checks plain text passwords */
- static short pw_plain(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
- return strcmp(real_pw, sent_pw) == 0;
diff --git a/www-apache/mod_auth_mysql/metadata.xml b/www-apache/mod_auth_mysql/metadata.xml
deleted file mode 100644
index c247b24b6daf..000000000000
--- a/www-apache/mod_auth_mysql/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- mysql-bugs@gentoo.org
- MySQL
-
-
- modauthmysql
-
-
diff --git a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r3.ebuild b/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r3.ebuild
deleted file mode 100644
index f6772bc9fc68..000000000000
--- a/www-apache/mod_auth_mysql/mod_auth_mysql-3.0.0-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit apache-module eutils multilib
-
-DESCRIPTION="Basic authentication for Apache using a MySQL database"
-HOMEPAGE="http://modauthmysql.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/mysql
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- !www-apache/mod-auth-mysql"
-
-APXS2_ARGS="-c -I/usr/include/mysql -L/usr/$(get_libdir)/mysql -Wl,-R/usr/$(get_libdir)/mysql -lmysqlclient_r -lm -lz ${PN}.c"
-APACHE2_MOD_CONF="12_${PN}"
-APACHE2_MOD_DEFINE="AUTH_MYSQL"
-
-DOCFILES="README CONFIGURE"
-
-need_apache2_2
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-apache-2.2.patch"
- epatch "${FILESDIR}/${P}-htpasswd2-auth-style.patch"
-}
diff --git a/www-apache/mod_auth_nufw/Manifest b/www-apache/mod_auth_nufw/Manifest
deleted file mode 100644
index 92df414c9454..000000000000
--- a/www-apache/mod_auth_nufw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_auth_nufw-2.2.2.tar.bz2 35865 SHA256 10a779a7cd6eb1ad6f40ec385e2f58e65f280a6c91916c5616ec3fbac8ab9d13 SHA512 14516497b71bc706c163ecda334887d5dab46e62689074f9e658b76fa01da97751e47b8e561b234ef2067cee7820bbdfbc00838046e1e8f861af3b7de46cc101 WHIRLPOOL 0b692827b3e9a5964704335887a48544ff1189342e8524bf4c1ecd97ba770cabd54a2a6f13a995659b1eaface7509d5c9b76f9cbed9d5282fca550c4acf16fac
diff --git a/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf b/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf
deleted file mode 100644
index 6897d3b6b5ac..000000000000
--- a/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-LoadModule mod_auth_nufw modules/mod_auth_nufw.so
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_nufw/metadata.xml b/www-apache/mod_auth_nufw/metadata.xml
deleted file mode 100644
index 9ca007bf8d85..000000000000
--- a/www-apache/mod_auth_nufw/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
- A NuFW authentication module for apache
-
diff --git a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild
deleted file mode 100644
index fb244268225d..000000000000
--- a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools confutils apache-module
-
-DESCRIPTION="A NuFW authentication module for Apache"
-HOMEPAGE="http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw"
-SRC_URI="http://software.inl.fr/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql[server] )"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_FILE="mod_auth_nufw.so"
-APACHE2_MOD_CONF="50_${PN}"
-APACHE2_MOD_DEFINE="AUTH_NUFW"
-
-DOCFILES="doc/mod_auth_nufw.html"
-
-need_apache2_2
-
-pkg_setup() {
- confutils_require_one mysql postgres
-}
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- CPPFLAGS="-I$(/usr/bin/apr-1-config --includedir) ${CPPFLAGS}" \
- econf \
- --with-apache22 \
- $(use_with mysql) \
- || die "econf failed"
-}
-
-src_compile() {
- emake || die "emake failed"
-}
diff --git a/www-apache/mod_auth_token/Manifest b/www-apache/mod_auth_token/Manifest
deleted file mode 100644
index 987da8c92325..000000000000
--- a/www-apache/mod_auth_token/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_auth_token-1.0.6-beta.tar.gz 555111 SHA256 10888bde6aa42cfce34a593eabe7f582dcabe6fca814e2496c06fdf444334ee9 SHA512 d6d30902bab7f1a589ec9383e64c1d3aa869df906c26d8c9fc5efe25b3fed15ed6481345332fc46082bbcc8e09fa13237a5ec7ee8a1649667b0c73f0585658c4 WHIRLPOOL a734c7c59275f4bd69b7291ffcb11a6fce505fd10ac5f2c8fce7e0315558965d32cb603266015358a523658b99ac5b9f6e7ebb2549f111de6bf2f11c7d96af0a
diff --git a/www-apache/mod_auth_token/files/75_mod_auth_token.conf b/www-apache/mod_auth_token/files/75_mod_auth_token.conf
deleted file mode 100644
index 3962fc66a708..000000000000
--- a/www-apache/mod_auth_token/files/75_mod_auth_token.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- LoadModule auth_token_module modules/mod_auth_token.so
-
- # The token is an hex-encoded MD5 hash of the secret password, relative file
- # path and the timestamp. It is encoded onto the URI as:
- # /
- #AuthTokenSecret "secret"
- #AuthTokenPrefix /protected/
- #AuthTokenTimeout 60
- #AuthTokenLimitByIp off
- #
-
- # Example:
- # /protected/dee0ed6174a894113d5e8f6c98f0e92b/43eaf9c5/path/to/file.txt
- # maps to
- # /protected/path/to/file.txt
-
-
-
-# vim: ts=4 filetype=apache
\ No newline at end of file
diff --git a/www-apache/mod_auth_token/files/mod_auth_token-1.0.6_beta-ap_pstrcat.patch b/www-apache/mod_auth_token/files/mod_auth_token-1.0.6_beta-ap_pstrcat.patch
deleted file mode 100644
index 54a00e072fa4..000000000000
--- a/www-apache/mod_auth_token/files/mod_auth_token-1.0.6_beta-ap_pstrcat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mod_auth_token/mod_auth_token.c
-===================================================================
---- mod_auth_token.orig/mod_auth_token.c
-+++ mod_auth_token/mod_auth_token.c
-@@ -64,7 +64,7 @@ static const char *auth_token_set_prefix
- auth_token_config_rec *conf = (auth_token_config_rec*)config;
-
- if (arg[len - 1] != '/') {
-- ap_set_string_slot(cmd, config, apr_pstrcat(cmd->pool, arg, '/'));
-+ ap_set_string_slot(cmd, config, apr_pstrcat(cmd->pool, arg, "/", NULL));
- conf->prefix_len = len + 1;
- }
- else {
diff --git a/www-apache/mod_auth_token/metadata.xml b/www-apache/mod_auth_token/metadata.xml
deleted file mode 100644
index 040dfc913736..000000000000
--- a/www-apache/mod_auth_token/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- pavel.stratil-jun@fenix.cz
- Proxied co-maintainer assign bugs to him
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- mod-auth-token
-
-
diff --git a/www-apache/mod_auth_token/mod_auth_token-1.0.6_beta.ebuild b/www-apache/mod_auth_token/mod_auth_token-1.0.6_beta.ebuild
deleted file mode 100644
index cf9132258bdd..000000000000
--- a/www-apache/mod_auth_token/mod_auth_token-1.0.6_beta.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit apache-module eutils
-
-MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="Token based URI access module for Apache2"
-HOMEPAGE="https://code.google.com/p/mod-auth-token/"
-SRC_URI="https://mod-auth-token.googlecode.com/files/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="75_${PN}"
-APACHE2_MOD_DEFINE="AUTH_TOKEN"
-
-need_apache2_2
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ap_pstrcat.patch
-}
-
-src_compile() {
- local flag=
- APXS2_ARGS=
-
- for flag in ${CFLAGS}; do
- APXS2_ARGS+=" -Wc,${flag}"
- done
-
- for flag in ${LDFLAGS}; do
- APXS2_ARGS+=" -Wl,${flag}"
- done
-
- APXS2_ARGS="${APXS2_ARGS} -c ${PN}.c"
- apache-module_src_compile
-}
diff --git a/www-apache/mod_cband/Manifest b/www-apache/mod_cband/Manifest
deleted file mode 100644
index 3f96e5e5ec52..000000000000
--- a/www-apache/mod_cband/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod-cband-0.9.7.5.tgz 70713 SHA256 6fd9024354153cc52538c81986afc18c1ff9395523bbe096f1810903fa7528ab SHA512 71b6b9946c24a7f424746c8f9add721ed1a14681b97a3d41115fbc228b83dba7068089f48d8acc41b108117f4abe3f0b55a77af0faefd0c84975e7003607714a WHIRLPOOL 4494e07f0b27f34932df45f2790335548af34c77caae5074e626f45c29feb0d1214deb9b34dfea62c756f9e6d92dd88211216beb673af3e1cd17c42f1e06e10b
diff --git a/www-apache/mod_cband/files/10_mod_cband.conf b/www-apache/mod_cband/files/10_mod_cband.conf
deleted file mode 100644
index 7f038889c62f..000000000000
--- a/www-apache/mod_cband/files/10_mod_cband.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file only loads mod_cband and enables /cband-status page.
-# For examples please consult the vhosts.conf.example.gz,
-# vhosts2.conf.example.gz and vhosts3.conf.example.gz files installed in
-# /usr/share/doc/mod_cband-*/
-
-
-LoadModule cband_module modules/mod_cband.so
-
-
- SetHandler cband-status
-
-
-# Some defaults:
-#CBandDefaultExceededURL http://www.google.com
-#CBandScoreFlushPeriod 100
-
-# And in virtual host configuration to limit it's speed:
-#
-# DocumentRoot /var/www/example.com/htdocs
-# ServerName www.example.com
-#
-# CBandLimit 600M
-# CBandExceededURL http://www.example.com/ex1.html
-# CBandScoreboard /var/run/mod_cband.example.com.scoreboard
-# CBandPeriod 200S
-#
-# # 100kb/s, 10 request/s, max 5 connections
-# CBandSpeed 100kb 10 5
-#
-# # 10kb/s, 3 request/s -> speed limit for any remote client, max 5 connections
-# CBandRemoteSpeed 10kb/s 3 5
-#
-#
-
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_cband/metadata.xml b/www-apache/mod_cband/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_cband/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild b/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild
deleted file mode 100644
index 357254d05413..000000000000
--- a/www-apache/mod_cband/mod_cband-0.9.7.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Apache2 bandwidth quota and throttling module"
-HOMEPAGE="http://codee.pl/cband.html"
-SRC_URI="http://cband.linux.pl/download/mod-cband-${PV}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/mod-cband-${PV}"
-
-DOCFILES="conf/vhosts3.conf.example \
- conf/vhosts2.conf.example \
- conf/vhosts.conf.example \
- Changes AUTHORS doc/*"
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="CBAND"
-
-APXS2_ARGS="-DDST_CLASS=3 -c ${PN}.c"
-
-need_apache2_2
diff --git a/www-apache/mod_fastcgi/Manifest b/www-apache/mod_fastcgi/Manifest
deleted file mode 100644
index 27d71ff29c38..000000000000
--- a/www-apache/mod_fastcgi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_fastcgi-SNAP-0910052141.tar.gz 103255 SHA256 e6564ae206284806c781834e9e89aa4b0a4dd647b45c6da5cc389c65a984bdc7 SHA512 4ab909bb26104542d44490a30f2a77f71c7f4345902f00e06424f03bbf81858a72a713580ee6081088e6d5154f702a155d25b675111371c087c122ef6d181d95 WHIRLPOOL d576eda007ce0ae598501877abbe34e407d2335d3feedd096b930a8cd7da65107efb906bd5fa75cafc30d9c2bb7bbe7a09bfaa27d40d6812b4db02514276dfd0
diff --git a/www-apache/mod_fastcgi/files/20_mod_fastcgi.conf b/www-apache/mod_fastcgi/files/20_mod_fastcgi.conf
deleted file mode 100644
index 583524b568ae..000000000000
--- a/www-apache/mod_fastcgi/files/20_mod_fastcgi.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-LoadModule fastcgi_module modules/mod_fastcgi.so
-AddHandler fastcgi-script fcg fcgi fpl
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_fastcgi/files/mod_fastcgi-compile-against-apache2.4.patch b/www-apache/mod_fastcgi/files/mod_fastcgi-compile-against-apache2.4.patch
deleted file mode 100644
index 417c03ef83b1..000000000000
--- a/www-apache/mod_fastcgi/files/mod_fastcgi-compile-against-apache2.4.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: libapache-mod-fastcgi/fcgi.h
-===================================================================
---- libapache-mod-fastcgi.orig/fcgi.h 2012-03-07 14:29:04.005720240 +0100
-+++ libapache-mod-fastcgi/fcgi.h 2012-03-07 14:29:07.830566657 +0100
-@@ -34,6 +34,10 @@
- #define APACHE2
- #endif
-
-+#ifdef AP_DECLARE_MODULE
-+#define APACHE24
-+#endif
-+
- #ifdef APACHE2
-
- #include
-@@ -57,10 +61,16 @@
- #define XtOffsetOf APR_OFFSETOF
- #define ap_select select
-
-+#ifdef APACHE24
-+#define unixd_config ap_unixd_config
-+#endif
-+
-+#ifdef APACHE2
- #define ap_user_id unixd_config.user_id
- #define ap_group_id unixd_config.group_id
- #define ap_user_name unixd_config.user_name
- #define ap_suexec_enabled unixd_config.suexec_enabled
-+#endif
-
- #ifndef S_ISDIR
- #define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR))
-@@ -365,42 +375,42 @@
- #ifdef APACHE2
-
- #ifdef WIN32
--#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
--#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
-+#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
- #else /* !WIN32 */
--#define FCGI_LOG_EMERG __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_ALERT __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_CRIT __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_ERR __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_WARN __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_NOTICE __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_INFO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_DEBUG __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
--#endif
--
--#define FCGI_LOG_EMERG_ERRNO __FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_ALERT_ERRNO __FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_CRIT_ERRNO __FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_ERR_ERRNO __FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_WARN_ERRNO __FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_NOTICE_ERRNO __FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_INFO_ERRNO __FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
--#define FCGI_LOG_DEBUG_ERRNO __FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
--
--#define FCGI_LOG_EMERG_NOERRNO __FILE__,__LINE__,APLOG_EMERG,0
--#define FCGI_LOG_ALERT_NOERRNO __FILE__,__LINE__,APLOG_ALERT,0
--#define FCGI_LOG_CRIT_NOERRNO __FILE__,__LINE__,APLOG_CRIT,0
--#define FCGI_LOG_ERR_NOERRNO __FILE__,__LINE__,APLOG_ERR,0
--#define FCGI_LOG_WARN_NOERRNO __FILE__,__LINE__,APLOG_WARNING,0
--#define FCGI_LOG_NOTICE_NOERRNO __FILE__,__LINE__,APLOG_NOTICE,0
--#define FCGI_LOG_INFO_NOERRNO __FILE__,__LINE__,APLOG_INFO,0
--#define FCGI_LOG_DEBUG_NOERRNO __FILE__,__LINE__,APLOG_DEBUG,0
-+#define FCGI_LOG_EMERG APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_ALERT APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_CRIT APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_ERR APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_WARN APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_NOTICE APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_INFO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_DEBUG APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
-+#endif
-+
-+#define FCGI_LOG_EMERG_ERRNO APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_ALERT_ERRNO APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_CRIT_ERRNO APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_ERR_ERRNO APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_WARN_ERRNO APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_NOTICE_ERRNO APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_INFO_ERRNO APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(errno)
-+#define FCGI_LOG_DEBUG_ERRNO APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
-+
-+#define FCGI_LOG_EMERG_NOERRNO APLOG_MARK,APLOG_EMERG,0
-+#define FCGI_LOG_ALERT_NOERRNO APLOG_MARK,APLOG_ALERT,0
-+#define FCGI_LOG_CRIT_NOERRNO APLOG_MARK,APLOG_CRIT,0
-+#define FCGI_LOG_ERR_NOERRNO APLOG_MARK,APLOG_ERR,0
-+#define FCGI_LOG_WARN_NOERRNO APLOG_MARK,APLOG_WARNING,0
-+#define FCGI_LOG_NOTICE_NOERRNO APLOG_MARK,APLOG_NOTICE,0
-+#define FCGI_LOG_INFO_NOERRNO APLOG_MARK,APLOG_INFO,0
-+#define FCGI_LOG_DEBUG_NOERRNO APLOG_MARK,APLOG_DEBUG,0
-
- #else /* !APACHE2 */
-
-Index: libapache-mod-fastcgi/mod_fastcgi.c
-===================================================================
---- libapache-mod-fastcgi.orig/mod_fastcgi.c 2012-03-07 14:29:04.017047773 +0100
-+++ libapache-mod-fastcgi/mod_fastcgi.c 2012-03-07 14:29:07.841272721 +0100
-@@ -97,6 +97,10 @@
- } while (0)
- #endif
-
-+#ifdef APACHE24
-+module AP_MODULE_DECLARE_DATA fastcgi_module;
-+#endif
-+
- /*
- * Global variables
- */
-@@ -3014,7 +3018,11 @@
- ap_hook_fixups(fixups, NULL, NULL, APR_HOOK_MIDDLE);
- }
-
-+#ifdef APACHE24
-+AP_DECLARE_MODULE(fastcgi) =
-+#else
- module AP_MODULE_DECLARE_DATA fastcgi_module =
-+#endif
- {
- STANDARD20_MODULE_STUFF,
- fcgi_config_create_dir_config, /* per-directory config creator */
diff --git a/www-apache/mod_fastcgi/metadata.xml b/www-apache/mod_fastcgi/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/www-apache/mod_fastcgi/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141-r1.ebuild b/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141-r1.ebuild
deleted file mode 100644
index d5996fdca329..000000000000
--- a/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit apache-module eutils
-
-MY_P="${PN}-SNAP-${PV/2.4.7_pre/}"
-DESCRIPTION="FastCGI is a open extension to CGI without the limitations of server specific APIs"
-HOMEPAGE="http://fastcgi.com/"
-SRC_URI="http://www.fastcgi.com/dist/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="mod_fastcgi"
-IUSE=""
-
-APXS2_ARGS="-c mod_fastcgi.c fcgi*.c"
-APACHE2_MOD_CONF="20_${PN}"
-APACHE2_MOD_DEFINE="FASTCGI"
-
-DOCFILES="CHANGES README docs/LICENSE.TERMS docs/mod_fastcgi.html"
-
-S="${WORKDIR}/${MY_P}"
-
-need_apache2
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-compile-against-apache2.4.patch"
-}
diff --git a/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141.ebuild b/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141.ebuild
deleted file mode 100644
index d65fe5fa09a2..000000000000
--- a/www-apache/mod_fastcgi/mod_fastcgi-2.4.7_pre0910052141.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-MY_P="${PN}-SNAP-${PV/2.4.7_pre/}"
-
-DESCRIPTION="FastCGI is a open extension to CGI without the limitations of server specific APIs"
-HOMEPAGE="http://fastcgi.com/"
-SRC_URI="http://www.fastcgi.com/dist/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="mod_fastcgi"
-IUSE=""
-
-APXS2_ARGS="-c mod_fastcgi.c fcgi*.c"
-APACHE2_MOD_CONF="20_${PN}"
-APACHE2_MOD_DEFINE="FASTCGI"
-
-DOCFILES="CHANGES README docs/LICENSE.TERMS docs/mod_fastcgi.html"
-
-S="${WORKDIR}/${MY_P}"
-
-need_apache2_2
diff --git a/www-apache/mod_ftpd/Manifest b/www-apache/mod_ftpd/Manifest
deleted file mode 100644
index e1bc0b357b17..000000000000
--- a/www-apache/mod_ftpd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_ftpd-0.14.tar.bz2 330410 SHA256 f36d3b65a5a200fca0c58e453246635e0f8e94c7f870d2b2f1946fa4a8b06d09 SHA512 0273fc3ada34556b1d0483f5f16d5ba119d373d99b597a46d7a8314c19cc4581b224cf43ffc99fd2a420dfc4656b7c9244c320105bc75744c5ff167306c28e56 WHIRLPOOL dd565df65794349cf989ac4d7a68fb5214e77fe10ee5459b585ca93e409a6a930e7e2f8994e4b92e9898cb0d013a71ab9031ea1d1e7c5b7cda10f790cec7476a
diff --git a/www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf b/www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf
deleted file mode 100644
index ab6b39e8ee2a..000000000000
--- a/www-apache/mod_ftpd/files/0.14-r1/45_mod_ftpd.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-
-LoadModule ftpd_module modules/mod_ftpd.so
-
-# Load any of the provider modules here (for user specific chroots)
-#LoadModule ftpd_dbm_module modules/mod_ftpd_dbm.so
-#LoadModule ftpd_dbi_module modules/mod_ftpd_dbi.so
-LoadModule ftpd_default_module modules/mod_ftpd_default.so
-#LoadModule ftpd_fail_module modules/mod_ftpd_fail.so
-
-Listen 21
-
- DocumentRoot /home/ftp
- FtpProtocol On
- FtpShowRealPermissions Off
- FtpAllowActive On
- FtpPasvMinPort 1024
- FtpPasvMaxPort 65535
- FtpLimitOrder default
- FtpDefaultMaxLogins 100
-
-
- Anonymous_NoUserID Off
- Anonymous_MustGiveEmail Off
- Anonymous_VerifyEmail Off
- Anonymous_LogEmail Off
- Anonymous anonymous
- AuthName ftp
- AuthType Basic
- Require valid-user
- Order allow,deny
- Allow from all
-
-
- # only allow changing, retrieving files, and listing on the site
-
-
- Deny from all
-
-
-
- # allow making directories, listing, chdir, and uploading files.
- # But don't allow retrieving files.
-
-
- Deny from all
-
-
-
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_ftpd/metadata.xml b/www-apache/mod_ftpd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_ftpd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild b/www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild
deleted file mode 100644
index c4453c5ea902..000000000000
--- a/www-apache/mod_ftpd/mod_ftpd-0.14-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit apache-module
-
-DESCRIPTION="Apache2 module which provides an FTP server"
-HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_ftpd/"
-SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbi gdbm"
-
-DEPEND="dbi? ( dev-db/libdbi )
- gdbm? ( sys-libs/gdbm )"
-RDEPEND="${DEPEND}"
-
-APACHE2_EXECFILES="providers/*/.libs/*.so"
-APACHE2_MOD_CONF="0.14-r1/45_${PN}"
-APACHE2_MOD_DEFINE="FTPD"
-
-DOCFILES="docs/manual.html AUTHORS ChangeLog NOTICE README TODO"
-
-need_apache2_2
-
-src_prepare() {
- sed -i -e 's/-Wc,-Werror//' Makefile.in providers/*/Makefile.in
-}
-
-src_configure() {
- local providers="default fail"
-
- use dbi && providers="dbi ${providers}"
- use gdbm && providers="dbm ${providers}"
-
- econf \
- --with-apxs=${APXS} \
- --enable-providers="${providers}" \
- || die "econf failed"
- }
-
-src_compile() {
- emake || die "emake failed"
-}
diff --git a/www-apache/mod_layout/Manifest b/www-apache/mod_layout/Manifest
deleted file mode 100644
index 58dc3346f5f4..000000000000
--- a/www-apache/mod_layout/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_layout-5.1.tar.gz 12798 SHA256 d00299e3aae38704096477377d20a5c5bcc32fe7802044358a79a31248cd23c6 SHA512 c4a9273da116a1c21356bbd3c8abd6b6ff82604fb5b5a01fd72e41ef8cc77427ad12d395436af894f4b10a227025d1dd45f68150ae6bad073d60820ac6753014 WHIRLPOOL b9966f313c134b6a498793bb2cc8a6a93ab7f604ad62ebee1d23821195265e7c97715172f5481e1ca204790bb112272f8b410a861b54b8f7838523862823ad8f
diff --git a/www-apache/mod_layout/files/15_mod_layout.conf b/www-apache/mod_layout/files/15_mod_layout.conf
deleted file mode 100644
index 5e652ae1cab1..000000000000
--- a/www-apache/mod_layout/files/15_mod_layout.conf
+++ /dev/null
@@ -1,148 +0,0 @@
-
-LoadModule layout_module modules/mod_layout.so
-
-
-# This default configuration adds a footer to every html page in ~user
-# "Powered by Gentoo Linux"
-
-# Enable the filter for all text/html pages
-# use LayoutHandler for Apache1 and AddOutputFilter for Apache2
-#LayoutHandler text/html
-#AddOutputFilterByType LAYOUT text/html
-
-# This directives makes sure that all Layout headers and footers
-# get Cache-Control: no-cache methods in all situations. This
-# directive either takes On or Off."
-# LayoutCacheNeeded
-
-# A URI which prints the header contents.
-# LayoutHeader
-
-# A URI which prints the footer contents.
-LayoutFooter "Powered by Gentoo Linux
"
-
-# Add a layout to be inserted when a tag is found, this takes two
-# options, with a third optional parameter. The first is a pattern,
-# the second is the layout and the third is how the layout should be
-# inserts (either prepend, append, or replace). The default is to
-# replace.
-# Layout "<-- replace_me -->" "Visit: Gentoo Linux
" replace
-
-# Enter a URI that should be ignored, regular expressions are allowed.
-# LayoutIgnoreURI
-
-# Enter a URI that should be ignored by the header, regular expressions
-# are allowed.
-# LayoutIgnoreHeaderURI
-
-# Enter a URI that should be ignored by the HTTPHeader, regular
-# expressions are allowed.
-# LayoutIgnoreHTTPHeaderURI
-
-# Enter a URI that should be ignored by the footer, regular expressions
-# are allowed.
-# LayoutIgnoreFooterURI
-
-# This can either be On or Off (default it Off). It places HTML comments
-# in the outbound text describing when and where mod_layout has been
-# inserting text.
-LayoutComment On
-
-# This can either be On or Off (default it Off). This is both
-# experimental and probably quite broke.
-# LayoutProxy
-
-# This can either be On or Off (default it On). When off the original
-# document is not displayed.
-# LayoutDisplayOriginal
-
-# Turns On (default) or Off a list of standard types to handle.
-# LayoutDefaultHandlers
-
-# This takes a SSI style timme format that can be used to change the
-# output by mod_layout's internal TIME environmental variables that
-# it introduces.
-# LayoutTimeFormat
-
-# Takes a URI to call for the HTTP Header.
-# LayoutHTTPHeader
-
-# Specify handlers that mod_layout should produce HTTP headers for.
-# LayoutHTTPOverrideHandler
-
-# Specify URI's that mod_layout should produce HTTP headers for.
-# LayoutHTTPOverrideURI
-
-# This takes no arguments. If found it will turn off the footer.
-# LayoutFooterOff
-
-# This takes no arguments. If found it will turn off the header.
-# LayoutHeaderOff
-
-# This takes no arguments. If found it will turn off the http header.
-# LayoutHTTPHeaderOff
-
-# Turns on and off asynchronous POSTs (AKA everything can see the post
-# data).
-# LayoutPostAsync
-
-# This moves the default cache from /tmp to another directory(or a
-# RAM disk).
-# LayoutCache
-
-# Turning this On or Off afffects whether or not headers and footers
-# are appended when creating subsections.
-# LayoutAppend
-
-# Turning this on and off will tell mod_layout to attempt to resolve
-# content (do a merger of the footer, body and header text
-# LayoutMerge
-
-# Use this to change the default begin tag to use during merges (the
-# default string is \\
-# LayoutMergeBeginTag
-
-# Use this to change the default end tag to use during merges (the
-# default string is \<\\HTML>\
-# LayoutMergeEndTag
-
-# Use this to change the default end tag to use during merges (the
-# default string is \<\\HTML>\
-# LayoutHeaderAppend
-
-# Use this to change the default end tag to use during merges (the
-# default string is \<\\HTML>\
-# LayoutFooterAppend
-
-# When enabled (it takes on and off flags) mod_layout will not try
-# to wrap any errors. Merge must be enabled for this to work. The
-# default for this is off.
-# LayoutMergeErrorIgnore
-
-# If this tag is found during a merge, no footer or header will be
-# inserted into the document
-# LayoutIgnoreTag
-
-# If this tag is found during a merge, no footer will be inserted
-# into the document
-# LayoutIgnoreTagFooter
-
-# If this tag is found during a merge, no header will be inserted
-# into the document
-# LayoutIgnoreTagHeader
-
-# This turns on mod_layout's own text/html and text/plain handler
-# LayoutHTMLHandler
-
-# If this is enabled and you are doing a merge, the tags used for the
-# merge will be replaced.
-# LayoutReplaceTags
-
-# If you want applications to do notes (a set of directives to control
-# actions inside apache).
-# LayoutNotes
-
-
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_layout/metadata.xml b/www-apache/mod_layout/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_layout/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_layout/mod_layout-5.1.ebuild b/www-apache/mod_layout/mod_layout-5.1.ebuild
deleted file mode 100644
index d8b4a8d602ac..000000000000
--- a/www-apache/mod_layout/mod_layout-5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-DESCRIPTION="An Apache2 module for adding custom headers and/or footers"
-HOMEPAGE="http://tangent.org/index.pl?node_id=362"
-SRC_URI="http://download.tangent.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APXS2_ARGS="-c ${PN}.c utility.c layout.c"
-
-APACHE2_MOD_CONF="15_mod_layout"
-APACHE2_MOD_DEFINE="LAYOUT"
-
-DOCFILES="README"
-
-need_apache2_2
diff --git a/www-apache/mod_loadavg/Manifest b/www-apache/mod_loadavg/Manifest
deleted file mode 100644
index f6c290d03391..000000000000
--- a/www-apache/mod_loadavg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_loadavg-0.0.1.c 10516 SHA256 025df5362b49998577575b384fd20444239d9ec72843e54a918da9d6b37aba3b SHA512 83396467b7cd21d512d84621fdb17a451309e218a984e9061af5c1615e0691ca73403124c89d1c4fba5d9631c8b2855597165c1864bf707bfe898caaf845a7d7 WHIRLPOOL 4afba40c96f0c0cdb3fccc3436a2dfd3f5e0a7bde32233d2fd6b3454af0d3f9fabca00ad0e505879866fa2405471d927ca4c52e3cc0a71bda25663b036e877e7
diff --git a/www-apache/mod_loadavg/files/10_mod_loadavg.conf b/www-apache/mod_loadavg/files/10_mod_loadavg.conf
deleted file mode 100644
index 5991656cbefc..000000000000
--- a/www-apache/mod_loadavg/files/10_mod_loadavg.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-LoadModule loadavg_module modules/mod_loadavg.so
-
-# Set mod_loadavg on
-#ModLoadavg On
-
-# Set maximum value for the load average of the last minute
-# Default: 4.0
-#Loadavg1 4.0
-
-# Set maximum value for the load average of the last 5 minutes
-#Loadavg5 4.0
-
-# Set maximum value for the load average of the last 15 minutes
-#Loadavg15 4.0
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_loadavg/metadata.xml b/www-apache/mod_loadavg/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_loadavg/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_loadavg/mod_loadavg-0.0.1.ebuild b/www-apache/mod_loadavg/mod_loadavg-0.0.1.ebuild
deleted file mode 100644
index 568fe0fcde3c..000000000000
--- a/www-apache/mod_loadavg/mod_loadavg-0.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module eutils
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Apache module executing CGI-Requests depending on the load of the server"
-HOMEPAGE="http://defunced.de/"
-SRC_URI="mirror://gentoo/${P}.c"
-LICENSE="Apache-1.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="LOADAVG"
-
-need_apache2_2
-
-src_unpack() {
- mkdir -p "${S}" || die "mkdir S failed"
- cp -f "${DISTDIR}/${P}.c" "${S}/${PN}.c" || die "source copy failed"
-}
diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 3c7317343b19..f57c1e5d63bd 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,2 +1,3 @@
+DIST mod_perl-2.0.10-rc1.tar.gz 3845157 SHA256 d01da2b8b8acd9e2f4853f130f142259296310fb961bb3c55ad029b5a8d5d7af SHA512 9c99de8d553bce98786d6e99a78abdb39ecc411b82456a0cec0a667bd5d274c5978fd76ca4e9489d06e6661c64ab60b281fc8c741289777b1e0d067114a7a904 WHIRLPOOL 827f9f64524de44456a091e7fb558997e9ec8901a887d2b8d5767545cd330d4a0b18e6a6b2e00b31e36ac365d1b7c5b7aaad6aa5404a05e330f2c0ddae82497e
DIST mod_perl-2.0.10_pre201601.tar.gz 3854229 SHA256 a89c23b66b21c600b74a48125c02c91159c07b08cc07fb4f55015e8e07713697 SHA512 04e57e79031374f3ec432e950fb9f79d1202da9dfc0d86a5137b7346c18f313a4e58ecfffed51efd7e6494baec86b22a42d6712ce5f7824f9f479c05bac00659 WHIRLPOOL 5d37b067aa945cafc0cc7a1f1b27257d8409f6804f22880ae7fd6c21424bbd2c07bace483d95590d255678725f67d081741978cff24cfc91716c08294547e622
DIST mod_perl-2.0.8.tar.gz 3790026 SHA256 35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6 SHA512 d5090651699c4436fe8d0a525226543c971aa05db337dc1b1e89023183df1c7dd8b8775f3a0f7d3b9ec40e8c058ac23bd24141cf15a5fe5806226d634dfb4c87 WHIRLPOOL d22e1c353339b08ad752e9f9c7fc0ec4d6a173c4cd3004380b14098e1028737e0eb69d2f56dbe0da3cbfb01b31232c5073d7edb28bf4fed6b2ccd67b09ad7080
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
new file mode 100644
index 000000000000..578878f05d04
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch
@@ -0,0 +1,36 @@
+Tests fail because the server banner contains "Gentoo" instead of "Unix". Disable them.
+
+
+diff -ruN mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm
+--- mod_perl-2.0.10-rc1.orig/t/response/TestAPI/server_const.pm 2016-09-30 14:45:31.000000000 +0200
++++ mod_perl-2.0.10-rc1/t/response/TestAPI/server_const.pm 2016-10-01 13:18:02.359794404 +0200
+@@ -25,7 +25,7 @@
+
+ my $r = shift;
+
+- plan $r, tests => 6;
++ plan $r, tests => 4;
+
+ # test Apache2::ServerUtil constant subroutines
+
+@@ -45,13 +45,13 @@
+ ok t_cmp($server_descr, qr!\bworld domination series/2\.0\b!,
+ 'Apache2::ServerUtil::get_server_description() -- component');
+
+- # assuming ServerTokens Full (default) the banner equals description
+- ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
+- 'Apache2::ServerUtil::get_server_banner()');
+-
+- # version is just an alias for banner
+- ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
+- 'Apache2::ServerUtil::get_server_version()');
++# # assuming ServerTokens Full (default) the banner equals description
++# ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
++# 'Apache2::ServerUtil::get_server_banner()');
++
++# # version is just an alias for banner
++# ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
++# 'Apache2::ServerUtil::get_server_version()');
+
+ Apache2::Const::OK;
+ }
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
new file mode 100644
index 000000000000..e8ec5d0308da
--- /dev/null
+++ b/www-apache/mod_perl/files/mod_perl-2.0.10_rc1-bundled-Apache-Test.patch
@@ -0,0 +1,80 @@
+diff -ruN mod_perl-2.0.10-rc1.orig/Makefile.PL mod_perl-2.0.10-rc1/Makefile.PL
+--- mod_perl-2.0.10-rc1.orig/Makefile.PL 2016-09-30 14:45:23.000000000 +0200
++++ mod_perl-2.0.10-rc1/Makefile.PL 2016-10-01 00:35:17.140862642 +0200
+@@ -25,7 +25,7 @@
+
+ }
+
+-use lib qw(lib Apache-Test/lib);
++use lib qw(lib);
+
+ use Config;
+ use File::Spec::Functions;
+@@ -122,15 +122,6 @@
+
+ sub configure {
+
+- # mod_perl test suite relies on having Apache-Test bundled with
+- # the mod_perl source, since any pre-installed version may not do
+- # the right thing
+- unless (-d "Apache-Test") {
+- error "Can't find a sub-directory Apache-Test. " .
+- "Make sure that you are using a complete source distribution";
+- exit 1;
+- }
+-
+ set_modperl_version();
+
+ if ($old_modperl_version) {
+@@ -853,14 +844,9 @@
+ run_subtests ::
+ cd ModPerl-Registry && $(MAKE) test
+
+-run_subtests ::
+- cd Apache-Reload && $(MAKE) test
+-
+ EOF
+
+ $preamble .= <<'EOF' unless $build->mpm_is_threaded();
+-run_subtests ::
+- cd Apache-SizeLimit && $(MAKE) test
+
+ EOF
+
+diff -ruN mod_perl-2.0.10-rc1.orig/lib/ModPerl/BuildMM.pm mod_perl-2.0.10-rc1/lib/ModPerl/BuildMM.pm
+--- mod_perl-2.0.10-rc1.orig/lib/ModPerl/BuildMM.pm 2016-09-30 14:45:23.000000000 +0200
++++ mod_perl-2.0.10-rc1/lib/ModPerl/BuildMM.pm 2016-10-01 00:35:17.140862642 +0200
+@@ -39,12 +39,10 @@
+ ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
+ use strict 'refs';
+
+-my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";
+-
+ #to override MakeMaker MOD_INSTALL macro
+ sub mod_install {
+ q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
+- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .
++ qq{-MModPerl::BuildMM \\}."\n" .
+ q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
+ }
+
+@@ -271,7 +269,7 @@
+
+ push @target,
+ '$(FULLPERL) -I$(INST_LIB) ' .
+- "-I$apache_test_dir -MModPerl::BuildMM " .
++ "-MModPerl::BuildMM " .
+ "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
+
+ # Win32 doesn't normally install man pages
+diff -ruN mod_perl-2.0.10-rc1.orig/lib/ModPerl/Manifest.pm mod_perl-2.0.10-rc1/lib/ModPerl/Manifest.pm
+--- mod_perl-2.0.10-rc1.orig/lib/ModPerl/Manifest.pm 2016-09-30 14:45:23.000000000 +0200
++++ mod_perl-2.0.10-rc1/lib/ModPerl/Manifest.pm 2016-10-01 00:35:17.140862642 +0200
+@@ -119,7 +119,6 @@
+ t/apr-ext/perlio
+ # PAUSE breaks if a dist has more than one META.yml. the top-level
+ # META.yml already excludes Apache-Test from indexing
+-Apache-Test/META.yml
+ # exclude Apache-Test/MANIFEST since it confuses the mp2 build (e.g it
+ # wants Apache-Test/META.yml which we don't supply, see above)
+ Apache-Test/MANIFEST
diff --git a/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
new file mode 100644
index 000000000000..3de17184b961
--- /dev/null
+++ b/www-apache/mod_perl/mod_perl-2.0.10_rc1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit depend.apache apache-module perl-module eutils
+
+DESCRIPTION="An embedded Perl interpreter for Apache2"
+HOMEPAGE="https://perl.apache.org/"
+#SRC_URI="mirror://apache/perl/${P}.tar.gz"
+SRC_URI="https://dist.apache.org/repos/dist/dev/perl/mod_perl-2.0.10-rc1.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test apache2_mpms_event apache2_mpms_worker apache2_mpms_prefork"
+
+S=${WORKDIR}/${P/_rc1/-rc1}
+
+SRC_TEST=do
+
+# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
+# The minimum versions requested here are the bundled versions.
+
+# The test dependencies are from CPAN (Bundle::Apache2).
+
+# When all MPMs are disabled via useflags, the apache ebuild selects a
+# default one, which will likely need threading...
+
+RDEPEND="
+ >=dev-perl/Apache-Test-1.400.0
+ >=www-servers/apache-2.0.47
+ apache2_mpms_event? ( dev-lang/perl[ithreads] )
+ apache2_mpms_worker? ( dev-lang/perl[ithreads] )
+ !apache2_mpms_event? ( !apache2_mpms_worker? ( !apache2_mpms_prefork? ( dev-lang/perl[ithreads] ) ) )
+"
+DEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? (
+ >=dev-perl/CGI-3.110.0
+ dev-perl/Chatbot-Eliza
+ dev-perl/Devel-Symdump
+ dev-perl/HTML-Parser
+ dev-perl/IPC-Run3
+ dev-perl/libwww-perl
+ www-servers/apache[apache2_modules_version,-apache2_modules_unique_id]
+ )
+"
+PDEPEND="
+ >=dev-perl/Apache-Reload-0.130.0
+ >=dev-perl/Apache-SizeLimit-0.970.0
+"
+
+APACHE2_MOD_FILE="${S}/src/modules/perl/mod_perl.so"
+APACHE2_MOD_CONF="2.0.3/75_${PN}"
+APACHE2_MOD_DEFINE="PERL"
+
+need_apache2
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.0.1-sneak-tmpdir.patch # seems to fix the make test problem
+ "${FILESDIR}/${PN}"-2.0.4-inline.patch # 550244
+ "${FILESDIR}/${PN}"-2.0.10_rc1-bundled-Apache-Test.patch # 352724
+ "${FILESDIR}/${PN}"-2.0.10_rc1-Gentoo-not-Unix.patch
+)
+
+src_prepare() {
+ perl-module_src_prepare
+
+ # chainsaw unbundling
+ rm -rf Apache-{Test,Reload,SizeLimit}/ lib/Bundle/
+}
+
+src_configure() {
+ local debug=$(usex debug 1 0)
+ myconf=(
+ MP_USE_DSO=1
+ MP_APXS=${APXS}
+ MP_APR_CONFIG=/usr/bin/apr-1-config
+ MP_TRACE=${debug}
+ MP_DEBUG=${debug}
+ )
+
+ perl-module_src_configure
+}
+
+src_test() {
+ # make test notes whether it is running as root, and drops
+ # privileges all the way to "nobody" if so, so we must adjust
+ # write permissions accordingly in this case.
+
+ # IF YOU SUDO TO EMERGE AND HAVE !env_reset set testing will fail!
+ if [[ "$(id -u)" == "0" ]]; then
+ chown nobody:nobody "${WORKDIR}" "${T}"
+ fi
+
+ # We force verbose tests for now to get meaningful bug reports.
+ MAKEOPTS+=" -j1"
+ TMPDIR="${T}" HOME="${T}/" TEST_VERBOSE=1 perl-module_src_test
+}
+
+src_install() {
+ apache-module_src_install
+
+ default
+
+ perl_delete_localpod
+ perl_delete_packlist
+
+ insinto "${APACHE_MODULES_CONFDIR}"
+ doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl
+
+ # this is an attempt to get @INC in line with /usr/bin/perl.
+ # there is blib garbage in the mainstream one that can only be
+ # useful during internal testing, so we wait until here and then
+ # just go with a clean slate. should be much easier to see what's
+ # happening and revert if problematic.
+
+ perl_set_version
+ sed -i \
+ -e "s,-I${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+ -e "s,-typemap[[:space:]]${S}/[^[:space:]\"\']\+[[:space:]]\?,,g" \
+ -e "s,${S}\(/[^[:space:]\"\']\+\)\?,/,g" \
+ "${D}/${VENDOR_ARCH}/Apache2/BuildConfig.pm" || die
+
+ for fname in $(find "${D}" -type f -not -name '*.so'); do
+ grep -q "\(${D}\|${S}\)" "${fname}" && ewarn "QA: File contains a temporary path ${fname}"
+ sed -i -e "s:\(${D}\|${S}\):/:g" ${fname}
+ done
+
+ perl_remove_temppath
+}
+
+pkg_postinst() {
+ apache-module_pkg_postinst
+}
diff --git a/www-apache/mod_proxy_fcgi/Manifest b/www-apache/mod_proxy_fcgi/Manifest
deleted file mode 100644
index 1ba6a0f7de1d..000000000000
--- a/www-apache/mod_proxy_fcgi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_proxy_fcgi-0_p816361.tar.bz2 7900 SHA256 bfe64ad32e568df550a2df0e0e34ca261e573c8dad81bcf5c40dc9dcce3d6a4c SHA512 e9773b5a76c6820f6949944a8984b16521c635289cf08e9dc123f2390c57ff3c726d139301bcf7c1354e49ecca030341572699f3e8ec47e26e5389fa7dbcfab9 WHIRLPOOL 5f15ecde54ec2da62cfcc982165bf9d3ee85ee5d2d5894585c9df0905870f732a4d2744c3cb28d6c39b702b266f35b9b60c412f31e873e331550bd081183d7fa
diff --git a/www-apache/mod_proxy_fcgi/files/36_mod_proxy_fcgi.conf b/www-apache/mod_proxy_fcgi/files/36_mod_proxy_fcgi.conf
deleted file mode 100644
index a4634a12d375..000000000000
--- a/www-apache/mod_proxy_fcgi/files/36_mod_proxy_fcgi.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-
-LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
-
diff --git a/www-apache/mod_proxy_fcgi/metadata.xml b/www-apache/mod_proxy_fcgi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_proxy_fcgi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild b/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild
deleted file mode 100644
index bceea6de361c..000000000000
--- a/www-apache/mod_proxy_fcgi/mod_proxy_fcgi-0_p816361.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-DESCRIPTION="mod_proxy_fcgi is a FastCGI protocol handler for mod_proxy"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="https://dev.gentoo.org/~hollow/distfiles/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="36_${PN}"
-APACHE2_MOD_DEFINE="PROXY_FCGI"
-
-need_apache2_2
diff --git a/www-apache/mod_proxy_html/Manifest b/www-apache/mod_proxy_html/Manifest
deleted file mode 100644
index e447b9639d9d..000000000000
--- a/www-apache/mod_proxy_html/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_proxy_html-3.1.2.tar.bz2 23019 SHA256 a1aee758bda605e153868b91188ebf2c527b8eeb0f115d11af152078e65895bf SHA512 dc56c9abcaa3760b4ac5157ddb83d5ec29f1f60fa6c16dbadf55c81e27dadd6d25bcc0bbcd874bce8bce43d91650186201b37cd36fe50d625a051a1bd9c4a9a7 WHIRLPOOL 111fa49739002770f08446c4e7f49621b03c5ecb909559ac00165f10c720896e54dce7e97d6fa124a54d1226e08e8d4f1086c623b789b7bd60f5eb082c2934f2
diff --git a/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf b/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf
deleted file mode 100644
index 94cb19c203fc..000000000000
--- a/www-apache/mod_proxy_html/files/27_mod_proxy_html.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-
-LoadFile /usr/lib/libxml2.so
-LoadModule proxy_html_module modules/mod_proxy_html.so
-
-# All knowledge of HTML links has been removed from the mod_proxy_html
-# code itself, and is instead read from httpd.conf (or included file)
-# at server startup. So you MUST declare it. This will normally be
-# at top level, but can also be used in a .
-#
-# Here's the declaration for W3C HTML 4.01 and XHTML 1.0
-
-ProxyHTMLLinks a href
-ProxyHTMLLinks area href
-ProxyHTMLLinks link href
-ProxyHTMLLinks img src longdesc usemap
-ProxyHTMLLinks object classid codebase data usemap
-ProxyHTMLLinks q cite
-ProxyHTMLLinks blockquote cite
-ProxyHTMLLinks ins cite
-ProxyHTMLLinks del cite
-ProxyHTMLLinks form action
-ProxyHTMLLinks input src usemap
-ProxyHTMLLinks head profile
-ProxyHTMLLinks base href
-ProxyHTMLLinks script src for
-
-# To support scripting events (with ProxyHTMLExtended On),
-# you'll need to declare them too.
-
-ProxyHTMLEvents onclick ondblclick onmousedown onmouseup \
- onmouseover onmousemove onmouseout onkeypress \
- onkeydown onkeyup onfocus onblur onload \
- onunload onsubmit onreset onselect onchange
-
-# If you need to support legacy (pre-1998, aka "transitional") HTML or XHTML,
-# you'll need to uncomment the following deprecated link attributes.
-#
-# ProxyHTMLLinks frame src longdesc
-# ProxyHTMLLinks iframe src longdesc
-# ProxyHTMLLinks body background
-# ProxyHTMLLinks applet codebase
-#
-# If you're dealing with proprietary HTML variants,
-# declare your own URL attributes here as required.
-#
-# ProxyHTMLLinks myelement myattr otherattr
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_proxy_html/metadata.xml b/www-apache/mod_proxy_html/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_proxy_html/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_proxy_html/mod_proxy_html-3.1.2.ebuild b/www-apache/mod_proxy_html/mod_proxy_html-3.1.2.ebuild
deleted file mode 100644
index 42e67af65fc3..000000000000
--- a/www-apache/mod_proxy_html/mod_proxy_html-3.1.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-DESCRIPTION="An Apache2 module to rewrite links in html pages behind a reverse proxy"
-HOMEPAGE="http://apache.webthing.com/mod_proxy_html/"
-SRC_URI="http://apache.webthing.com/mod_proxy_html/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/bzip2
- dev-libs/libxml2
- >=www-apache/mod_xml2enc-1.0.3"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="27_${PN}"
-APACHE2_MOD_DEFINE="PROXY_HTML"
-
-need_apache2
-
-S="${WORKDIR}"/${PN}
-
-src_compile() {
- APXS2_ARGS="$(xml2-config --cflags) -I"${WORKDIR}/${PN}" -c ${PN}.c"
- apache-module_src_compile
-}
diff --git a/www-apache/mod_slotlimit/Manifest b/www-apache/mod_slotlimit/Manifest
deleted file mode 100644
index 3d1933246ded..000000000000
--- a/www-apache/mod_slotlimit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_slotlimit-1.3.tar.gz 17100 SHA256 ad722f5f6791ee97f361cc801d930c2106ee775d1f88efed1b5ac9fd9e538106 SHA512 3da9763831bf9869d8f9ccf68cee28b40a1e900313b223878a86d813009d8b94bb5fcd8423baf40d2feafb2beff02d352a69c2b21e6d89deb9bc404814ffa71b WHIRLPOOL 10dab747cee02ede966ce473466512edf516032fd50ea070766f160627bc9a365b9e2661eec01c9ae4c959d3e2d213e4ad891ae415faa7990d0af3fb5e53134e
diff --git a/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf b/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf
deleted file mode 100644
index 93f95fbb40b1..000000000000
--- a/www-apache/mod_slotlimit/files/10_mod_slotlimit.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-
-LoadModule slotlimit_module modules/mod_slotlimit.so
-
-# AvailableSlotsPercent
-# Syntax: AvailableSlotsPercent number
-# Default: 0
-#
-# Percentage of apache slots available in order to set any restrictions.
-# Setting it to 0 dynamic slot allocation algorithm will be deactivated.
-# When has remained free the specified percentage of apache slots, module
-# start to manage incoming connections, penalizing sites that are monopolizing
-# the resources of the server.
-#
-# N.B. Before activating this option check that the apache scoreboard display
-# correct vhost name of the running sites. In order to make this you can
-# activate (momentarily) mod_status and connect to http://yourserver/server-status.
-# If Vhost hostname do not display correctly the name of the sites visited
-# sets up to "On" the directive "ForceVhostName" before using "AvailableSlotsPercent".
-#
-# MaxConnectionsPerSite
-# Syntax: MaxConnectionsPerSite number
-# Default: No Limit
-#
-# Max connections for each running site
-#
-# N.B. Like for "AvailableSlotsPercent" if Vhost hostname do not display correctly
-# the name of the sites visited sets up to "On" the directive "ForceVhostName".
-#
-# ClientIpLimit
-# Syntax: ClientIpLimit number
-# Default: 40
-#
-# Number of maximum simultaneous connection per IP.
-#
-# ForceVhostName
-# Syntax: ForceVhostName On|Off
-# Default: Off
-#
-# Force vhost hostname in scoreboard. Vhost hostname do not match site
-# visited under some conditions, for example with some mass virtual hosting technique.
-# In order to check that this is not your case you can use mod_status.
-# Setting this directive to On, mod_slotlimit will overwrite vhost hostname
-# in apache scoreboard.
-#
-# CustomErrMsg
-# Syntax: CustomErrMsg "My custom error message"
-# Default: "Blocked by mod_slotlimit. More information about this error may be available in the server error log."
-#
-# A custom error message that allows you to replace default error message with one you create
-#
-# CustomLimitsFile
-# Syntax: CustomLimitsFile /path/to/file
-# Default: No Value
-#
-# Using this directive you can specify limits customized for each running site,
-# penalizing or privileged it. In the file should be stored (line by line) the
-# site name and the number of usable slots. You can add comments by using the '#'
-# character. The file format is as follows:
-#
-# ..
-# ..
-# www.sitename1.it 10
-# # this is a comment
-# www.site2.com 35
-# ..
-# ..
-
-# Example:
-# AvailableSlotsPercent 13
-# MaxConnectionsPerSite 20
-# ClientIpLimit 20
-# CustomLimitsFile /etc/apache2/mod_slotlimit.rules
-
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_slotlimit/metadata.xml b/www-apache/mod_slotlimit/metadata.xml
deleted file mode 100644
index ab03eb6b3726..000000000000
--- a/www-apache/mod_slotlimit/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- patrick@gentoo.org
-
-
- downloads
-
-
diff --git a/www-apache/mod_slotlimit/mod_slotlimit-1.3.ebuild b/www-apache/mod_slotlimit/mod_slotlimit-1.3.ebuild
deleted file mode 100644
index 1eecb2309a72..000000000000
--- a/www-apache/mod_slotlimit/mod_slotlimit-1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit apache-module
-
-MY_PV=${PV/_/-}
-MY_P="mod_slotlimit-${MY_PV}"
-
-DESCRIPTION="manage resources used for each running site using dynamic slot allocation algorithm and static rules"
-HOMEPAGE="http://www.lucaercoli.it/en/mod_slotlimit.html"
-SRC_URI="http://downloads.sourceforge.net/project/mod-slotlimit/mod-slotlimit/${MY_PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SLOT="0"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="10_${PN}"
-APACHE2_MOD_DEFINE="SLOTLIMIT"
-
-need_apache2_2
diff --git a/www-apache/mod_tcl/Manifest b/www-apache/mod_tcl/Manifest
deleted file mode 100644
index b801629d0ee4..000000000000
--- a/www-apache/mod_tcl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mod_tcl-1.0.1.tar.bz2 18772 SHA256 b1e5b859707d1a81e7588c35fbe1f69fefa4cada04da20048b80269ed43101dd SHA512 d32a722115079696bef6b88a295a25cc752552d0d6ceb598ba1bcbf54151fb5dbfe192f8f2e9f7f31ba2cf0ad9f09b09967b00ae03c478453a497118ecaedaff WHIRLPOOL c73916c6d6d0e36975a9ad30fee2e020da2cd5ac3b391f727025ea634eb58597c282f7f1f71d1c951646f0ae9196d9c490315d45d97843b656ef6df0dc786e43
diff --git a/www-apache/mod_tcl/files/27_mod_tcl.conf b/www-apache/mod_tcl/files/27_mod_tcl.conf
deleted file mode 100644
index 801702b37892..000000000000
--- a/www-apache/mod_tcl/files/27_mod_tcl.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LoadModule tcl_module modules/mod_tcl.so
-
-# See http://tcl.apache.org/mod_tcl/ for now :/
-
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_tcl/metadata.xml b/www-apache/mod_tcl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-apache/mod_tcl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-apache/mod_tcl/mod_tcl-1.0.1.ebuild b/www-apache/mod_tcl/mod_tcl-1.0.1.ebuild
deleted file mode 100644
index 6bbb9db3b915..000000000000
--- a/www-apache/mod_tcl/mod_tcl-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit apache-module
-
-DESCRIPTION="An Apache2 module providing an embedded Tcl interpreter"
-HOMEPAGE="http://tcl.apache.org/mod_tcl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/tcl"
-RDEPEND="${DEPEND}"
-
-APXS2_ARGS="-c -Wl,-ltcl -DHAVE_TCL_H ${PN}.c tcl_cmds.c tcl_misc.c"
-
-APACHE2_MOD_CONF="27_${PN}"
-APACHE2_MOD_DEFINE="TCL"
-
-DOCFILES="AUTHORS INSTALL NEWS README test_script.tm"
-
-need_apache2_2
-
-src_compile() {
- mv -f "tcl_core.c" "${PN}.c" || die
- apache-module_src_compile
-}
diff --git a/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild b/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
deleted file mode 100644
index 9ead2cd44886..000000000000
--- a/www-apps/389-dsgw/389-dsgw-1.1.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="389 Directory Server Gateway Web Application"
-HOMEPAGE="http://port389.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +adminserver"
-
-DEPEND="adminserver? ( net-nds/389-admin )
- dev-libs/nspr
- dev-libs/nss
- dev-libs/cyrus-sasl
- dev-libs/icu:=
- dev-libs/389-adminutil
- net-nds/openldap"
-
-RDEPEND="${DEPEND}
- dev-perl/perl-mozldap
- dev-perl/CGI"
-
-src_prepare() {
- # as per 389 documentation, when 64bit, export USE_64
- use amd64 && export USE_64=1
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable debug) \
- $(use_with adminserver) \
- --with-adminutil=/usr \
- --with-fhs \
- --with-openldap || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc README
-}
diff --git a/www-apps/389-dsgw/Manifest b/www-apps/389-dsgw/Manifest
deleted file mode 100644
index 4c94ffd733f0..000000000000
--- a/www-apps/389-dsgw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST 389-dsgw-1.1.10.tar.bz2 726295 SHA256 07aa0d9a432b8d9d63b2c64b7c17021b3fe2ac2ec62e4d596723253f3c0e4e3f SHA512 52c73867d6801c3f3bff424c9b302298e67f0b07bc5746f83aa83367b5fbff605ffcced968eaf6ab4863a17c703ec529644a4227aa2925aea65943a72ff4e2e8 WHIRLPOOL 34c7fcc8bce7f6bfcbb429b0bd26b1d8836cb8d94a4403e8be89ee9cbd3041f9f057fe1ecaf607e1630d1ae8fbc6018cfa9de794de83aa7890b4f18a158940a5
diff --git a/www-apps/389-dsgw/metadata.xml b/www-apps/389-dsgw/metadata.xml
deleted file mode 100644
index ac529ad99d50..000000000000
--- a/www-apps/389-dsgw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index f32912644c5b..edb19fa629c5 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,3 +1,3 @@
-DIST airdcpp-webui-1.2.0.tgz 11660632 SHA256 33742ef854afe7e7c8f400456c610da0de19b7339c9a084680da18a2a8aedda6 SHA512 6446524fcc86d4ddd6ed3aa1beb4128dbbd0d3347e25d5e858888cdfbbb23c7fb2c9b597ceffffd9380cfe6bbe0f43d0692105f1268c699510ce2c7ec515463e WHIRLPOOL 29ab6bcd23ad26fd03447a7e789a17ffa3720374d59da06267a3ef6082d94c8b5fafa2a2f1e8ea65059bd1a5a74d62bfb3ea35f4af6ec55e6a0ee96a2f9a546e
DIST airdcpp-webui-1.2.1.tgz 8684460 SHA256 aeb643c8309c0843c42c880ca6b580c2fd10cc377097f897288b147398729a36 SHA512 692fd728322b93c6b40b5f04842d6bf63765ec001e1248dbba0cd738451b2fd4856692db58e167d9c4889d50592db9be1513c049ab60c5bff6d0517f98a06b7f WHIRLPOOL 73138d3cb07c288f8158f193a8c62198363b5c8fcd726d8a8c15f280a4b63ecae2a125b7724abfacf5ba22ea8ab38dc2c7d8fd81502a15dbbf494433f850d12f
DIST airdcpp-webui-1.3.0.tgz 8832459 SHA256 97e30029fdb19f242eae06959aedc94b395eb16d902b9e9f87013289fc9bd1c3 SHA512 2c4bdb9144347a302f5921b7ddec97f1b40ee3dc919a0cd35bd233b5dd2c73295e8b28e7979aa5ec2efe3ac673c6e1cb51f89590b936a23ae214331c5644f403 WHIRLPOOL c6955eff3e54412321fff4415353a4a928ec857431c5f058fcb809e47cc49974e22fe63e9e9bafb7f28984cc8934081da4b3c469b05854b4d6dfee8cdcd06379
+DIST airdcpp-webui-1.3.1.tgz 8835478 SHA256 a2e8dd98470f5fa661d227a6c935de6c50a257a8c3856e903ecb3f15ade2dd9a SHA512 56fde2f208d5f95e596633acc0aca0ecb22bf56e44eb8007f301b18000e7a6affd0db4e225af78a8537f3a86f1a29c271280a59aa0e21801f4b58cb5d700d18d WHIRLPOOL bd3d1109018c488f1e92f34c0f90d1bd4f76044178a7f27553bd0a781bfb06be897ec7120afefece9ea29c379ce3c913475fcc001b7fef4ee54850110da18389
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-1.2.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-1.3.1.ebuild
similarity index 100%
rename from www-apps/airdcpp-webui/airdcpp-webui-1.2.0.ebuild
rename to www-apps/airdcpp-webui/airdcpp-webui-1.3.1.ebuild
diff --git a/www-client/links/links-2.12-r2.ebuild b/www-client/links/links-2.12-r2.ebuild
index 8307e4f22a4a..9950b970d3d5 100644
--- a/www-client/links/links-2.12-r2.ebuild
+++ b/www-client/links/links-2.12-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 directfb fbcon gpm ipv6 jpeg libressl livecd lzma ssl suid svga tiff unicode X zlib"
GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-misc/reflector/Manifest b/www-misc/reflector/Manifest
deleted file mode 100644
index 8f1ca4ecd475..000000000000
--- a/www-misc/reflector/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST reflector-2011.05.13.1.tar.gz 11490 SHA256 e02a1d8297a0dbc201f9268e2b36a9027b4103ecadf95f675b27e29b2ed5199f SHA512 979c270995b8bb026aaffaedf151827c15df0500819e03df4b5827f1bb04a870ba2e3d52faf13943c9ac89da6333e3a5aec6ec0282b4daf1a9383ab09fcf9652 WHIRLPOOL 18c876955d504f1d5ca09e4467c951b5fd5c2bb35a2a83048c47724c50b7c3892babaa54d7ce0746e3eeac957d7a07e3c15ab4155b890fe3a19b5839028a94bd
diff --git a/www-misc/reflector/metadata.xml b/www-misc/reflector/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/www-misc/reflector/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/www-misc/reflector/reflector-2011.05.13.1.ebuild b/www-misc/reflector/reflector-2011.05.13.1.ebuild
deleted file mode 100644
index cb57585798fd..000000000000
--- a/www-misc/reflector/reflector-2011.05.13.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-PYTHON_DEPEND="*:2.6"
-RESTRICT_PYTHON_ABIS="2.[45]"
-SUPPORT_PYTHON_ABIS=1
-
-inherit eutils distutils
-
-DESCRIPTION="archlinux's take on mirrorselect"
-HOMEPAGE="http://xyne.archlinux.ca/projects/reflector/"
-SRC_URI="http://xyne.archlinux.ca/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-PYTHON_MODNAME="Reflector.py"
-
-src_prepare() {
- distutils_src_prepare
-
- my_src_prepare() {
- [[ $(python_get_version --major) == 2 ]] && epatch 3to2.patch
- :
- }
-
- python_execute_function -s my_src_prepare
-
- python_convert_shebangs "" ${PN}
-}
-
-src_install() {
- distutils_src_install
-
- dobin ${PN} || die
-}
diff --git a/www-servers/webfs/Manifest b/www-servers/webfs/Manifest
deleted file mode 100644
index 1c6359059546..000000000000
--- a/www-servers/webfs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST webfs-1.21.tar.gz 44249 SHA256 98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a SHA512 68b9b3163a21be8a549e395295b27dd8ce9b575183d6c36b05b98bdc310917cf2dc653ff73bdb78a8c063674a8e9480211ec5c28b8a676f9cee41fa962cfd473 WHIRLPOOL 6d5b1d079c98d2125b6a57d56f4c8fa7693c43bc20c1c29a1ff64db9c9217c85a13f9ae784eee2505b580260d72919970fa875d93c3d31d9c0d10d6307309d9e
diff --git a/www-servers/webfs/files/webfs-1.21-CVE-2013-0347.patch b/www-servers/webfs/files/webfs-1.21-CVE-2013-0347.patch
deleted file mode 100644
index 26e225def360..000000000000
--- a/www-servers/webfs/files/webfs-1.21-CVE-2013-0347.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./webfsd.c
-+++ ./webfsd.c
-@@ -918,8 +918,11 @@
- } else {
- if (NULL == (logfh = fopen(logfile,"a")))
- xperror(LOG_WARNING,"open access log",NULL);
-- else
-+ else {
- close_on_exec(fileno(logfh));
-+ if (0 != chmod(logfile,S_IRUSR|S_IWUSR))
-+ xperror(LOG_WARNING,"chmod access log",NULL);
-+ }
- }
- }
-
diff --git a/www-servers/webfs/files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch b/www-servers/webfs/files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch
deleted file mode 100644
index 03f2f5c59816..000000000000
--- a/www-servers/webfs/files/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur webfs-1.21.orig/mk/Variables.mk webfs-1.21/mk/Variables.mk
---- webfs-1.21.orig/mk/Variables.mk 2009-02-03 01:14:18.000000000 +0100
-+++ webfs-1.21/mk/Variables.mk 2009-02-03 01:16:01.000000000 +0100
-@@ -23,7 +23,7 @@
- CXX ?= g++
- MOC ?= $(if $(QTDIR),$(QTDIR)/bin/moc,moc)
- INSTALL ?= install
--INSTALL_BINARY := $(INSTALL) -s
-+INSTALL_BINARY := $(INSTALL)
- INSTALL_SCRIPT := $(INSTALL)
- INSTALL_DATA := $(INSTALL) -m 644
- INSTALL_DIR := $(INSTALL) -d
diff --git a/www-servers/webfs/files/webfs.confd b/www-servers/webfs/files/webfs.confd
deleted file mode 100644
index 5c4de3ad9b74..000000000000
--- a/www-servers/webfs/files/webfs.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for webfsd init script
-
-WEBFS_PORT=80
-WEBFS_DOCROOT=/var/www/localhost/htdocs
-WEBFS_INDEX=index.html
-WEBFS_LOG=/var/log/webfsd.log
-
-# set server name
-#WEBFS_SERVNAME=
-
-# uncomment to chroot to specified dir
-#WEBFS_CHROOT="/var/www/localhost"
-
-# max allowed connections (defaults to 32)
-#WEBFS_MAXCONN=50
-
-# uncomment to enable directory listings
-#WEBFS_DIR_LIST=true
-
-# uncomment to enable SSL (you'll need to add -C -P to WEBFS_OPTS)
-#WEBFS_SSL=true
-
-# uncomment to enable ipv6
-#WEBFS_IPV6=true
-
-# Add any extra options here. See webfsd for more information.
-#WEBFS_OPTS=""
diff --git a/www-servers/webfs/files/webfs.initd-r1 b/www-servers/webfs/files/webfs.initd-r1
deleted file mode 100644
index bcf7b492d77f..000000000000
--- a/www-servers/webfs/files/webfs.initd-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- need net
-}
-
-start() {
- WEBFS_OPTS="-p ${WEBFS_PORT:-80} -f ${WEBFS_INDEX:-index.html} ${WEBFS_OPTS}"
- [ -n "${WEBFS_DOCROOT}" ] && WEBFS_OPTS="${WEBFS_OPTS} -r ${WEBFS_DOCROOT}"
- [ -n "${WEBFS_CHROOT}" ] && WEBFS_OPTS="${WEBFS_OPTS} -R ${WEBFS_CHROOT}"
- [ -n "${WEBFS_LOG}" ] && WEBFS_OPTS="${WEBFS_OPTS} -L ${WEBFS_LOG}"
- [ -n "${WEBFS_MAXCONN}" ] && WEBFS_OPTS="${WEBFS_OPTS} -c ${WEBFS_MAXCONN}"
- [ -n "${WEBFS_IPV6}" ] && WEBFS_OPTS="${WEBFS_OPTS} -6"
- [ -n "${WEBFS_SSL}" ] && WEBFS_OPTS="${WEBFS_OPTS} -S"
- [ -n "${WEBFS_SERVNAME}" ] && WEBFS_OPTS="${WEBFS_OPTS} -n ${WEBFS_SERVNAME}"
- [ -n "${WEBFS_DIR_LIST}" ] || WEBFS_OPTS="${WEBFS_OPTS} -j"
-
- ebegin "Starting webfsd"
- start-stop-daemon --start --quiet --exec /usr/bin/webfsd -- ${WEBFS_OPTS}
- eend $? "Failed to start webfsd"
-}
-
-stop() {
- ebegin "Stopping webfsd"
- start-stop-daemon --stop --quiet --exec /usr/bin/webfsd
- eend $? "Failed to stop webfsd"
-}
diff --git a/www-servers/webfs/metadata.xml b/www-servers/webfs/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-servers/webfs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-servers/webfs/webfs-1.21-r3.ebuild b/www-servers/webfs/webfs-1.21-r3.ebuild
deleted file mode 100644
index 3b88eaed9af2..000000000000
--- a/www-servers/webfs/webfs-1.21-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Lightweight HTTP server for static content"
-SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
-HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~arm-linux ~x86-linux"
-IUSE="ssl threads"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-
-RDEPEND="${DEPEND}
- app-misc/mime-types"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch"
- epatch "${FILESDIR}/${P}-CVE-2013-0347.patch"
- sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed"
-}
-
-src_compile() {
- local myconf
- use ssl || myconf="${myconf} USE_SSL=no"
- use threads && myconf="${myconf} USE_THREADS=yes"
-
- emake prefix="${EPREFIX}/usr" ${myconf}
-}
-
-src_install() {
- local myconf
- use ssl || myconf="${myconf} USE_SSL=no"
- use threads && myconf="${myconf} USE_THREADS=yes"
- einstall ${myconf} mandir="${ED}/usr/share/man"
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- dodoc README
-}
-
-pkg_preinst() {
- # Fix existing log permissions for bug #458892.
- chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null
-}
diff --git a/www-servers/webfs/webfs-1.21-r5.ebuild b/www-servers/webfs/webfs-1.21-r5.ebuild
deleted file mode 100644
index 2f65449135c6..000000000000
--- a/www-servers/webfs/webfs-1.21-r5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Lightweight HTTP server for static content"
-SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
-HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~arm-linux ~x86-linux"
-IUSE="libressl ssl threads"
-
-DEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )"
-
-RDEPEND="${DEPEND}
- app-misc/mime-types"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch"
- epatch "${FILESDIR}/${P}-CVE-2013-0347.patch"
- sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed"
-}
-
-src_compile() {
- local myconf
- use ssl || myconf="${myconf} USE_SSL=no"
- use threads && myconf="${myconf} USE_THREADS=yes"
-
- emake prefix="${EPREFIX}/usr" ${myconf}
-}
-
-src_install() {
- local myconf
- use ssl || myconf="${myconf} USE_SSL=no"
- use threads && myconf="${myconf} USE_THREADS=yes"
- einstall ${myconf} mandir="${ED}/usr/share/man"
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- dodoc README
-}
-
-pkg_preinst() {
- # Fix existing log permissions for bug #458892.
- chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null
-}
diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
index 6ec9b4c9f764..c3b225c85d6e 100644
--- a/x11-drivers/xf86-input-evdev/Manifest
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -1,5 +1,4 @@
-DIST xf86-input-evdev-2.10.1.tar.bz2 402063 SHA256 af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017 SHA512 7c67dcc16ce8d4b825c7dc102dab0c1b9e6a28c010a4d3c749e39ed53c55396ee8532588a36b2f22c3050743dce0930aea3e6c1f2fd90a2c8b6655035bfb939c WHIRLPOOL 9724fe55d186da01a1f43038f29d855b70f29b81cdcb2621fdf294f5135c4d74aaa8f7d0d70cb53776c1e852b0c7d2ce7881baae6963a20eb522840712165733
-DIST xf86-input-evdev-2.10.2.tar.bz2 404311 SHA256 a73a630d41ab90708d929f357e922bfbdb63d553491c5a30ab3e8fb1e35dfe1d SHA512 b6e33cfd5c6a783907f2e84e291e53cbb3d3ae8b60b8ce83d1c9d9ff01a18ab6733663b99db61e36055e77acc5646b2c3bae3ad02e0b4795391737b84660ae5f WHIRLPOOL d47ad603f19061f2d54078edd65f94635eca9ac4431d89569bb4310930204f3a5b6173e7351475559eac5b19f22e4e9811eab9a7e1682d4368d3b86cbfa90ba2
DIST xf86-input-evdev-2.10.3.tar.bz2 404476 SHA256 5aa21ba4be8df927e5676a99c7f4f0343abc089f5451b7e73e39536f29b332a2 SHA512 8c360a0298074cd86c1f513fe95035cb2729ae3604ebabb8848956614e3b70e9295bcff3fa609178f9e7aa46ff8449494a03f711426f43c9962f4839b7796a86 WHIRLPOOL 7431693915be2c74c71285fa863b1bd918f210dfb28706afddfdffa5f8c63292c41e91c39d0f1a5c0c486ee587336673e250fc0b01c6e0a29effeb9d9d69329a
+DIST xf86-input-evdev-2.10.4.tar.bz2 404465 SHA256 bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2 SHA512 36f5cb1db79d855c2237eadbf4a0758f1a53de695e7f10de828b0bd5e26b0612bea6f5db1266b8db79350b63a7ac74befe9f23a916cb48ffb614ed9d4a64a87b WHIRLPOOL daa340f0f4d27ec4a642f5c0b96ce1d6cc227d3181808297f0f9ca496b7ae4e5ddb77d70bbee40187ada0e68809c01594a435d6071b17b39e2a4913f829d6e7a
DIST xf86-input-evdev-2.9.1.tar.bz2 386505 SHA256 0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9 SHA512 0cd65a4dfc6f6c1a50814ff820019b6b2a26dd017e17e11785e37b1705c1d6adccf017781f92a5abbb2204f812a13351cc44d542ee721c9f8c0cec91b6f15975 WHIRLPOOL 9ea9e1bfb1d1d6da87ae2b742bcd3b68a0dc608f4e98297c768dbc3783bb92582f0f93fa3cc772563beab9271620f7a0cc117716b8876803b92069c8b1e01faa
DIST xf86-input-evdev-2.9.2.tar.bz2 387095 SHA256 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec SHA512 258c4c391fdd5a3c5a5bef86f55f27d47fd7527f37edd601ee76c0acc2e1830e8899cc8d7a59d646b49f3f23d93971bcc70a76185a7580942935cbf3a0d888f7 WHIRLPOOL 550e7c292960c1d04c0e650eee9825dd81ec26f4bbb3817417925857063930bad98f7bd27769f04fee736f4e7f0e7df40696bf8e0287c7355d477a7b3cc23745
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.2.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.2.ebuild
deleted file mode 100644
index d38eb2f470e1..000000000000
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit linux-info xorg-2
-
-DESCRIPTION="Generic Linux input driver"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.18[udev]
- dev-libs/libevdev
- sys-libs/mtdev"
-DEPEND="${RDEPEND}
- >=x11-proto/inputproto-2.1.99.3
- >=sys-kernel/linux-headers-2.6"
-
-pkg_pretend() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INPUT_EVDEV"
- fi
- check_extra_config
-}
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.4.ebuild
similarity index 100%
rename from x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild
rename to x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.4.ebuild
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 5123f35f6965..49ff03e8a592 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,5 +1,5 @@
DIST xf86-input-libinput-0.14.0.tar.bz2 312256 SHA256 e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265 SHA512 229b45cb9e76ca96dce4247b421135ff74054f2cbcfd019d2ceb409fdb4bc8166e3fa1d068ba6e8f6d6ac0c44ade275e31cc6a1ee6d7f6de8918eced5c59d508 WHIRLPOOL 45400e7966d730fe809043ced977dc0faa456336157dba9049558f0489463c8ade5f9a130b77ea2e85ae82e27c320e1f70780acca53fae253f930a53c0ac823b
-DIST xf86-input-libinput-0.18.0.tar.bz2 345266 SHA256 974cabbd6b658ce809b534f6410e2bbbc615f06210f9cc9e48e6d77149134a77 SHA512 68d414e31ef5bef8ec8e90c21f3863ff69f855e416fccba21ec1ac0359823c1513b0d6a2c60336e6ce6cdf5f448f999b597e12845698ae7a9b0a19de1b9c59fc WHIRLPOOL 834ed81dc3b0291f32bceb209087ad6c565b61a30b6e27535ff0b227b73bc019564c4b901bf49ff55ceeda0685c61353c331b9d9eaa6e7e8aaee2e8a2dcd08ae
DIST xf86-input-libinput-0.19.0.tar.bz2 346512 SHA256 6c5d30dc7c8b8ae34261340e1dc9cbb8ef435078e084b8ef507527a8a21af477 SHA512 8709670accad3231652350253d19d3c1e03d97c0ad593d10d6e941319ecc77f5e78e69d76a98b7ec40636f1d856f25fc72dc572be3581054dfac10e5f856e8ad WHIRLPOOL 58fc92c97a46ba575345e61f62129e036051d7ced479580eafe629c2074e0df00b75cc3210469938fe2ffea21c5042e70e7426066c99832a1ed329cadf74f5ae
DIST xf86-input-libinput-0.19.1.tar.bz2 347024 SHA256 c7f1c9406f4af2dc28b6ed3c7cb9fe9d79e9a548c0bba823fbaba20795cd010d SHA512 4aa558e931f9d59f0d0c3f758c2a0e6a57180c606f216ef7c878af2dc663b43a927a42718f2ac087ca0b254bbcde792fbaa6b787af7665c0094d091be79a0524 WHIRLPOOL 179cbd6254a7290acb8b57ecd2dabf868bd5f935579bfbfc3cf7d203edef16b548bf9252090209eb70075e2d9872e6061fb64c436bdfc01e5506b852920a8ffd
+DIST xf86-input-libinput-0.20.0.tar.bz2 355813 SHA256 c54e8155d0ba0e5abba9de7bb227c4e4930959a01a904de96b6c0e52bb2a39b0 SHA512 05fb52afc95d8268370ba3f204f7b320b487573ee6126bc457024f13ca4ce44e6f9ffd4e900141b7d9a5117d4ddf43556e470e12850870fa2c3d850173e9ce75 WHIRLPOOL da0f83cacf4595241140bb7feffd197bee451430aa10c6e9d16c5952e96af06736f78780b8bc8a12d917c0b4d5cadef99a92fb4aa39c0ba7fef7aee7a1c4f938
DIST xf86-input-libinput-0.6.0.tar.bz2 287826 SHA256 2f29be1ed7f9b9c597b6f5c6ef24c37a244a0ba87ccd1c2586ffa4d08452ad79 SHA512 536324b4bf52b6a1905655d6d82af5d12d40503e48018e10b1922bcfd18bddad742a716bcc7588188993f46f9724874456e90a70e5a764432f968a66a9d2b639 WHIRLPOOL 5d8994c86b5682d7e5ae0e53b7c8d1b13fdba304603b9ecf3c97297ab732e59111f4c902403a6d0a19492f3e34a7b9a718fbbe105591da19260a3c1f3e2c2a4b
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.20.0.ebuild
similarity index 67%
rename from x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild
rename to x11-drivers/xf86-input-libinput/xf86-input-libinput-0.20.0.ebuild
index 2d48e343fe75..096df4909708 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.18.0.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.20.0.ebuild
@@ -8,13 +8,13 @@ inherit linux-info xorg-2
DESCRIPTION="X.org input driver based on libinput"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=dev-libs/libinput-1.2.0:0="
+RDEPEND=">=dev-libs/libinput-1.5.0:0="
DEPEND="${RDEPEND}"
-DOCS=( "README.md" "conf/90-libinput.conf" )
+DOCS=( "README.md" "conf/40-libinput.conf" )
pkg_pretend() {
CONFIG_CHECK="~TIMERFD"
diff --git a/x11-libs/fxscintilla/Manifest b/x11-libs/fxscintilla/Manifest
deleted file mode 100644
index 1ab26543ac28..000000000000
--- a/x11-libs/fxscintilla/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST FXSCINTILLA-3_3_5.tar.gz 663346 SHA256 0c18565340cab72fc551c32cb284ab025903d924267e7df2060c15508e1806a8 SHA512 e7f8d0491e8fabcaaee2e39f76e7e99e83b36c1cf5201daf354c182462827f2319a69cb1bcf8a7e8c4941c0371a41c936a9a645ee91bc6b5a0a2aa64cd095c06 WHIRLPOOL 791529acd5eb931e73aa74388447f8f791edba3fbeeb682091b2ea4a1721e11a0fe154cd87625ae722713b2bcebef4927c775caa09d444cf15e341f17b3d6daf
diff --git a/x11-libs/fxscintilla/files/1.71-fox-SLOT.patch b/x11-libs/fxscintilla/files/1.71-fox-SLOT.patch
deleted file mode 100644
index 615abcee6e87..000000000000
--- a/x11-libs/fxscintilla/files/1.71-fox-SLOT.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- fxscintilla-1.71-orig/src/Makefile.am 2006-09-25 21:00:18.000000000 +0000
-+++ fxscintilla-1.71/src/Makefile.am 2006-10-24 22:13:30.000000000 +0000
-@@ -17,16 +17,20 @@
- AM_LDFLAGS = -mwindows
- endif # MinGW32
-
--lib_LTLIBRARIES = libfxscintilla.la
-+lib_LTLIBRARIES =
-
--libfxscintilla_la_SOURCES = \
-+if HAVE_FOX_1_2
-+lib_LTLIBRARIES += libfxscintilla-1.2.la
-+
-+libfxscintilla_1_2_la_SOURCES = \
- PlatFOX.cxx \
- ScintillaFOX.cxx
-
--libfxscintilla_la_LIBADD = \
-- $(top_builddir)/scintilla/src/libscintilla.la
-+libfxscintilla_1_2_la_LIBADD = \
-+ $(top_builddir)/scintilla/src/libscintilla.la \
-+ -L$(FOX_LIB_DIR) -lFOX-1.2
-
--libfxscintilla_la_LDFLAGS = \
-+libfxscintilla_1_2_la_LDFLAGS = \
- -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
-
- libfxscintilla_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
-@@ -34,16 +38,88 @@
- ## NoLexer enabled
- if NOLEXER
-
--lib_LTLIBRARIES += libfxscintillanolexer.la
-+lib_LTLIBRARIES += libfxscintillanolexer-1.2.la
-+
-+libfxscintillanolexer_1_2_la_SOURCES = \
-+ PlatFOX.cxx \
-+ ScintillaFOX.cxx
-+
-+libfxscintillanolexer_1_2_la_LIBADD = \
-+ $(top_builddir)/scintilla/src/libscintillanolexer.la \
-+ -L$(FOX_LIB_DIR) -lFOX-1.2
-+
-+libfxscintillanolexer_1_2_la_LDFLAGS = \
-+ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
-+
-+endif # NOLEXER
-+endif # HAVE_FOX_1_2
-+
-+if HAVE_FOX_1_4
-+lib_LTLIBRARIES += libfxscintilla-1.4.la
-+
-+libfxscintilla_1_4_la_SOURCES = \
-+ PlatFOX.cxx \
-+ ScintillaFOX.cxx
-+
-+libfxscintilla_1_4_la_LIBADD = \
-+ $(top_builddir)/scintilla/src/libscintilla.la \
-+ -L$(FOX_LIB_DIR) -lFOX-1.4
-+
-+libfxscintilla_1_4_la_LDFLAGS = \
-+ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
-+
-+libfxscintilla_1_4_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
-+
-+## NoLexer enabled
-+if NOLEXER
-+
-+lib_LTLIBRARIES += libfxscintillanolexer-1.4.la
-
--libfxscintillanolexer_la_SOURCES = \
-+libfxscintillanolexer_1_4_la_SOURCES = \
- PlatFOX.cxx \
- ScintillaFOX.cxx
-
--libfxscintillanolexer_la_LIBADD = $(top_builddir)/scintilla/src/libscintillanolexer.la
-+libfxscintillanolexer_1_4_la_LIBADD = \
-+ $(top_builddir)/scintilla/src/libscintillanolexer.la \
-+ -L$(FOX_LIB_DIR) -lFOX-1.4
-
--libfxscintillanolexer_la_LDFLAGS = \
-+libfxscintillanolexer_1_4_la_LDFLAGS = \
- -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
-
- endif # NOLEXER
-+endif # HAVE_FOX_1_4
-+
-+if HAVE_FOX_1_6
-+lib_LTLIBRARIES += libfxscintilla-1.6.la
-+
-+libfxscintilla_1_6_la_SOURCES = \
-+ PlatFOX.cxx \
-+ ScintillaFOX.cxx
-+
-+libfxscintilla_1_6_la_LIBADD = \
-+ $(top_builddir)/scintilla/src/libscintilla.la \
-+ -L$(FOX_LIB_DIR) -lFOX-1.6
-+
-+libfxscintilla_1_6_la_LDFLAGS = \
-+ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
-+
-+libfxscintilla_1_6_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
-+
-+## NoLexer enabled
-+if NOLEXER
-+
-+lib_LTLIBRARIES += libfxscintillanolexer-1.6.la
-+
-+libfxscintillanolexer_1_6_la_SOURCES = \
-+ PlatFOX.cxx \
-+ ScintillaFOX.cxx
-+
-+libfxscintillanolexer_1_6_la_LIBADD = \
-+ $(top_builddir)/scintilla/src/libscintillanolexer.la \
-+ -L$(FOX_LIB_DIR) -lFOX-1.6
-
-+libfxscintillanolexer_1_6_la_LDFLAGS = \
-+ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
-+
-+endif # NOLEXER
-+endif # HAVE_FOX_1_6
---- fxscintilla-1.71-orig/tests/Makefile.am 2006-09-25 21:00:18.000000000 +0000
-+++ fxscintilla-1.71/tests/Makefile.am 2006-10-24 22:11:04.000000000 +0000
-@@ -1,16 +1,15 @@
- INCLUDES = -I$(top_srcdir)/include -I$(FOX_INCLUDE_DIR)
--LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la
-
- if HAVE_FOX_1_2
--LDADD += -lFOX-1.2
-+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.2.la -lFOX-1.2
- endif
-
- if HAVE_FOX_1_4
--LDADD += -lFOX-1.4
-+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.4.la -lFOX-1.4
- endif
-
- if HAVE_FOX_1_6
--LDADD += -lFOX-1.6
-+LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.6.la -lFOX-1.6
- endif
-
- AM_CXXFLAGS = $(PTHREAD_CFLAGS) -W -Wall -DFOX -DSCI_LEXER
diff --git a/x11-libs/fxscintilla/files/1.71-shared-libs.patch b/x11-libs/fxscintilla/files/1.71-shared-libs.patch
deleted file mode 100644
index a52c2a00ec39..000000000000
--- a/x11-libs/fxscintilla/files/1.71-shared-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- fxscintilla-1.62-orig/configure.in 2005-01-16 11:26:34.000000000 -0500
-+++ fxscintilla-1.62/configure.in 2005-01-16 11:27:40.000000000 -0500
-@@ -13,9 +13,6 @@
- AM_CONDITIONAL(HAVE_MINGW32, test x"$HAVE_MINGW32" = xyes)
-
- dnl Using libtool
--if test x"$HAVE_CYGWIN" = xyes -o x"$HAVE_MINGW32" = xyes; then
-- AC_DISABLE_SHARED
--fi
- AM_PROG_LIBTOOL
-
- dnl Must have a C++ compiler
---- fxscintilla-1.62-orig/Makefile.am 2005-01-16 11:41:12.000000000 -0500
-+++ fxscintilla-1.62/Makefile.am 2005-01-16 11:40:50.000000000 -0500
-@@ -1 +1,4 @@
- SUBDIRS = scintilla include ltdl src tests .
-+
-+ACLOCAL_AMFLAGS = -I config
-+
diff --git a/x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild b/x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild
deleted file mode 100644
index 60a4444c2cb3..000000000000
--- a/x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils multilib
-
-MY_PV=${PV//\./_}
-
-DESCRIPTION="A free source code editing component for the FOX-Toolkit"
-HOMEPAGE="http://www.nongnu.org/fxscintilla/"
-SRC_URI="https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-${MY_PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-FXSCINTILLA-${MY_PV}"
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- econf --libdir=/usr/$(get_libdir) --enable-shared
-}
-
-src_install () {
- emake DESTDIR="${D}" install
-
- dodoc README ChangeLog
- use doc && dohtml doc/*
-}
-
-pkg_postinst() {
- elog "FXScintilla is now built only against the highest available"
- elog "FOX-version you have installed."
-}
diff --git a/x11-libs/fxscintilla/metadata.xml b/x11-libs/fxscintilla/metadata.xml
deleted file mode 100644
index e083bb93cd08..000000000000
--- a/x11-libs/fxscintilla/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- yetanothergeek/fxscintilla
-
-
diff --git a/x11-libs/libsvg-cairo/Manifest b/x11-libs/libsvg-cairo/Manifest
deleted file mode 100644
index 532b752a6066..000000000000
--- a/x11-libs/libsvg-cairo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libsvg-cairo-0.1.6.tar.gz 325427 SHA256 a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c SHA512 2c2b8f5d772e070bc0bc2b1b4e0322b951caf34cf414ad7db8638061963b981757e20d846e5d12f7c0fe585836b62fed7c2d5ec0daa720c72d3ece487430d252 WHIRLPOOL 70b2e2c3811efe288e7aa2421cd2faaa2159bf6e7fbaa7355bff21a320742fd44086a0f4fd4ddb80fd4bd70d850aefe55e936c30d039db2d26850a4e9d611a0a
diff --git a/x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild b/x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild
deleted file mode 100644
index b3d3f88fcbc9..000000000000
--- a/x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Render SVG content using cairo"
-HOMEPAGE="http://cairographics.org"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="x11-libs/cairo
- media-libs/libsvg"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/libsvg-cairo/metadata.xml b/x11-libs/libsvg-cairo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/x11-libs/libsvg-cairo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/x11-misc/ardesia/Manifest b/x11-misc/ardesia/Manifest
deleted file mode 100644
index 66242c315e0a..000000000000
--- a/x11-misc/ardesia/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ardesia-1.0.tar.bz2 2831274 SHA256 6386ef36353220951d0f6c891df62976e171c359fad99451cd017e3c79b8ef32 SHA512 cbd3a95cd8a628830f79d9920dd7a58af295fbc335648f4bdaf720cbcc8d87a74da52195649b54f3b651aa52b4d655505f47d081511468caabace21e40481e00 WHIRLPOOL bb40783111fca1f3bb5a3ddf4ebab72bf5b073b836d2afd8681bc00bb5c1c6b23002ca0acc80680e5ac2dafb0c7c7770950d468edc64f05b8d58c843e9b08d90
diff --git a/x11-misc/ardesia/ardesia-1.0.ebuild b/x11-misc/ardesia/ardesia-1.0.ebuild
deleted file mode 100644
index 05b622a00b80..000000000000
--- a/x11-misc/ardesia/ardesia-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-HOMEPAGE="https://code.google.com/p/ardesia/"
-SRC_URI="https://ardesia.googlecode.com/files/${P}.tar.bz2"
-DESCRIPTION="Color, record and share free-hand annotations on screen and on network"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cwiid"
-
-RDEPEND="dev-libs/atk
- dev-libs/libsigsegv
- media-libs/fontconfig
- media-libs/libpng
- sci-libs/gsl
- sys-devel/gettext
- x11-libs/cairo
- x11-libs/gtk+:2
- gnome-extra/libgsf
- cwiid? ( app-misc/cwiid )"
-DEPEND="${RDEPEND}
- x11-misc/xdg-utils"
-
-src_install() {
- emake DESTDIR="${D}" ardesiadocdir="/usr/share/doc/${P}" install || die "make install ardesia failed"
-}
-
-pkg_postinst() {
- elog "Ardesia requires a Composite Manager, such as Compiz"
- elog "Metacity with compositing, Kwin, etc in order to run"
- echo
-}
diff --git a/x11-misc/ardesia/metadata.xml b/x11-misc/ardesia/metadata.xml
deleted file mode 100644
index 1cd581e67b03..000000000000
--- a/x11-misc/ardesia/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-Ardesia enables you to make colored free-hand annotations on your computer screen,
-record it and share on the network.
-
-
-
-
- alpha@paranoici.org
- Pietro Pilloli
-
- https://code.google.com/p/ardesia/source/list
- https://code.google.com/p/ardesia/wiki/FAQ
- https://code.google.com/p/ardesia/issues/list
- https://code.google.com/p/ardesia
-
-
diff --git a/x11-misc/denu/Manifest b/x11-misc/denu/Manifest
deleted file mode 100644
index d08992c01f6d..000000000000
--- a/x11-misc/denu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST denu-2.3.2.tar.bz2 19644 SHA256 948c88d4c66bf9477d2e7185dce0b1cf58f96d75ebf289415610b16ac1c5e094 SHA512 bcf7ebd4012c4968502d504e13f92aff3104a088725c0afa3f27698a941506a900bfe03db18ca280e67cda6bbfc0ea0f1542e05253def315a04a6dca2cd9b854 WHIRLPOOL c3062098dcba2d48c978696f2ffee32d247eb4248be9d4656c4928d53a090905084172ebba84b9f9c49168c9d1fc4c37d66c8e0ca686ed3bba95eb29a0d48946
diff --git a/x11-misc/denu/denu-2.3.2-r1.ebuild b/x11-misc/denu/denu-2.3.2-r1.ebuild
deleted file mode 100644
index 7f276ca25f79..000000000000
--- a/x11-misc/denu/denu-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-inherit python
-
-DESCRIPTION="A menu generation program for fluxbox, waimea, openbox, icewm, gnome and kde"
-HOMEPAGE="http://denu.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygtk-2.4.1"
-DEPEND="${RDEPEND}"
-
-src_install() {
- ./install.sh "${D}" || die "./install.sh failed"
- python_convert_shebangs -r 2 "${D}"
-}
diff --git a/x11-misc/denu/metadata.xml b/x11-misc/denu/metadata.xml
deleted file mode 100644
index 933258531ca3..000000000000
--- a/x11-misc/denu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- denu
-
-
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index c6dd6029b47c..18d2ed1953b4 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="nls"
RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/xac/Manifest b/x11-misc/xac/Manifest
deleted file mode 100644
index 9bc7e55fcc32..000000000000
--- a/x11-misc/xac/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xac-0.6_pre4.tar.bz2 37409 SHA256 ff34e1e6e7027a22e712307e3832423b512af894e8ad9678e2f5d022a699a4d4 SHA512 461780097bee453a59eef0c12cdee380dd2de4c605db32222d02926e3febc2930f99c994356dbb359ae725554d1389e864944cf999b991d88336803b049d5026 WHIRLPOOL e5d5b538ff31a3fcc6a55b9a52cb9f113296ab8f9addc0eaec4a685e6f6f4965cd1a0b27b98c14ad8caf6b4e18b87cdea5ff686b4ed29e8dd33c6531ca3f3c09
diff --git a/x11-misc/xac/files/x86-biosfix.patch b/x11-misc/xac/files/x86-biosfix.patch
deleted file mode 100644
index 918cdf131d55..000000000000
--- a/x11-misc/xac/files/x86-biosfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -u -B -r1.1 -r1.2
---- src/bioscall.h 25 Aug 2006 19:48:26 -0000 1.1
-+++ src/bioscall.h 30 Sep 2009 15:05:49 -0000 1.2
-@@ -1,6 +1,8 @@
- #ifndef bioscall_h
- #define bioscall_h
-
-+#include "int10defs.h"
-+
- /* Print some of the interesting parts of a vm86_regs structure. */
- void dump_regs(struct vm86_regs *regs);
-
-diff -u -B -r1.1 -r1.2
---- src/lrmi.h 25 Aug 2006 19:48:26 -0000 1.1
-+++ src/lrmi.h 30 Sep 2009 15:05:49 -0000 1.2
-@@ -26,6 +26,8 @@
- #ifndef LRMI_H
- #define LRMI_H
-
-+#include "int10defs.h"
-+
- #if defined(__i386__) && (defined(__linux__) || defined(__NetBSD__) \
- || defined(__FreeBSD__) || defined(__OpenBSD__))
-
-diff -Naur
---- src/int10defs.h
-+++ src/int10defs.h 30 Sep 2009 15:05:49 -0000
-@@ -0,0 +1,12 @@
-+/* Fix missing INT10 defines */
-+#ifndef IF_MASK
-+#define TF_MASK 0x00000100
-+#define IF_MASK 0x00000200
-+#define IOPL_MASK 0x00003000
-+#define NT_MASK 0x00004000
-+#define VM_MASK 0x00020000
-+#define AC_MASK 0x00040000
-+#define VIF_MASK 0x00080000 /* virtual interrupt flag */
-+#define VIP_MASK 0x00100000 /* virtual interrupt pending */
-+#define ID_MASK 0x00200000
-+#endif
diff --git a/x11-misc/xac/metadata.xml b/x11-misc/xac/metadata.xml
deleted file mode 100644
index 094389d518ae..000000000000
--- a/x11-misc/xac/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-X.org autoconfiguration tool written in python.
-
-
diff --git a/x11-misc/xac/xac-0.6_pre4.ebuild b/x11-misc/xac/xac-0.6_pre4.ebuild
deleted file mode 100644
index 4294380e0f15..000000000000
--- a/x11-misc/xac/xac-0.6_pre4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Xorgautoconfig (xac) generates configuration files for X.org"
-HOMEPAGE="https://dev.gentoo.org/~josejx/xac.html"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
-SLOT="0"
-IUSE="livecd"
-DEPEND=">=dev-lang/python-2.3
- sys-apps/pciutils"
-RDEPEND=">=dev-lang/python-2.3
- x11-base/xorg-server"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- ### Replace /usr/lib/xac with libdir version
- sed -i "s:/usr/lib/xac:/usr/$(get_libdir)/xac:" xac
-
- ### Fix the x86 bios call with newer glibc
- epatch "${FILESDIR}/x86-biosfix.patch"
-
- ### Make setup.py executable
- chmod +x "${S}/src/setup.py"
-}
-
-src_compile() {
- ### Compile the C bindings
- cd "${S}"/src
- ./setup.py build || die "Failed to build the C modules"
-}
-
-src_install() {
- local xac_base="/usr/$(get_libdir)/xac"
-
- dosbin "${S}"/xac
-
- ### Install the C mods
- cd "${S}"/src
- ./setup.py install --root "${D}" || die "Failed to install the C modules"
-
- dodir "${xac_base}"
- insinto ${xac_base}
- doins "${S}"/py/*
-
- ### Only install the init scripts if livecd is enabled
- if use livecd; then
- newinitd "${S}"/xac.init xac
- newconfd "${S}"/xac.conf xac
- fi
-}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1c272050d880..1268f636790f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -2,3 +2,4 @@ DIST xkeyboard-config-2.14.tar.bz2 953589 SHA256 dc91458a214c56a35727f9e523fc647
DIST xkeyboard-config-2.16.tar.bz2 968663 SHA256 1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58 SHA512 7a661d8601a2653b3e2b55b47b3cf02aa1b028d97ea141cab3a234d61fdd00ab6f37d236c38bb96e32c2f0db535975583e17f080f24ac758982c301105d28079 WHIRLPOOL 790b234169b096e927d0ef2f47823e3aa660c24b857d70d8b229d65f7670a8c168ff138904537e019f40405f00dc2361828720457dfd36b1b206244ce5640299
DIST xkeyboard-config-2.17.tar.bz2 973675 SHA256 dec6be44bd31775cdc1ab95bfd75d5f2c0055613eeca8b4e9c6480b183430701 SHA512 375a38fde9befef0c779b7593c17e3889abf5cf73c66e9ff37f58ea65ca6065bad2835a4187321b88187a1922e47ae086663851906c6082860da8096c7e828b1 WHIRLPOOL 6e9187a4fae546af6fc7707a100fbeea22980cb8ae1217e57263c02ef1d79a1f19e5d163f90a3ecb3a5cb0c9e2a3c5aa981e2fb86b51af876297d748127a4761
DIST xkeyboard-config-2.18.tar.bz2 978557 SHA256 c41d917d6c8a59feb7ccbda51c40a6ada824fdd1e9684b52dd48c9530617ddd0 SHA512 5415fadf66a8e2b671029f4d1cd6726a522d347abe87a0f4f33fa85662dd2dc2348fc7402c53281ad2a8615c61eb447760d16d7dac426df19d0834d05b81f548 WHIRLPOOL 6b0e05f606ee7f41ee1ae7ed90d28a3b7ae973583177fe5b347c72ac2faa210aa25063bc70157168b2b38aa357559f2ff95f8242bcf36b8118fb067fa624fc60
+DIST xkeyboard-config-2.19.tar.bz2 985697 SHA256 83dfd186b9eb9ced69e01d8d8e2f15b6a79b2e30124874ef086f2d3048f45827 SHA512 a928a334375da16f614e92b6d557bc3c199f7bb26e3f0a1cceec406b3b2d48a6789074fe7e93c938d2bcc2683275df37443800840b921524498a869a3f5721de WHIRLPOOL 3872377f8ccd6bce9f1f24ae91799a11a4b58510e34aa020fb862ff142e1298b0f25f22cd88266e1a8b74c0633af776bad998e360527ee9cf1fe31d92ef5a2b7
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild
new file mode 100644
index 000000000000..b3638f191ff5
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_STATIC=no
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="!=x11-proto/xproto-7.0.20"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+ --enable-compat-rules
+ # do not check for runtime deps
+ --disable-runtime-deps
+ --with-xkb-rules-symlink=xorg
+)
+
+src_prepare() {
+ xorg-2_src_prepare
+ if [[ ${XORG_EAUTORECONF} != no ]]; then
+ intltoolize --copy --automake || die
+ fi
+}
+
+src_compile() {
+ # cleanup to make sure .dir files are regenerated
+ # bug #328455 c#26
+ xorg-2_src_compile clean
+ xorg-2_src_compile
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 0a341e81a4b3..8fa2cfa9c643 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,5 +1,4 @@
DIST xterm-314.tgz 1200426 SHA256 1dbf1e93796c1b71b22b84e82eb58bcf20a14a7f365158819f3b4dbb29fe93f0 SHA512 bce72207b6db288c3873f00b928797dfd2aaea51d183b11d377af008a1a83965bd781c648fd26d88b491197594315b2d2549cfdb44f0dbd856b269aebc31ad9f WHIRLPOOL a9eda394dc47d0d31ab27fe338e3a1d41ef581b1617d324fdb98289374e9d5e4854735ddc4a862323203ec1ecb2788f3ae7e4abe1f3b17b15dadecc6edb9f651
DIST xterm-320.tgz 1217356 SHA256 a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7 SHA512 6c234b5564ce1276136bc3ef8ef5d6703ed9dc3af3b0fd7c8c713c0876276fc4bb55cee7137f9a8c45df66531b6bd8eb778bd7660ea35c4aa8aa80ba17ba1263 WHIRLPOOL 2d7b0de46096a7a0426a419007a590bc478d19c7e2ddc3cea2fbfe0998a2f2fe5c6f5da46b5869260207e897a284250fa2cd483d613d65636c01ce366d7b6a5c
-DIST xterm-323.tgz 1234918 SHA256 e39f7469910ecc92bd53496037770d4b572d33486a4ba97188e64459f25658bf SHA512 f70cb33fb0dfdcdf79560de6fc9d35a443a83f2b20d086d3cdd14f20bbf1b2da524479672701d0c298e1a06dae7f7a48ccdc0f04fbeb6cc0d5e673dd4df9ccd2 WHIRLPOOL dcea230dd1cfd9f6ba918f386175b2a8d5dfa6e604c78aa320a2cba1791e7534d4c7d8159c90399e1bfe8dd620023dc2dc9db3efff35ddc6f77d45ab218f85e3
-DIST xterm-324.tgz 1235312 SHA256 70ecbec8d27789248e8ae2dc2cf159a2e189c152a6559a2b3df7f4838da36092 SHA512 f6f2518a11eec6e41afb10ca4ec298c566b1fc5c3b3c4c4d533311b3f64ec04c2bc692798e75bbd34382cb64eca9b21ee4b05438c4d18486046d3c710c586626 WHIRLPOOL 80bdf5dda75d8f7d2b60b0611399f96506c79195235bec1b0c5e98cd32a535dc582ad12e34ec9f3998d9d223ed284debe50582113723a1e58e6a0c2d1bd9fd48
DIST xterm-325.tgz 1237865 SHA256 3b31b07a0c40427e9330ec3be9d1a748c72808f945953cea9e526e48be315f1b SHA512 7049a013967cb90eb196684e7d6d0664cd0d7c86154fba318493d9249e973a4bf591861cbbc051a80184ef427aad75774b15d79cb571d3f82482c1b51e7a99f4 WHIRLPOOL 5f08712994e3d907fcae2bbfe7d8f1aaf2ff3be342eec6b854f94774d0e7fa03e042c2716848b6aae6d6cf14a030c7a1769b6ab8e68818394447acf2455cd37e
+DIST xterm-326.tgz 1240064 SHA256 3f40eb373cef578ae108b6d19602c96bf7342a80396e93a30ff78ee72f68d317 SHA512 24a26adeeb07f2ed31779578d3a18d6c838bc7596521f5c826c8747b96fae1a296451f55d0046970102cf9f2ef072f6d0505dfc51378796c2834fb9af036dce1 WHIRLPOOL 132c330e9f476bf1050efd5f054be22959e0abd6e44eac247e27248f805c42691a12c061864e033ca9199dfe3f20c50df0a03f6222965a18f0587a965cff7e32
diff --git a/x11-terms/xterm/xterm-324.ebuild b/x11-terms/xterm/xterm-324.ebuild
deleted file mode 100644
index a332d4ec5ad4..000000000000
--- a/x11-terms/xterm/xterm-324.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://invisible-island.net/xterm/"
-SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
- kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
- >=sys-libs/ncurses-5.7-r7:0=
- x11-apps/xmessage
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXft
- x11-libs/libxkbfile
- x11-libs/libXmu
- x11-libs/libXrender
- x11-libs/libXt
- unicode? ( x11-apps/luit )
- Xaw3d? ( x11-libs/libXaw3d )"
-RDEPEND="${COMMON_DEPEND}
- media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- x11-proto/kbproto
- x11-proto/xproto"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
- DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
- # 454736
- # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
- # something sane like pkg-config or ncurses5-config and stops guessing libs
- # Everything gets linked against ncurses anyways, so don't shout
- append-libs $(pkg-config --libs ncurses)
-
- econf \
- --libdir="${EPREFIX}"/etc \
- --disable-full-tgetent \
- --with-app-defaults="${DEFAULTS_DIR}" \
- --disable-setuid \
- --disable-setgid \
- --with-utempter \
- --with-x \
- $(use_with Xaw3d) \
- --disable-imake \
- --enable-256-color \
- --enable-broken-osc \
- --enable-broken-st \
- --enable-exec-xterm \
- $(use_enable truetype freetype) \
- --enable-i18n \
- --enable-load-vt-fonts \
- --enable-logging \
- $(use_enable openpty) \
- $(use_enable toolbar) \
- $(use_enable unicode mini-luit) \
- $(use_enable unicode luit) \
- --enable-wide-chars \
- --enable-dabbrev \
- --enable-warnings
-}
-
-src_install() {
- default
-
- dohtml xterm.log.html
- domenu *.desktop
-
- # Fix permissions -- it grabs them from live system, and they can
- # be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
- # respectively (#69510).
- # (info from Thomas Dickey) - Donnie Berkholz
- fperms 0755 /usr/bin/xterm
-
- # restore the navy blue
- sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-323.ebuild b/x11-terms/xterm/xterm-326.ebuild
similarity index 94%
rename from x11-terms/xterm/xterm-323.ebuild
rename to x11-terms/xterm/xterm-326.ebuild
index a332d4ec5ad4..27ffea627811 100644
--- a/x11-terms/xterm/xterm-323.ebuild
+++ b/x11-terms/xterm/xterm-326.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty toolbar truetype unicode Xaw3d"
+IUSE="+openpty toolbar truetype unicode Xaw3d xinerama"
COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
@@ -27,7 +27,8 @@ COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
x11-libs/libXrender
x11-libs/libXt
unicode? ( x11-apps/luit )
- Xaw3d? ( x11-libs/libXaw3d )"
+ Xaw3d? ( x11-libs/libXaw3d )
+ xinerama? ( x11-libs/libXinerama )"
RDEPEND="${COMMON_DEPEND}
media-fonts/font-misc-misc"
DEPEND="${COMMON_DEPEND}
@@ -57,6 +58,7 @@ src_configure() {
--with-utempter \
--with-x \
$(use_with Xaw3d) \
+ $(use_with xinerama) \
--disable-imake \
--enable-256-color \
--enable-broken-osc \
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 83f9d333eb66..5e32bbabd5dd 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
- KEYWORDS="alpha arm ppc x86"
+ KEYWORDS="alpha arm hppa ppc ppc64 x86"
else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
fi
LICENSE="GPL-2"
diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
index e8cf40e788db..70e1b7c64dd6 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
SLOT="0"
LICENSE="GPL-2"
IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND="media-libs/fontconfig
>=x11-libs/libXft-2.1.0