diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index 5b6a9550fb96..a7fc037f2f93 100644
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
sensors serial snmp statsd swap syslog table tail target_notification
target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
- tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+ tokyotyrant unixsock uptime users uuid varnish vmem wireless
write_graphite write_http write_mongodb"
COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -107,9 +107,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
collectd_plugins_java? ( >=virtual/jdk-1.6 )
- kernel_linux? (
- collectd_plugins_vserver? ( sys-kernel/vserver-sources )
- )"
+"
RDEPEND="${COMMON_DEPEND}
collectd_plugins_java? ( >=virtual/jre-1.6 )
@@ -240,7 +238,7 @@ src_configure() {
# should work independent of the operating system.
local linux_plugins="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
- memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+ memory md netlink nfs numa processes serial swap tcpconns thermal users vmem
wireless"
local libstatgrab_plugins="cpu disk interface load memory swap users"
diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild
index 64af3dd795ef..d32eaf8e0e29 100644
--- a/app-admin/collectd/collectd-5.5.0.ebuild
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -41,7 +41,7 @@ COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind ceph
rrdcached rrdtool sensors serial smart snmp statsd swap syslog table tail
target_notification target_replace target_scale target_set tcpconns teamspeak2
ted thermal threshold tokyotyrant turbostat unixsock uptime users uuid varnish
- virt vmem vserver wireless write_graphite write_http write_log write_mongodb
+ virt vmem wireless write_graphite write_http write_log write_mongodb
write_redis write_sensu write_tsdb zfs_arc zookeeper"
COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -113,9 +113,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
collectd_plugins_java? ( >=virtual/jdk-1.6 )
- kernel_linux? (
- collectd_plugins_vserver? ( sys-kernel/vserver-sources )
- )"
+"
RDEPEND="${COMMON_DEPEND}
collectd_plugins_java? ( >=virtual/jre-1.6 )
@@ -250,7 +248,7 @@ src_configure() {
local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
ethstat interface iptables ipvs irq ipc load memory md netlink nfs
numa processes serial swap tcpconns thermal turbostat users vmem
- vserver wireless zfs_arc"
+ wireless zfs_arc"
local libstatgrab_plugins="cpu disk interface load memory swap users"
local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfs_arc"
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 1f920dde419a..268c9abc954d 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -115,7 +115,6 @@
Build the varnish input plugin
Build the libvirt input plugin (statistics about virtualized guests on a system)
Build the vmem input plugin (information about the virtual memory subsystem)
- Build the vserver input plugin (virtual servers running on a system)
Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)
Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)
Build the write_http output plugin (sends the values collected by collectd to a web-server)
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
index 696bcc79467a..ec288901e79b 100644
--- a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
@@ -49,8 +49,10 @@ QA_PREBUILT="
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+ /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
/opt/puppetlabs/puppet/lib/engines/*
/opt/puppetlabs/puppet/lib/virt-what/*
+ /opt/puppetlabs/puppet/lib/*
/opt/puppetlabs/puppet/bin/*"
pkg_setup() {
diff --git a/app-admin/puppetdb/puppetdb-3.2.2.ebuild b/app-admin/puppetdb/puppetdb-3.2.2.ebuild
index 512445aa334b..9ad516467615 100644
--- a/app-admin/puppetdb/puppetdb-3.2.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-3.2.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND+=">=virtual/jdk-1.7.0"
DEPEND+=""
diff --git a/app-admin/puppetserver/puppetserver-2.2.1.ebuild b/app-admin/puppetserver/puppetserver-2.2.1.ebuild
index 0151a4d796ac..33489d982935 100644
--- a/app-admin/puppetserver/puppetserver-2.2.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.2.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND+="
>=virtual/jdk-1.7.0
diff --git a/app-arch/rar/rar-5.3.0.ebuild b/app-arch/rar/rar-5.3.0.ebuild
index bf31841b9ca1..d199bffbd0c6 100644
--- a/app-arch/rar/rar-5.3.0.ebuild
+++ b/app-arch/rar/rar-5.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="x86? ( ${URI_x86} )
LICENSE="RAR"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
IUSE="all_sfx static"
DEPEND="all_sfx? ( app-arch/unrar )"
diff --git a/app-backup/duplicity/duplicity-0.6.26.ebuild b/app-backup/duplicity/duplicity-0.6.26.ebuild
index eb05c0b56941..a752613e1bdc 100644
--- a/app-backup/duplicity/duplicity-0.6.26.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3 test"
CDEPEND="
diff --git a/app-backup/obnam/obnam-1.18.2-r2.ebuild b/app-backup/obnam/obnam-1.18.2-r2.ebuild
new file mode 100644
index 000000000000..dc2efb705dad
--- /dev/null
+++ b/app-backup/obnam/obnam-1.18.2-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit distutils-r1
+
+DESCRIPTION="A backup program that supports encryption and deduplication"
+HOMEPAGE="http://obnam.org/"
+SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/obnam/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+ dev-python/cliapp[${PYTHON_USEDEP}]
+ dev-python/fuse-python[${PYTHON_USEDEP}]
+ dev-python/larch[${PYTHON_USEDEP}]
+
- java
+ cjk
+
+ unidic
+
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
index 9271416a4bfd..387c5b9e85c5 100644
--- a/app-dicts/myspell-de/Manifest
+++ b/app-dicts/myspell-de/Manifest
@@ -1,3 +1,6 @@
DIST dict-de_at-frami_2013-12-06.oxt 5923995 SHA256 3e1d962188a9a5d49388231d5bd6b286f3c64ba7ed39a2ce84e579ebf40019b5 SHA512 a37e061be99ba074ff52b3e0320bbb814d3f504ad353c4e562ea9617d0b60f9b2feb4d1453b55c78a6b659420c7baf0e7601e66489c9c25df9a8bad92d9aebb5 WHIRLPOOL 61c356dd5ea765ebb470861394aaf7939c30b2006e9a0d2fa78938a3d700b6adb07d2a4a158a0d3cc9ffab8189c7792c244ae587611168fb91f79f5f5f7c2bb3
+DIST dict-de_at-frami_2015-12-28.oxt 8110628 SHA256 07851d417063e12a28eef21b8b343f49fdf218079f434ec79c1e18282246bbab SHA512 2d4188174fb3f7cb2ca175d54342395980497183c0c6ea233217491226b19a0f19f806935e0eb3798229db89fd3ebf93cb5b210ba326dcb1cc8b862c48aecd02 WHIRLPOOL ce2f9e31a2d008e021d10746c68524a4682ab7943ea4f11dd56a35fd70095eb1fbfe4963c19bb8ad5c6b5fe8770e28dc397dd1e799457188e30cd3163a9d6e9e
DIST dict-de_ch-frami_2013-12-06.oxt 5914138 SHA256 b053ba0f63b276bafbc1910414a735d099b59955d592f01feedbb8faf6af4ad6 SHA512 d93107b639fc9630ccd0f2afa5a9d639ea444f14e08bd4ebe5ba7c082d7cb516c2a59aa8c3ef7c743872687cc47c45b5ffb5f4be70d2449e61bf65e5cf6c84d6 WHIRLPOOL 2573ae9008191182dabbe06b67910aa82bcd76c6ef5d55757bac402f177e8c4ca105104c04dbba0b68447d6e25c0730f9c71fb3247f14c931b3503967b81c6db
+DIST dict-de_ch-frami_2015-12-28.oxt 8101312 SHA256 7c5fe404f403f8c7138de6992b71fe448913392cfb1d06826e3584d6e61fcfcb SHA512 b62ad082fbef3785b5cd29bb530a4f5367771af6237d10a9ee922f0deaff0ccdd7c0a9cd93a9218444b07bf278efdb18f497660513af4b8862998ab3bb434f5a WHIRLPOOL 621bef6ca473025800fe96a74df8d2ef39c15d2e1214bd4363ec38b4513bdb6fd8ddf54d6d38245c3371f2cd6357607558d60c9fb6b36c1610e41cfca0f404b7
DIST dict-de_de-frami_2013-12-06.oxt 5924352 SHA256 c82ebfc13b047c5acb28a7b12b42447a7e7c07fbdf24ab5ef77bf099cfbab0a9 SHA512 bf852bd6be13ee02673d9011cabb6ac89b4095e529b3c44651473a06c5c0b1f9ad1261934c157654933b1ce35470e9b900f381219654d6ecc81bb3ebb221ab6f WHIRLPOOL 273da46a23667c59092f33a584f559368f1b82149fc78ec5eef78bef9bde0246252affc3097090fa076a3037da88f2fba9b16bd961041e3efea89a2c021a5d74
+DIST dict-de_de-frami_2015-12-28.oxt 8110832 SHA256 4c9520497b38712d093ca8ea57edb4d04569d4f700ea35379c082862628389c6 SHA512 242cfa3f9f8046badbd56560d05cc47a2b0bc89b263f9141443b3401981e91a1124d1c2f76ae77ea017b02a34567cf4c160c31e2250f90d095a74b92dd3d636a WHIRLPOOL 140c9c7e11b69481526d94cc803e63eb8df8a073ac99d515c8bad7ebace43a04fb41b11f8215447a58385157f40fe223e9173304af4210f5eba6eebc07a12fb6
diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
new file mode 100644
index 000000000000..bc11de169712
--- /dev/null
+++ b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MYSPELL_DICT=(
+ "de_AT.aff"
+ "de_AT.dic"
+ "de_DE.aff"
+ "de_DE.dic"
+ "de_CH.aff"
+ "de_CH.dic"
+)
+
+MYSPELL_HYPH=(
+ "hyph_de_AT.dic"
+ "hyph_de_DE.dic"
+ "hyph_de_CH.dic"
+)
+
+MYSPELL_THES=(
+ "th_de_AT_v2.dat"
+ "th_de_AT_v2.idx"
+ "th_de_DE_v2.dat"
+ "th_de_DE_v2.idx"
+ "th_de_CH_v2.dat"
+ "th_de_CH_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="German dictionaries for myspell/hunspell"
+HOMEPAGE="
+ http://extensions.libreoffice.org/extension-center/german-de-at-frami-dictionaries
+ http://extensions.libreoffice.org/extension-center/german-de-de-frami-dictionaries
+ http://extensions.libreoffice.org/extension-center/german-de-ch-frami-dictionaries
+"
+SRC_URI="
+ http://extensions.libreoffice.org/extension-center/german-de-at-frami-dictionaries/pscreleasefolder.2011-11-05.7614737245/${PV}/dict-de_at-frami_${PV//./-}.oxt
+ http://extensions.libreoffice.org/extension-center/german-de-de-frami-dictionaries/releases/${PV}/dict-de_de-frami_${PV//./-}.oxt
+ http://extensions.libreoffice.org/extension-center/german-de-ch-frami-dictionaries/pscreleasefolder.2011-11-05.5296069116/${PV}/dict-de_ch-frami_${PV//./-}.oxt
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+ # rename the tarballs
+ for i in *_frami.*; do
+ mv "${i}" "${i/_frami}" || die
+ done
+}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
index 8e1c138209c3..f074d914da93 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 -x86"
+KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,7 +36,7 @@ DEPEND="sys-devel/gettext
sys-devel/bin86
sys-apps/texinfo"
-RDEPEND=">=app-emulation/xen-4.2.1"
+RDEPEND=">=app-emulation/xen-tools-${PV}"
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
index 25ada738dfa5..eb54859f4386 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 -x86"
+KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -37,7 +37,7 @@ DEPEND="sys-devel/gettext
sys-apps/texinfo
x11-libs/pixman"
-RDEPEND=">=app-emulation/xen-4.2.1"
+RDEPEND=">=app-emulation/xen-tools-${PV}"
pkg_setup() {
python-single-r1_pkg_setup
diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
index a14716903af6..85092c5f95ee 100644
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=
SECURITY_VER=7
# vars set to reflect https://dev.gentoo.org/~idella4/
diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
index ceb140202d3e..0517cb35e9ba 100644
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild
@@ -19,7 +19,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=0
SECURITY_VER=7
# vars set to reflect https://dev.gentoo.org/~idella4/
diff --git a/app-emulation/xen/xen-4.5.2-r3.ebuild b/app-emulation/xen/xen-4.5.2-r3.ebuild
index 434306c66456..d76cc3dbf415 100644
--- a/app-emulation/xen/xen-4.5.2-r3.ebuild
+++ b/app-emulation/xen/xen-4.5.2-r3.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 -x86"
UPSTREAM_VER=
SECURITY_VER=0
# var set to reflect https://dev.gentoo.org/~idella4/
diff --git a/app-emulation/xen/xen-4.6.0-r5.ebuild b/app-emulation/xen/xen-4.6.0-r5.ebuild
index f3e0d7609b02..f4d07387fecf 100644
--- a/app-emulation/xen/xen-4.6.0-r5.ebuild
+++ b/app-emulation/xen/xen-4.6.0-r5.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm ~arm64 -x86"
+ KEYWORDS="amd64 ~arm ~arm64 -x86"
UPSTREAM_VER=0
SECURITY_VER=0
# var set to reflect https://dev.gentoo.org/~idella4/
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 158f9cbc675b..b3703617ec7f 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1,4 +1,2 @@
DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b
-DIST eselect-php-0.8.0.tar.xz 43932 SHA256 1ddc6aafe269ebbf3006737701403bd2c7b324b9eea0fcbdc91e85a856f8a10d SHA512 53c735275264742542d3909ae2994d0720bc961533a3df5373dbc7a7a1f04e91591f4e8356c268954420487d3ead4006cc5d6f361ef0ac2836f7f126556e960d WHIRLPOOL 94deba4a5bd4d0d85c8f3afc96ac30a69cca5db95014b2fd8701495cc83488389302f640065e923cabd40c95f97f792dd173337cc33c7d38441956049fb90cda
-DIST eselect-php-0.8.1.tar.xz 44412 SHA256 aa118e936bff176fe64911d68bb72e6e9e03d33c106674169396826a3063a962 SHA512 3679c8ac4d980424a108d93c8e2e575b93196d7140f31f900e7f925ab26cf821233d12b9083fd7bdd7bd596c3b59544e972660be8ffce7c24d4a7980fbe5f770 WHIRLPOOL 19c6f05a02aa1a40586f352822679f7e655200374a100834d4370678b35856d5e255b0d83f07eafd69481ee3ee72cb976665e6c2b2df990be00b54bfa53a5a92
DIST eselect-php-0.8.2.tar.xz 51832 SHA256 3601d0612a19ccc1c5146be2c8cd7df955a37c517817ae4f59bb3ead446f5355 SHA512 da1d71affe275d07db7a76fd98fd89ffdea6f671262a615bf4dda5a1bba8d19e5d1a3c8afe3f1eb1e70fd71298476a6f0d4e73eba7aafe7555f018f89005bc3d WHIRLPOOL dcc75d93eeaaa85f63f5329491d010debd83ed2a82af0051d59ab4aff639703a6f4c1baa5388ed2a8867d6ab610740d5a1ac86d28cddb0de5be47872ada040b4
diff --git a/app-eselect/eselect-php/eselect-php-0.8.0.ebuild b/app-eselect/eselect-php/eselect-php-0.8.0.ebuild
deleted file mode 100644
index ea571784c702..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
-SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-IUSE="fpm apache2"
-
-# The "DirectoryIndex" line in 70_mod_php5.conf requires mod_dir.
-RDEPEND="app-admin/eselect
- apache2? ( www-servers/apache[apache2_modules_dir] )"
-
-want_apache
-
-src_install() {
- default
-
- if use apache2 ; then
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
- newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" "70_mod_php5.conf"
- fi
-
- if use fpm ; then
- newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm"
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
- exeinto /usr/libexec
- doexe "${FILESDIR}/php-fpm-launcher"
- fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.8.1.ebuild b/app-eselect/eselect-php/eselect-php-0.8.1.ebuild
deleted file mode 100644
index d7a5283e275d..000000000000
--- a/app-eselect/eselect-php/eselect-php-0.8.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit depend.apache systemd
-
-DESCRIPTION="PHP eselect module"
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
-SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-IUSE="fpm apache2"
-
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
-RDEPEND="app-admin/eselect
- apache2? ( www-servers/apache[apache2_modules_dir] )"
-
-want_apache
-
-src_install() {
- default
-
- if use apache2 ; then
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
- doins "${FILESDIR}/70_mod_php.conf"
- fi
-
- if use fpm ; then
- newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm"
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
- exeinto /usr/libexec
- doexe "${FILESDIR}/php-fpm-launcher"
- fi
-}
-
-pkg_postinst() {
- if use apache2 ; then
- elog
- elog "If you are upgrading, be warned that our mod_php configuration"
- elog "file has changed! You should now define -DPHP for the apache2"
- elog "daemon, and inspect the new 70_mod_php.conf which has been"
- elog "installed. Module loading involves eselect as of this version."
- elog
- elog "You must run eselect at least once to choose your apache2 target"
- elog "before the new configuration will work. Afterwards, and after you"
- elog "have reviewed your new configuration, you are advised to remove"
- elog "the obsolete 70_mod_php5.conf file."
- elog
- fi
-}
diff --git a/app-eselect/eselect-php/eselect-php-0.8.2.ebuild b/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild
similarity index 93%
rename from app-eselect/eselect-php/eselect-php-0.8.2.ebuild
rename to app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild
index e52f00465d16..012e47663eac 100644
--- a/app-eselect/eselect-php/eselect-php-0.8.2.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,6 +30,7 @@ src_install() {
if use apache2 ; then
insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
doins "${FILESDIR}/70_mod_php.conf"
+ newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
fi
if use fpm ; then
diff --git a/app-eselect/eselect-php/files/70_mod_php5.backcompat.conf b/app-eselect/eselect-php/files/70_mod_php5.backcompat.conf
new file mode 100644
index 000000000000..bd79f78aa6be
--- /dev/null
+++ b/app-eselect/eselect-php/files/70_mod_php5.backcompat.conf
@@ -0,0 +1,28 @@
+###########
+# WARNING #
+###########
+#
+# This file is provided for backwards compatibility only. The Apache
+# PHP configuration is now located in 70_mod_php.conf and requires you
+# to set -DPHP in your Apache conf.d file. Please examine
+# 70_mod_php.conf and update your Apache configuration to use -DPHP
+# instead of -DPHP5. Afterwards you may delete this file.
+#
+
+ # Load the module first
+
+ LoadModule php5_module modules/libphp5.so
+
+
+ # Set it to handle the files
+ # NOTE: Avoiding AddHandler/AddType for security (bug #538822)
+ # NOTE: Please read the related news item!
+
+ SetHandler application/x-httpd-php
+
+
+ SetHandler application/x-httpd-php-source
+
+
+ DirectoryIndex index.php index.phtml
+
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
index 5d8824fd9b76..d64e23e367b4 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.6.92.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="boost opencc lua"
DEPEND="sys-apps/sed"
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index c959c33bf467..5b6eb298107d 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="!media-libs/portaudio-18 )
- lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
- all userspace accent act200l act220l
- adaptec alsa_usb animax asusdh atilibusb
- atiusb audio audio_alsa avermedia avermedia_vdomate
- avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
- bte bw6130 caraca chronos commandir
- cph06x creative creative_infracd
- devinput digimatrix dsp dvico ea65 ene0100
- exaudio flyvideo ftdi gvbctv5pci hauppauge
- hauppauge_dvb hercules_smarttv_stereo i2cuser
- igorplugusb iguanaIR imon imon_24g imon_knob
- imon_lcd imon_pad imon_rsc irdeo irdeo_remote
- irlink irman irreal it87 ite8709
- knc_one kworld leadtek_0007 leadtek_0010
- leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini
- mediafocusI mouseremote
- mouseremote_ps2 mp3anywhere mplay nslu2
- packard_bell parallel pcmak pcmak_usb
- pctv pixelview_bt878 pixelview_pak
- pixelview_pro provideo realmagic
- remotemaster sa1100 samsung sasem sb0540 serial
- silitek sir slinke streamzap tekram
- tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
- uirt2_raw usb_uirt_raw usbx wpc8769l"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
- serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
- accent bte creative creative_infracd devinput dsp ea65 exaudio
- ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
- mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
- pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
- tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
- act200l act220l adaptec animax atiusb breakoutbox hauppauge
- hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
- imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
- leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
- provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
- tvbox wpc8769l"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
- avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
- cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
- pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
- all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
- imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
- virtual/linux-sources
- lirc_devices_ftdi? ( dev-embedded/libftdi )
- lirc_devices_all? ( dev-embedded/libftdi )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
- lirc_devices_inputlirc? ( app-misc/inputlircd )
- lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
- IUSE="${IUSE} lirc_devices_${dev}"
- if [[ "${dev}" != "all" ]]; then
- REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
- fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
- local dev="${1}"
- local desc="device ${dev}"
- if [[ -n "${2}" ]]; then
- desc="${2}"
- fi
-
- # Bug #187418
- if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
- eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
- eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
- return 0
- fi
- : ${lirc_device_count:=0}
- ((lirc_device_count++))
-
- elog "Compiling support for ${desc}"
-
- if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
- if linux_chkconfig_present LIRC ; then
- ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
- fi
- if ! linux_chkconfig_present MODULE_UNLOAD ; then
- ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
- ewarn "You will need MODULE_UNLOAD support in your kernel."
- fi
- fi
- if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
- ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
- fi
-
- if [[ ${lirc_device_count} -eq 2 ]] ; then
- ewarn
- ewarn "LIRC_DEVICES has more than one entry."
- ewarn "When selecting multiple devices for lirc to be supported,"
- ewarn "it can not be guaranteed that the drivers play nice together."
- ewarn "If this is not intended, then please adjust LIRC_DEVICES"
- ewarn "and re-emerge."
- ewarn
- fi
-
- MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
- if [[ -n "${LIRC_OPTS}" ]] ; then
- ewarn
- ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
- ewarn
- ewarn "Please use LIRC_DEVICES from now on."
- ewarn "e.g. LIRC_DEVICES=\"serial sir\""
- ewarn
- ewarn "Flags are now set per use-flags."
- ewarn "e.g. transmitter, hardware-carrier"
-
- local opt
- local unsupported_opts=""
-
- # test for allowed options for LIRC_OPTS
- for opt in ${LIRC_OPTS}; do
- case ${opt} in
- --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
- MY_OPTS="${MY_OPTS} ${opt}"
- ;;
- *)
- unsupported_opts="${unsupported_opts} ${opt}"
- ;;
- esac
- done
- if [[ -n ${unsupported_opts} ]]; then
- eerror "These options are no longer allowed to be set"
- eerror "with LIRC_OPTS: ${unsupported_opts}"
- die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
- fi
- fi
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- # set default configure options
- MY_OPTS=""
- LIRC_DRIVER_DEVICE="/dev/lirc0"
-
- if use lirc_devices_all; then
- # compile in drivers for a lot of devices
- add_device all "a lot of devices"
- else
- # compile in only requested drivers
- local dev
- for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
- if use lirc_devices_${dev}; then
- add_device ${dev}
- fi
- done
-
- if use lirc_devices_remote_wonder_plus; then
- add_device atiusb "device Remote Wonder Plus (atiusb-based)"
- fi
-
- if use lirc_devices_serial_igor_cesko; then
- add_device serial "serial with Igor Cesko design"
- MY_OPTS="${MY_OPTS} --with-igor"
- fi
-
- if use lirc_devices_imon_pad; then
- ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
- ewarn "and removed the pad2keys_active option for the lirc_imon module"
- ewarn "because it is always active."
- ewarn "If you have an older imon VFD device, you may need to add the module"
- ewarn "option display_type=1 to override autodetection and force VFD mode."
- fi
-
- if use lirc_devices_xboxusb; then
- add_device atiusb "device xboxusb"
- fi
-
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
- if [[ "${MY_OPTS}" == "" ]]; then
- if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
- # on xbox: use special driver
- add_device atiusb "device xboxusb"
- else
- # no driver requested
- elog
- elog "Compiling only the lirc-applications, but no drivers."
- elog "Enable drivers with LIRC_DEVICES if you need them."
- MY_OPTS="--with-driver=none"
- fi
- fi
- fi
-
- use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
- use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
- einfo
- einfo "lirc-configure-opts: ${MY_OPTS}"
- elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
- filter-flags -Wl,-O1
-}
-
-src_prepare() {
- # Rip out dos CRLF
- edos2unix contrib/lirc.rules
-
- # Apply patches needed for some special device-types
- use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
- use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
- # Apply fixes for kernel-2.6.39 and above
- epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
- # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
- # for bug 377033
- epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
- # Apply fixes for kernel-3.3 and above (bug 439538)
- epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
- # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
- epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
- # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
- epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
-
- # Do not build drivers from the top-level Makefile
- sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
- # remove parallel driver on SMP systems
- if linux_chkconfig_present SMP ; then
- sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
- fi
-
- # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
- if use lirc_devices_all && kernel_is ge 2 6 22 ; then
- ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
- sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
- fi
-
- # respect CFLAGS
- sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
- # setting default device-node
- local f
- for f in configure.ac acconfig.h; do
- [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
- done
- echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-syslog=LOG_DAEMON \
- --enable-sandboxed \
- --with-kerneldir="${KV_DIR}" \
- --with-moduledir="/lib/modules/${KV_FULL}/misc" \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_with X x) \
- ${MY_OPTS} \
- ABI="${KERNEL_ABI}" \
- ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
- # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
- emake -j1
-
- MODULE_NAMES="lirc(misc:${S}/drivers)"
- BUILD_TARGETS="all"
- linux-mod_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake -C drivers DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
- newinitd "${FILESDIR}"/lircmd lircmd
- newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
- insinto /etc/modprobe.d/
- newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
- newconfd "${FILESDIR}"/irexec-confd irexec
-
- if use doc ; then
- dohtml doc/html/*.html
- insinto /usr/share/doc/${PF}/images
- doins doc/images/*
- fi
-
- insinto /usr/share/lirc/remotes
- doins -r remotes/*
-
- keepdir /etc/lirc
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
- fi
-
- use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
-
- local dir="${EROOT}/etc/modprobe.d"
- if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
- elog "Renaming ${dir}/lirc to lirc.conf"
- mv -f "${dir}/lirc" "${dir}/lirc.conf"
- fi
-
- # copy the first file that can be found
- if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
- MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
- cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- fi
-
- # stop portage from touching the config file
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- rm -f "${D}"/etc/lirc/lircd.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # copy config file to new location
- # without portage knowing about it
- # so it will not delete it on unmerge or ever touch it again
- if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
- if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
- elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT}"/etc/lircd.conf
- fi
- fi
-
- einfo "The new default location for lircd.conf is inside of"
- einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.0-r3.ebuild b/app-misc/lirc/lirc-0.9.0-r3.ebuild
deleted file mode 100644
index e9c8bea15569..000000000000
--- a/app-misc/lirc/lirc-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-mod linux-info toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
- SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
- SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libICE
- )
- lirc_devices_alsa_usb? ( media-libs/alsa-lib )
- lirc_devices_audio? ( >media-libs/portaudio-18 )
- lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
- all userspace accent act200l act220l
- adaptec alsa_usb animax asusdh atilibusb
- atiusb audio audio_alsa avermedia avermedia_vdomate
- avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
- bte bw6130 caraca chronos commandir
- cph06x creative creative_infracd
- devinput digimatrix dsp dvico ea65 ene0100
- exaudio flyvideo ftdi gvbctv5pci hauppauge
- hauppauge_dvb hercules_smarttv_stereo i2cuser
- igorplugusb iguanaIR imon imon_24g imon_knob
- imon_lcd imon_pad imon_rsc irdeo irdeo_remote
- irlink irman irreal it87 ite8709
- knc_one kworld leadtek_0007 leadtek_0010
- leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini
- mediafocusI mouseremote
- mouseremote_ps2 mp3anywhere mplay nslu2
- packard_bell parallel pcmak pcmak_usb
- pctv pixelview_bt878 pixelview_pak
- pixelview_pro provideo realmagic
- remotemaster sa1100 samsung sasem sb0540 serial
- silitek sir slinke streamzap tekram
- tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
- uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
- serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
- accent bte creative creative_infracd devinput dsp ea65 exaudio
- ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
- mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
- pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
- tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
- act200l act220l adaptec animax atiusb breakoutbox hauppauge
- hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
- imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
- leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
- provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
- tvbox wpc8769l zotac"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
- avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
- cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
- pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
- all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
- imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
- virtual/linux-sources
- lirc_devices_ftdi? ( dev-embedded/libftdi )
- lirc_devices_all? ( dev-embedded/libftdi )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
- lirc_devices_inputlirc? ( app-misc/inputlircd )
- lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
- IUSE="${IUSE} lirc_devices_${dev}"
- if [[ "${dev}" != "all" ]]; then
- REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
- fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
- local dev="${1}"
- local desc="device ${dev}"
- if [[ -n "${2}" ]]; then
- desc="${2}"
- fi
-
- # Bug #187418
- if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
- eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
- eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
- return 0
- fi
- : ${lirc_device_count:=0}
- ((lirc_device_count++))
-
- elog "Compiling support for ${desc}"
-
- if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
- if linux_chkconfig_present LIRC ; then
- ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
- fi
- if ! linux_chkconfig_present MODULE_UNLOAD ; then
- ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
- ewarn "You will need MODULE_UNLOAD support in your kernel."
- fi
- fi
- if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
- ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
- fi
-
- if [[ ${lirc_device_count} -eq 2 ]] ; then
- ewarn
- ewarn "LIRC_DEVICES has more than one entry."
- ewarn "When selecting multiple devices for lirc to be supported,"
- ewarn "it can not be guaranteed that the drivers play nice together."
- ewarn "If this is not intended, then please adjust LIRC_DEVICES"
- ewarn "and re-emerge."
- ewarn
- fi
-
- MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
- if [[ -n "${LIRC_OPTS}" ]] ; then
- ewarn
- ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
- ewarn
- ewarn "Please use LIRC_DEVICES from now on."
- ewarn "e.g. LIRC_DEVICES=\"serial sir\""
- ewarn
- ewarn "Flags are now set per use-flags."
- ewarn "e.g. transmitter, hardware-carrier"
-
- local opt
- local unsupported_opts=""
-
- # test for allowed options for LIRC_OPTS
- for opt in ${LIRC_OPTS}; do
- case ${opt} in
- --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
- MY_OPTS="${MY_OPTS} ${opt}"
- ;;
- *)
- unsupported_opts="${unsupported_opts} ${opt}"
- ;;
- esac
- done
- if [[ -n ${unsupported_opts} ]]; then
- eerror "These options are no longer allowed to be set"
- eerror "with LIRC_OPTS: ${unsupported_opts}"
- die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
- fi
- fi
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- # set default configure options
- MY_OPTS=""
- LIRC_DRIVER_DEVICE="/dev/lirc0"
-
- if use lirc_devices_all; then
- # compile in drivers for a lot of devices
- add_device all "a lot of devices"
- else
- # compile in only requested drivers
- local dev
- for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
- if use lirc_devices_${dev}; then
- add_device ${dev}
- fi
- done
-
- if use lirc_devices_remote_wonder_plus; then
- add_device atiusb "device Remote Wonder Plus (atiusb-based)"
- fi
-
- if use lirc_devices_serial_igor_cesko; then
- add_device serial "serial with Igor Cesko design"
- MY_OPTS="${MY_OPTS} --with-igor"
- fi
-
- if use lirc_devices_imon_pad; then
- ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
- ewarn "and removed the pad2keys_active option for the lirc_imon module"
- ewarn "because it is always active."
- ewarn "If you have an older imon VFD device, you may need to add the module"
- ewarn "option display_type=1 to override autodetection and force VFD mode."
- fi
-
- if use lirc_devices_xboxusb; then
- add_device atiusb "device xboxusb"
- fi
-
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
- if [[ "${MY_OPTS}" == "" ]]; then
- if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
- # on xbox: use special driver
- add_device atiusb "device xboxusb"
- else
- # no driver requested
- elog
- elog "Compiling only the lirc-applications, but no drivers."
- elog "Enable drivers with LIRC_DEVICES if you need them."
- MY_OPTS="--with-driver=none"
- fi
- fi
- fi
-
- use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
- use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
- einfo
- einfo "lirc-configure-opts: ${MY_OPTS}"
- elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
- filter-flags -Wl,-O1
-}
-
-src_prepare() {
- # Rip out dos CRLF
- edos2unix contrib/lirc.rules
-
- # Apply patches needed for some special device-types
- use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
- use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
- # Apply fixes for kernel-2.6.39 and above
- epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
- # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
- # for bug 377033
- epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
- # Apply fixes for kernel-3.3 and above (bug 439538)
- epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
- # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
- epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
- # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
- epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
- # Add support for zotac remote, bug 342848
- epatch "${FILESDIR}"/${P}-add-zotac-support.patch
-
- # Do not build drivers from the top-level Makefile
- sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
- # remove parallel driver on SMP systems
- if linux_chkconfig_present SMP ; then
- sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
- fi
-
- # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
- if use lirc_devices_all && kernel_is ge 2 6 22 ; then
- ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
- sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
- fi
-
- # respect CFLAGS
- sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
- # setting default device-node
- local f
- for f in configure.ac acconfig.h; do
- [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
- done
- echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-syslog=LOG_DAEMON \
- --enable-sandboxed \
- --with-kerneldir="${KV_DIR}" \
- --with-moduledir="/lib/modules/${KV_FULL}/misc" \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_with X x) \
- ${MY_OPTS} \
- ABI="${KERNEL_ABI}" \
- ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
- # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
- emake -j1
-
- MODULE_NAMES="lirc(misc:${S}/drivers)"
- BUILD_TARGETS="all"
- linux-mod_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake -C drivers DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
- newinitd "${FILESDIR}"/lircmd lircmd
- newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
- insinto /etc/modprobe.d/
- newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
- newconfd "${FILESDIR}"/irexec-confd irexec
-
- if use doc ; then
- dohtml doc/html/*.html
- insinto /usr/share/doc/${PF}/images
- doins doc/images/*
- fi
-
- insinto /usr/share/lirc/remotes
- doins -r remotes/*
-
- keepdir /etc/lirc
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
- fi
-
- use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
-
- local dir="${EROOT}/etc/modprobe.d"
- if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
- elog "Renaming ${dir}/lirc to lirc.conf"
- mv -f "${dir}/lirc" "${dir}/lirc.conf"
- fi
-
- # copy the first file that can be found
- if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
- MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
- cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- fi
-
- # stop portage from touching the config file
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- rm -f "${D}"/etc/lirc/lircd.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # copy config file to new location
- # without portage knowing about it
- # so it will not delete it on unmerge or ever touch it again
- if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
- if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
- elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT}"/etc/lircd.conf
- fi
- fi
-
- einfo "The new default location for lircd.conf is inside of"
- einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.0-r4.ebuild b/app-misc/lirc/lirc-0.9.0-r4.ebuild
deleted file mode 100644
index 21d77903413d..000000000000
--- a/app-misc/lirc/lirc-0.9.0-r4.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-mod linux-info toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-MY_P=${PN}-${PV/_/}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
- SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
- SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug doc hardware-carrier transmitter static-libs X"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libSM
- x11-libs/libICE
- )
- lirc_devices_alsa_usb? ( media-libs/alsa-lib )
- lirc_devices_audio? ( >media-libs/portaudio-18 )
- lirc_devices_irman? ( media-libs/libirman )"
-
-# 2012-07-17, Ian Stakenvicius
-# A helper script that scrapes out values for nearly all of the variables below
-# from lirc's configure.ac is available at
-# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh
-
-# This are drivers with names matching the
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_DIRECT="
- all userspace accent act200l act220l
- adaptec alsa_usb animax asusdh atilibusb
- atiusb audio audio_alsa avermedia avermedia_vdomate
- avermedia98 awlibusb bestbuy bestbuy2 breakoutbox
- bte bw6130 caraca chronos commandir
- cph06x creative creative_infracd
- devinput digimatrix dsp dvico ea65 ene0100
- exaudio flyvideo ftdi gvbctv5pci hauppauge
- hauppauge_dvb hercules_smarttv_stereo i2cuser
- igorplugusb iguanaIR imon imon_24g imon_knob
- imon_lcd imon_pad imon_rsc irdeo irdeo_remote
- irlink irman irreal it87 ite8709
- knc_one kworld leadtek_0007 leadtek_0010
- leadtek_pvr2000 livedrive_midi
- livedrive_seq logitech macmini
- mediafocusI mouseremote
- mouseremote_ps2 mp3anywhere mplay nslu2
- packard_bell parallel pcmak pcmak_usb
- pctv pixelview_bt878 pixelview_pak
- pixelview_pro provideo realmagic
- remotemaster sa1100 samsung sasem sb0540 serial
- silitek sir slinke streamzap tekram
- tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
- uirt2_raw usb_uirt_raw usbx wpc8769l zotac"
-
-# drivers that need special handling and
-# must have another name specified for
-# parameter --with-driver=NAME
-IUSE_LIRC_DEVICES_SPECIAL="
- serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
-
-IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
-
-# The following are lists which are used to provide ewarns on incompatibilities
-# with the kernel:
-
-#drivers that do not build kernel modules
-NO_KMOD_BUILT_FOR_DEV="
- accent bte creative creative_infracd devinput dsp ea65 exaudio
- ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech
- mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2
- pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw
- tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx"
-
-#drivers that build lirc_dev and so will conflict with kernel lirc_dev
-LIRCDEV_BUILT_FOR_DEV="all
- act200l act220l adaptec animax atiusb breakoutbox hauppauge
- hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g
- imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one
- leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878
- provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir
- tvbox wpc8769l zotac"
-
-#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22
-LIRC_GPIO_DEV="
- avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos
- cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010
- pixelview_pak pixelview_pro"
-
-#device-driver which use libusb
-LIBUSB_USED_BY_DEV="
- all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
- imon_rsc streamzap xboxusb irlink commandir"
-
-for dev in ${LIBUSB_USED_BY_DEV}; do
- DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )"
-done
-
-# adding only compile-time depends
-DEPEND="${RDEPEND} ${DEPEND}
- virtual/linux-sources
- lirc_devices_ftdi? ( dev-embedded/libftdi )
- lirc_devices_all? ( dev-embedded/libftdi )"
-
-# adding only run-time depends
-RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
- lirc_devices_inputlirc? ( app-misc/inputlircd )
- lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
-
-# add all devices to IUSE
-# and ensure lirc_devices_all is not set alongside lirc_devices_*
-REQUIRED_USE="lirc_devices_all? ("
-for dev in ${IUSE_LIRC_DEVICES}; do
- IUSE="${IUSE} lirc_devices_${dev}"
- if [[ "${dev}" != "all" ]]; then
- REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}"
- fi
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-add_device() {
- local dev="${1}"
- local desc="device ${dev}"
- if [[ -n "${2}" ]]; then
- desc="${2}"
- fi
-
- # Bug #187418
- if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then
- eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building."
- eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers"
- return 0
- fi
- : ${lirc_device_count:=0}
- ((lirc_device_count++))
-
- elog "Compiling support for ${desc}"
-
- if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then
- if linux_chkconfig_present LIRC ; then
- ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict."
- fi
- if ! linux_chkconfig_present MODULE_UNLOAD ; then
- ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel."
- ewarn "You will need MODULE_UNLOAD support in your kernel."
- fi
- fi
- if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then
- ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel."
- fi
-
- if [[ ${lirc_device_count} -eq 2 ]] ; then
- ewarn
- ewarn "LIRC_DEVICES has more than one entry."
- ewarn "When selecting multiple devices for lirc to be supported,"
- ewarn "it can not be guaranteed that the drivers play nice together."
- ewarn "If this is not intended, then please adjust LIRC_DEVICES"
- ewarn "and re-emerge."
- ewarn
- fi
-
- MY_OPTS="${MY_OPTS} --with-driver=${dev}"
-}
-
-pkg_pretend() {
- if [[ -n "${LIRC_OPTS}" ]] ; then
- ewarn
- ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
- ewarn
- ewarn "Please use LIRC_DEVICES from now on."
- ewarn "e.g. LIRC_DEVICES=\"serial sir\""
- ewarn
- ewarn "Flags are now set per use-flags."
- ewarn "e.g. transmitter, hardware-carrier"
-
- local opt
- local unsupported_opts=""
-
- # test for allowed options for LIRC_OPTS
- for opt in ${LIRC_OPTS}; do
- case ${opt} in
- --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
- MY_OPTS="${MY_OPTS} ${opt}"
- ;;
- *)
- unsupported_opts="${unsupported_opts} ${opt}"
- ;;
- esac
- done
- if [[ -n ${unsupported_opts} ]]; then
- eerror "These options are no longer allowed to be set"
- eerror "with LIRC_OPTS: ${unsupported_opts}"
- die "LIRC_OPTS is no longer supported, use LIRC_DEVICES."
- fi
- fi
-}
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- # set default configure options
- MY_OPTS=""
- LIRC_DRIVER_DEVICE="/dev/lirc0"
-
- if use lirc_devices_all; then
- # compile in drivers for a lot of devices
- add_device all "a lot of devices"
- else
- # compile in only requested drivers
- local dev
- for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
- if use lirc_devices_${dev}; then
- add_device ${dev}
- fi
- done
-
- if use lirc_devices_remote_wonder_plus; then
- add_device atiusb "device Remote Wonder Plus (atiusb-based)"
- fi
-
- if use lirc_devices_serial_igor_cesko; then
- add_device serial "serial with Igor Cesko design"
- MY_OPTS="${MY_OPTS} --with-igor"
- fi
-
- if use lirc_devices_imon_pad; then
- ewarn "The imon_pad driver has incorporated the previous pad2keys patch"
- ewarn "and removed the pad2keys_active option for the lirc_imon module"
- ewarn "because it is always active."
- ewarn "If you have an older imon VFD device, you may need to add the module"
- ewarn "option display_type=1 to override autodetection and force VFD mode."
- fi
-
- if use lirc_devices_xboxusb; then
- add_device atiusb "device xboxusb"
- fi
-
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
- if [[ "${MY_OPTS}" == "" ]]; then
- if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
- # on xbox: use special driver
- add_device atiusb "device xboxusb"
- else
- # no driver requested
- elog
- elog "Compiling only the lirc-applications, but no drivers."
- elog "Enable drivers with LIRC_DEVICES if you need them."
- MY_OPTS="--with-driver=none"
- fi
- fi
- fi
-
- use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
- use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
-
- einfo
- einfo "lirc-configure-opts: ${MY_OPTS}"
- elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
-
- filter-flags -Wl,-O1
-}
-
-src_prepare() {
- # Rip out dos CRLF
- edos2unix contrib/lirc.rules
-
- # Apply patches needed for some special device-types
- use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
- use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
-
- # Apply fixes for kernel-2.6.39 and above
- epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
- # Slightly massaged upstream patch to fix kfifo issues >=2.6.38
- # for bug 377033
- epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
- # Apply fixes for kernel-3.3 and above (bug 439538)
- epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
- # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
- epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
- # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
- epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
- # Add support for zotac remote, bug 342848
- epatch "${FILESDIR}"/${P}-add-zotac-support.patch
- # Use fixed font
- epatch "${FILESDIR}"/${P}-fixed-font.patch
-
- # Do not build drivers from the top-level Makefile
- sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
-
- # remove parallel driver on SMP systems
- if linux_chkconfig_present SMP ; then
- sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
- fi
-
- # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup
- if use lirc_devices_all && kernel_is ge 2 6 22 ; then
- ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
- sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
- fi
-
- # respect CFLAGS
- sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
-
- # setting default device-node
- local f
- for f in configure.ac acconfig.h; do
- [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f"
- done
- echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
-
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-syslog=LOG_DAEMON \
- --enable-sandboxed \
- --with-kerneldir="${KV_DIR}" \
- --with-moduledir="/lib/modules/${KV_FULL}/misc" \
- $(use_enable debug) \
- $(use_enable static-libs static) \
- $(use_with X x) \
- ${MY_OPTS} \
- ABI="${KERNEL_ABI}" \
- ARCH="$(tc-arch-kernel)"
-}
-
-src_compile() {
- # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
- emake -j1
-
- MODULE_NAMES="lirc(misc:${S}/drivers)"
- BUILD_TARGETS="all"
- linux-mod_src_compile
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake -C drivers DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
- newinitd "${FILESDIR}"/lircmd lircmd
- newconfd "${FILESDIR}"/lircd.conf.4 lircd
-
- insinto /etc/modprobe.d/
- newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
- newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec
- newconfd "${FILESDIR}"/irexec-confd irexec
-
- if use doc ; then
- dohtml doc/html/*.html
- insinto /usr/share/doc/${PF}/images
- doins doc/images/*
- fi
-
- insinto /usr/share/lirc/remotes
- doins -r remotes/*
-
- keepdir /etc/lirc
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
- fi
-
- use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
-}
-
-pkg_preinst() {
- linux-mod_pkg_preinst
-
- local dir="${EROOT}/etc/modprobe.d"
- if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
- elog "Renaming ${dir}/lirc to lirc.conf"
- mv -f "${dir}/lirc" "${dir}/lirc.conf"
- fi
-
- # copy the first file that can be found
- if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
- cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf
- MOVE_OLD_LIRCD_CONF=1
- elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
- cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf
- fi
-
- # stop portage from touching the config file
- if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
- rm -f "${D}"/etc/lirc/lircd.conf
- fi
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- # copy config file to new location
- # without portage knowing about it
- # so it will not delete it on unmerge or ever touch it again
- if [[ -e "${T}"/lircd.conf ]]; then
- cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf
- if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
- elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
- rm -f "${EROOT}"/etc/lircd.conf
- fi
- fi
-
- einfo "The new default location for lircd.conf is inside of"
- einfo "/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.9.0-r5.ebuild b/app-misc/lirc/lirc-0.9.0-r5.ebuild
index 2dbb03577684..52f34f0b4d51 100644
--- a/app-misc/lirc/lirc-0.9.0-r5.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r5.ebuild
@@ -72,7 +72,7 @@ IUSE_LIRC_DEVICES_DIRECT="
# parameter --with-driver=NAME
IUSE_LIRC_DEVICES_SPECIAL="
serial_igor_cesko
- remote_wonder_plus xboxusb usbirboy inputlirc"
+ remote_wonder_plus xboxusb inputlirc"
IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
@@ -119,7 +119,6 @@ DEPEND="${RDEPEND} ${DEPEND}
# adding only run-time depends
RDEPEND="${RDEPEND}
- lirc_devices_usbirboy? ( app-misc/usbirboy )
lirc_devices_inputlirc? ( app-misc/inputlircd )
lirc_devices_iguanaIR? ( app-misc/iguanaIR )"
@@ -251,11 +250,6 @@ pkg_setup() {
add_device atiusb "device xboxusb"
fi
- if use lirc_devices_usbirboy; then
- add_device userspace "device usbirboy"
- LIRC_DRIVER_DEVICE="/dev/usbirboy"
- fi
-
if [[ "${MY_OPTS}" == "" ]]; then
if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
# on xbox: use special driver
diff --git a/app-misc/taskd/taskd-1.1.0-r1.ebuild b/app-misc/taskd/taskd-1.1.0-r1.ebuild
index 643b1551d4a7..902341923efb 100644
--- a/app-misc/taskd/taskd-1.1.0-r1.ebuild
+++ b/app-misc/taskd/taskd-1.1.0-r1.ebuild
@@ -64,7 +64,7 @@ src_install() {
newins "${FILESDIR}"/taskd.logrotate taskd
}
-pkg_preinst() {
+pkg_setup() {
enewgroup taskd
enewuser taskd -1 -1 /var/lib/taskd taskd
}
diff --git a/app-text/epubcheck/Manifest b/app-text/epubcheck/Manifest
index 39f814b071cb..e69de29bb2d1 100644
--- a/app-text/epubcheck/Manifest
+++ b/app-text/epubcheck/Manifest
@@ -1 +0,0 @@
-DIST epubcheck-src-1.1.zip 2442421 SHA256 f9db760358b34d9d98d243156e38f905e0f8735d26b8bf3550e3b108f2436be9 SHA512 4ba5fbb149a071c1dfed97ab00500afabb0690eb081967203e8ae6691b3ab9d676bf0a4cb29c5cf203db253a8e7a4c1bfccbd07b2ee377ec02656ba378a6d252 WHIRLPOOL 4e98ab1b4c2ef3412bc0109876d84ad4b9a212b7718d8ea60214ca8521571b6c068ca6bbb62e371e2558e199ebe8003b517413881e0a59574ab14e2e5452baee
diff --git a/app-text/epubcheck/epubcheck-1.1.ebuild b/app-text/epubcheck/epubcheck-1.1.ebuild
deleted file mode 100644
index cbec5745752d..000000000000
--- a/app-text/epubcheck/epubcheck-1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Tool to validate IDPF EPUB files"
-HOMEPAGE="https://github.com/IDPF/epubcheck"
-SRC_URI="https://${PN}.googlecode.com/files/${PN}-src-${PV}.zip"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/jigsaw:0
- dev-java/saxon:6.5"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- rm -f lib/*.jar
-
- java-pkg_jar-from --into lib/ jigsaw
- java-pkg_jar-from --into lib/ saxon-6.5
-
- cd lib/
- ln -s $(java-config --tools)
-}
-
-src_compile() {
- eant buildJar
-}
-
-src_test() {
- java -cp "$(java-pkg_getjars jigsaw,saxon-6.5):dist/${P}.jar" \
- com.adobe.epubcheck.autotest.AutoTest testdocs/general/tests.xml testdocs/general/ \
- || die "tests failed"
-}
-
-src_install() {
- java-pkg_newjar dist/${P}.jar ${PN}.jar
-
- java-pkg_dolauncher ${PN} --main com.adobe.epubcheck.tool.Checker
-
- dodoc README.txt
-}
diff --git a/app-text/epubcheck/metadata.xml b/app-text/epubcheck/metadata.xml
deleted file mode 100644
index fc4e4eb003bf..000000000000
--- a/app-text/epubcheck/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- flameeyes@gentoo.org
-
-
- IDPF/epubcheck
-
-
diff --git a/dev-java/css-validator/Manifest b/dev-java/css-validator/Manifest
index 7b915f8943af..e69de29bb2d1 100644
--- a/dev-java/css-validator/Manifest
+++ b/dev-java/css-validator/Manifest
@@ -1 +0,0 @@
-DIST css-validator-20120222.tar.bz2 27482733 SHA256 41c80ccc808c20e4f66d493ed365c9be9f77e787f5c0f5f3ba7060c520bac207 SHA512 a7f392028cdf5a8befa95b7c2b7bc4f832cc9212c9ec92d3021e357ca41f48464c6944ec0ecf7105d924dbb07c80c0c1b7b97191c7e9496ca30253e0329da02d WHIRLPOOL 291ed5f7f401f87d70e20d39f947038adbb9d0097023b8e30af14a3fd576d5981c5be35340294ca29e64721823de90436fb429ecf1d556ac7e57941d9a29d158
diff --git a/dev-java/css-validator/css-validator-20120222.ebuild b/dev-java/css-validator/css-validator-20120222.ebuild
deleted file mode 100644
index 7f4d8ac04703..000000000000
--- a/dev-java/css-validator/css-validator-20120222.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-# How to create the release tarball:
-# $ export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public"
-# $ cvs login
-# $ cvs get 2002/css-validator
-# $ cd 2002
-# $ tar jcf css-validator-$(date "+%Y%m%d") css-validator --exclude=CVS
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets"
-HOMEPAGE="http://jigsaw.w3.org/css-validator/DOWNLOAD.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="java-virtuals/servlet-api:2.5
- dev-java/velocity
- dev-java/commons-lang:2.1
- dev-java/tagsoup
- dev-java/jigsaw
- dev-java/xerces:2
- dev-java/htmlparser
- "
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-EANT_BUILD_TARGET="jar war"
-EANT_DOC_TARGET="javadoc"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- rm -f tmp/*.jar
- mkdir -p "${S}/lib" || die "mkdir failed"
-
- epatch "${FILESDIR}/${P}-build.xml.patch"
-
- java-pkg_jarfrom --into lib/ servlet-api-2.5
- java-pkg_jarfrom --into lib/ velocity
- java-pkg_jarfrom --into lib/ commons-lang-2.1
- java-pkg_jarfrom --into lib/ tagsoup
- java-pkg_jarfrom --into lib/ jigsaw
- java-pkg_jarfrom --into lib/ xerces-2
- java-pkg_jarfrom --into lib/ htmlparser
-}
-
-src_install() {
- java-pkg_dojar "${PN}.jar"
-
- use source && java-pkg_dosrc org
- if use doc; then
- java-pkg_dojavadoc javadoc
-
- insinto "/usr/share/${PN}"
- doins "${PN}.war"
- einfo "Documentation for ${PN} has been installed as:"
- einfo " /usr/share/${PN}/${PN}.war"
- einfo "You need to deploy this file using one of:"
- einfo " * www-servers/tomcat"
- einfo " * www-servers/resin"
- fi
-}
diff --git a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch b/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
deleted file mode 100644
index faedcd04396c..000000000000
--- a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: build.xml
-===================================================================
-RCS file: /sources/public/2002/css-validator/build.xml,v
-retrieving revision 1.23
-diff -u -r1.23 build.xml
---- build.xml 1 Nov 2011 07:51:20 -0000 1.23
-+++ build.xml 22 Feb 2012 23:57:47 -0000
-@@ -75,10 +75,10 @@
-
-
-
--
-+
-
-
-+ includes="org/w3c/**" srcdir="."/>
-
-
-
-@@ -91,7 +91,7 @@
-
-
-
-+ >
-
-
-
-@@ -99,6 +99,7 @@
-
-
- =virtual/jdk-1.6
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND="
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+RDEPEND="
+ >=virtual/jre-1.6"
java_prepare() {
- find "${WORKDIR}" -name '*.jar' -print -delete || die
+ java-pkg_clean
}
src_compile() {
diff --git a/dev-java/jigsaw/Manifest b/dev-java/jigsaw/Manifest
index 81940823e23f..e69de29bb2d1 100644
--- a/dev-java/jigsaw/Manifest
+++ b/dev-java/jigsaw/Manifest
@@ -1 +0,0 @@
-DIST jigsaw_2.2.6.tar.bz2 4674802 SHA256 9d0b177c6e2bc07aff91648270ef09e50d3fc2fee0ce87940e29b43695265342 SHA512 99fb362468b13d250d4e5fe33e0dc397b3bd6a98e3c012da10bfdef93511bdf5ae7c0ad3498bbd191b6c07cc658ce55d3737721fdec8f474470cbfc66c4e049a WHIRLPOOL df879de51a084a187a1172212157c486192c5af891be4ebf3c721340bd28cfd78618349bfc0573ee334e54efc87fb170c4257f0263024afd1fc6624f80985020
diff --git a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch b/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
deleted file mode 100644
index d0225de839b8..000000000000
--- a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- build.xml.vanilla 2012-02-23 01:17:09.137602588 +0100
-+++ build.xml 2012-02-23 01:21:35.431836983 +0100
-@@ -79,6 +79,9 @@
-
-
-
-+
-+
-+
-
-
-
-@@ -99,6 +102,7 @@
-
-
-
-
-
-
-
--
-
- =virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.6"
-
-EANT_DOC_TARGET="javadocs"
-
-S="${WORKDIR}/Jigsaw"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.xml.patch"
-)
-
-java_prepare() {
- epatch "${PATCHES[@]}"
-
- java-pkg_clean
-
- mkdir -p "${S}/jars" || die "mkdir failed"
-
- java-pkg_jar-from --into jars/ jakarta-oro-2.0
- java-pkg_jar-from --into jars/ servlet-api-2.3
- java-pkg_jar-from --into jars/ xerces-2
- java-pkg_jar-from --into jars/ jtidy
-
- cd "${S}/jars" || die
- ln -s $(java-config --tools) || die
-}
-
-src_install() {
- java-pkg_dojar classes/{jigsaw,jigadmin,jigedit}.jar
-
- dodoc ANNOUNCE README
- use doc && java-pkg_dojavadoc ant.build/javadocs
-}
diff --git a/dev-java/jpf/Manifest b/dev-java/jpf/Manifest
index 64718e7683ac..e69de29bb2d1 100644
--- a/dev-java/jpf/Manifest
+++ b/dev-java/jpf/Manifest
@@ -1 +0,0 @@
-DIST jpf-src-1.5.1.zip 1115573 SHA256 93bc9852b9d86f788f5e3c53650aa11a18758526542e0ebc17a508818e91c2e4 SHA512 90326013b110f5729e25bde3f61985f7bee9f78c58ebc3631c271c3d02fc7e91851adf3aa79de71b8e1a1411a2d3b67ba8e4e13f55c9332505ea2adbbc00149b WHIRLPOOL 8530c8e01e034dcc4a642d6756d1bbf48572ed7dc15548bdd448847c661acfc80b6cc1d60f8bf147aab7e314114d077b6924768cfe2e2e7b04b371f3aacb5d52
diff --git a/dev-java/jpf/jpf-1.5.1.ebuild b/dev-java/jpf/jpf-1.5.1.ebuild
deleted file mode 100644
index 6f637194ccb8..000000000000
--- a/dev-java/jpf/jpf-1.5.1.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=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Plugin Framework - a runtime engine that dynamically discovers and loads plugins"
-HOMEPAGE="http://${PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-LICENSE="LGPL-2.1"
-
-SLOT="1.5"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-COMMON_DEP="dev-java/commons-logging:0
- dev-java/ant-core"
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.5
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- java-ant_rewrite-classpath
- rm -fv lib/*.jar || die
- # needs some not yet packaged jxp dep, will add only on demand
- rm -rfv source-tools/org/java/plugin/tools/{docgen,ant/DocTask.java} || die
-}
-
-# doc target is name="-javadoc" and would need a patch, on demand
-EANT_GENTOO_CLASSPATH="commons-logging,ant-core"
-
-src_install() {
- java-pkg_dojar build/lib/jpf*.jar
- java-pkg_register-ant-task
-
- newdoc README.txt README || die
- dodoc changelog.txt || die
-}
diff --git a/dev-java/jpf/metadata.xml b/dev-java/jpf/metadata.xml
deleted file mode 100644
index 9c3dfc5d5f17..000000000000
--- a/dev-java/jpf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- java
-
- jpf
-
-
diff --git a/dev-java/jpfcodegen/Manifest b/dev-java/jpfcodegen/Manifest
index a6157e49a569..e69de29bb2d1 100644
--- a/dev-java/jpfcodegen/Manifest
+++ b/dev-java/jpfcodegen/Manifest
@@ -1 +0,0 @@
-DIST jpfcodegen-0.4.tar.bz2 27201 SHA256 c88401b6d872bf52aeb473bda16a77fb51b2f0236a4fb88ba4847d1bde174699 SHA512 9af5de54621afc941ac56f463b76a31732d97ad4fbbeabf43772c27e91f0e8fdfe5c089fc1cd22b2ad0bbac88d624086c94d751110bc77348706b39cedd45897 WHIRLPOOL c7005df485de6694658444cabdbcfa5ce20b35fe563f253a5b213801e98ee19eae48087df688281edc5ffd6f99eb481478ade568c2da3fc49287ac7e6795fe49
diff --git a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild b/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
deleted file mode 100644
index cdecabd733e9..000000000000
--- a/dev-java/jpfcodegen/jpfcodegen-0.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Generator of classes for accessing the attributes and extensions of JPF plug-ins"
-HOMEPAGE="http://jabref.sourceforge.net/"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="LGPL-3"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-CDEPEND="dev-java/velocity:0
- dev-java/jpf:1.5"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-# doc target is name="-javadoc" and would need a patch, on demand
-EANT_BUILD_TARGET="jars"
-EANT_GENTOO_CLASSPATH="jpf-1.5,velocity"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_install() {
- java-pkg_newjar JPFCodeGenerator-${PV}.jar JPFCodeGenerator.jar
- java-pkg_newjar JPFCodeGenerator-${PV}-rt.jar JPFCodeGenerator-rt.jar
- dohtml index.html
-}
diff --git a/dev-java/jpfcodegen/metadata.xml b/dev-java/jpfcodegen/metadata.xml
deleted file mode 100644
index 3a6d059d80ca..000000000000
--- a/dev-java/jpfcodegen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- java
-
- jabref
-
-
diff --git a/dev-java/mg4j/Manifest b/dev-java/mg4j/Manifest
index dc337235c28f..e69de29bb2d1 100644
--- a/dev-java/mg4j/Manifest
+++ b/dev-java/mg4j/Manifest
@@ -1 +0,0 @@
-DIST mg4j-0.9.1-src.tar.gz 169529 SHA256 8ca5c99facd9be71af57f0e71f746e83af98018774afe37d2a7a83aa356dc828 SHA512 b9831ed28360836a1828011bd9bf6474303f2125e1643fcb600a14aa8851468785d60739f85c1cfd9762e1744765a17827b334f194169786f54419d6b1f711c3 WHIRLPOOL 43fb4f7b8b786f66aa84b86cdcdcb758e9da727a5c88c0fb6f755c71a450f671be80901c1b5bde4486dab4a8621f0aa8f75c59bacf59b5c1a54b68b81c624759
diff --git a/dev-java/mg4j/files/mg4j-build.patch b/dev-java/mg4j/files/mg4j-build.patch
deleted file mode 100644
index eef1c4878cbb..000000000000
--- a/dev-java/mg4j/files/mg4j-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -uprN mg4j-0.9.orig/build.xml mg4j-0.9/build.xml
---- mg4j-0.9.orig/build.xml 2004-09-01 12:04:18.000000000 +0200
-+++ mg4j-0.9/build.xml 2004-11-17 00:30:41.879119728 +0100
-@@ -39,25 +39,34 @@
- includes="it/unimi/dsi/mg4j/query/parser/**"
- nowarn="on"
- debug="on"
-- optimize="on"
-+ optimize="on"
- destdir="${build}"
-- source="1.4"
-- />
-+ source="1.4"
-+ target="1.4">
-+
-+
-+
-+
-+
-
-
-
-
-+ source="1.4"
-+ target="1.4">
-+
-+
-+
-+
-+
-
-
-
-
-+ basedir="${build}" />
-
-
-
-@@ -69,8 +78,7 @@
- sourcepath="${src}"
- private="off"
- source="1.4"
-- windowtitle="MG4J ${version}"
-- >
-+ windowtitle="MG4J ${version}">
-
-
-
diff --git a/dev-java/mg4j/metadata.xml b/dev-java/mg4j/metadata.xml
deleted file mode 100644
index 0aca2297599c..000000000000
--- a/dev-java/mg4j/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-java
-
-
-
-MG4J (Managing Gigabytes for Java) is a collaborative effort aimed at providing
-a free Java implementation of inverted-index compression techniques; as a
-by-product, it offers several general-purpose optimised classes, including fast
-& compact mutable strings, bit-level I/O, fast unsychronised buffered
-streams, (possibly signed) minimal perfect hashing for very large strings
-collections, etc.
-
-
-
diff --git a/dev-java/mg4j/mg4j-0.9.1-r2.ebuild b/dev-java/mg4j/mg4j-0.9.1-r2.ebuild
deleted file mode 100644
index 9c00faf44f3b..000000000000
--- a/dev-java/mg4j/mg4j-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A free Java implementation of inverted-index compression technique"
-SRC_URI="http://mg4j.dsi.unimi.it/${P}-src.tar.gz"
-HOMEPAGE="http://mg4j.dsi.unimi.it"
-
-LICENSE="LGPL-2.1"
-SLOT="0.9"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-COMMON_DEP="
- dev-java/colt:0
- dev-java/fastutil:4.3
- dev-java/jal:0
- dev-java/java-getopt:1
- dev-java/libreadline-java:0"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- dev-java/javacc:0"
-
-java_prepare() {
- epatch "${FILESDIR}/mg4j-build.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="colt,fastutil-4.3,jal,java-getopt-1,libreadline-java"
-
-src_install() {
- java-pkg_newjar ${P}.jar
-
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc java/it
-}
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index 958338365cf0..074e7eeaeab8 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1 +1,2 @@
DIST javamail-1.5.2-src.zip 1573447 SHA256 76efde22a38a021baa99087be1878787bf5e72ceb684b1bc33eb260a8ddcbdd5 SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc WHIRLPOOL 6c438c6569cbd689eeaa8398301b5481956443ccb9f2112891bce5e97d1a792e0176e8fb395cbadd4175e87c253db833760aff96ea61654dad3d478d386fbf7b
+DIST oracle-javamail-1.5.5.zip 1794428 SHA256 33d0b71714931b586bbb61367fd6491f7c100b9ddca597a62e51e5d5ac308bd8 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a WHIRLPOOL 363c62731b924ed8f48a60382ccb853789c1d0645ef77f1fe9370283d58acb3e74aa311e7e72512f80f97598c33050426865178a93d22aaf882c19581af8c241
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
new file mode 100644
index 000000000000..845cbb06b576
--- /dev/null
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Java-based framework to build multiplatform mail and messaging applications"
+HOMEPAGE="https://java.net/projects/javamail/pages/Home"
+SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-${PV}-src.zip -> ${P}.zip"
+
+# either of these
+LICENSE="CDDL GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ default
+
+ # build.xml expects it here
+ mkdir -p legal/src/main/resources/META-INF || die
+ cp mail/src/main/resources/META-INF/LICENSE.txt \
+ legal/src/main/resources/META-INF || die
+}
+
+EANT_DOC_TARGET="docs"
+EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
+
+src_install() {
+ java-pkg_dojar target/release/mail.jar
+
+ dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
+ dohtml -r doc/release/{*.html,images} || die
+
+ use doc && java-pkg_dojavadoc target/release/docs/javadocs
+ use source && java-pkg_dosrc mail/src/main/java
+}
diff --git a/dev-java/webgraph/Manifest b/dev-java/webgraph/Manifest
index 8e03d8d80f33..e69de29bb2d1 100644
--- a/dev-java/webgraph/Manifest
+++ b/dev-java/webgraph/Manifest
@@ -1 +0,0 @@
-DIST webgraph-1.4.1-src.tar.gz 55467 SHA256 a91402ae46c60234f8234a9b05078feb7d23bfa12a68447ef410e24ceb4dc133 SHA512 6c7ae24ad1a3f05d547bd49b83446f42177d50b86db60815208a18fe86129dc1264c9c2d67f6992dd930333e7150b952e27d8cc510179fd362879c719900d5cb WHIRLPOOL 34ba6c65f7051a400eb2de07ff0eaec3cf20fe3b3cb10db927249a3ca269206be990cdb2018101c4695a77e5b8892f77ca18d25e1bd38b4b50d46c9dc30bd666
diff --git a/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch b/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
deleted file mode 100644
index a4ad2d262a15..000000000000
--- a/dev-java/webgraph/files/webgraph-1.4.1-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- build.xml.orig 2005-04-15 14:36:14.000000000 +0200
-+++ build.xml 2005-04-15 14:38:45.000000000 +0200
-@@ -19,6 +19,14 @@
-
-
-
-+
-+
-+
-+
-+
-+
-+
-+
- "
+ eerror " Block devices --->"
+ eerror " [ ] Loopback device support"
+ fi
+ fi
+ fi
+ fi
+
+}
+
+src_prepare() {
+ if [ ${PV} != "9999" ]
+ then
+ # Apply patch set
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/${P}-patches"
+ fi
+
+ # Update paths
+ sed -e "s|/sbin/lsmod|/bin/lsmod|" \
+ -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
+ -e "s|/sbin/parted|/usr/sbin/parted|" \
+ -i scripts/common.sh.in
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ use custom-cflags || strip-flags
+ local myeconfargs=(
+ --bindir="${EPREFIX}/bin"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=user
+ --with-dracutdir="/usr/$(get_libdir)/dracut"
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ --with-udevdir="$(get_udevdir)"
+ --with-blkid
+ $(use_enable debug)
+ )
+ autotools-utils_src_configure
+
+ # prepare systemd unit and helper script
+ cat "${FILESDIR}/zfs.service.in" | \
+ sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+ > "${T}/zfs.service" || die
+ cat "${FILESDIR}/zfs-init.sh.in" | \
+ sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+ -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+ > "${T}/zfs-init.sh" || die
+}
+
+src_install() {
+ autotools-utils_src_install
+ gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+ use test-suite || rm -rf "${ED}usr/share/zfs"
+
+ newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+ bashcomp_alias zfs zpool
+
+ exeinto /usr/libexec
+ doexe "${T}/zfs-init.sh"
+ systemd_dounit "${T}/zfs.service"
+}
+
+pkg_postinst() {
+ if ! use kernel-builtin && [ ${PV} = "9999" ]
+ then
+ einfo "Adding ${P} to the module database to ensure that the"
+ einfo "kernel modules and userland utilities stay in sync."
+ update_moduledb
+ fi
+
+ if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+ then
+ einfo 'The zfs boot script has been split into the zfs-import,'
+ einfo 'zfs-mount and zfs-share scripts.'
+ einfo
+ einfo 'You had the zfs script in your boot runlevel. For your'
+ einfo 'convenience, it has been automatically removed and the three'
+ einfo 'scripts that replace it have been configured to start.'
+ einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
+ einfo 'runlevel while the zfs-share script is in the default runlevel.'
+
+ rm "${EROOT}etc/runlevels/boot/zfs"
+ ln -snf "${EROOT}etc/init.d/zfs-import" \
+ "${EROOT}etc/runlevels/boot/zfs-import"
+ ln -snf "${EROOT}etc/init.d/zfs-mount" \
+ "${EROOT}etc/runlevels/boot/zfs-mount"
+ ln -snf "${EROOT}etc/init.d/zfs-share" \
+ "${EROOT}etc/runlevels/default/zfs-share"
+ else
+ [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+ einfo "You should add zfs-import to the boot runlevel."
+ [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+ einfo "You should add zfs-mount to the boot runlevel."
+ [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+ einfo "You should add zfs-share to the default runlevel."
+ fi
+
+ if [ -e "${EROOT}etc/runlevels/default/zed" ]
+ then
+ einfo 'The downstream OpenRC zed script has replaced by the upstream'
+ einfo 'OpenRC zfs-zed script.'
+ einfo
+ einfo 'You had the zed script in your default runlevel. For your'
+ einfo 'convenience, it has been automatically removed and the zfs-zed'
+ einfo 'script that replaced it has been configured to start.'
+
+ rm "${EROOT}etc/runlevels/boot/zed"
+ ln -snf "${EROOT}etc/init.d/zfs-sed" \
+ "${EROOT}etc/runlevels/default/zfs-zed"
+ else
+ [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+ einfo "You should add zfs-zed to the default runlevel."
+ fi
+
+ if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+ then
+ einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+ rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+ fi
+
+ einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and "
+ einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable "
+ einfo "/dev/zfs API developed by ClusterHQ. This means that situations "
+ einfo "arising from the kernel modules and userland tools being "
+ einfo "mismatched on future updates will not cause problems."
+ einfo
+ einfo "In specific, this should solve the failure to mount filesystems when "
+ einfo "old modules are cached in an old initramfs provided that those "
+ einfo "modules support this API"
+ if use rootfs
+ then
+ einfo
+ ewarn "The older modules will *NOT* work with the new userland code."
+ ewarn "It is very important that you update your initramfs after this "
+ ewarn "update."
+ fi
+}
+
+pkg_postrm() {
+ if ! use kernel-builtin && [ ${PV} = "9999" ]
+ then
+ remove_moduledb
+ fi
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index ea3c237a5f65..49261ca9d8be 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -1,7 +1,2 @@
-DIST libcxx-0.0_p20130725.tar.xz 833240 SHA256 16428d2a493d2f833bc695300f4fc4e2bfd756fa4eb8e0b7696af10ff5e82653 SHA512 756cb089dc6514125b53623a410039c0edc2fb56a734b7faabee018e073adb96a30f7413546ba42fb40dd815697f27735fbbb6bbcce2e7dea10d284a3ed394d3 WHIRLPOOL 329817e70c27e13d37d75d3d15f0b49375e59d660d784b2e174b059046090a2514d7ddd39ac8fc917da784899f7d394842e73f7c81301d4fdf9add74d259f086
-DIST libcxx-0.0_p20131222.tar.xz 872416 SHA256 d77b7555daa368a493a71c99d9d5868706cc3a66a4e37e002a860733407d21ee SHA512 d4466a4e66365d38c552813f9d4be251bbc956ca0f2800dcd08b3d5633e6bd1a48601016e0e63a92cb4cd2f7863b31ece0ce9b68f2de2c76cf457a7093920fec WHIRLPOOL 07acd16939694e2cfc946f8f021a2b8a4d4ae40dfe2128273a6e0c76b9a2ac8d9f2e6347d091861219044674ea02b76caf80b3f55f74e8e504c58fe96b19eb91
-DIST libcxx-0.0_p20140322.tar.xz 879256 SHA256 b5eae28ced378349e4b7ec6f2e944d0630213462159a0bb2393dc82b536d77d8 SHA512 a80cc3b47acdc1de1a24f5aad19ed0b2518529fe6e8d56cbbe6801874ea334dabd6cec38c27cccbaec961de69b731e22462f0faae30f371e3acb8ecd1b46b2b4 WHIRLPOOL 9374e2b717a3a00f3046f06920775a31403e36ee9a6c5049e4a50173eae947c5e4641dafd178e459ab3caf6dcad6c99baf37cd5587ebf8a3e2d021e18ac36793
-DIST libcxx-3.6.0.src.tar.xz 946380 SHA256 299c1e82b0086a79c5c1aa1885ea3be3bbce6979aaa9b886409b14f9b387fbb7 SHA512 fe16d129a4e2429677a2b87aa2da27fcb5331d6335a0b819ea67de6498e82293bc13661602baafabb56a7f0a4e8f304d468088b8d3e0b5d1c0d01976f7cf3e92 WHIRLPOOL 527b4d1c54e5d76d0958c6d8ac622be4cb7b1a2feb3a9f2d2efa09564ab8d2f8f8cb15a536b8390f80c327dc8b86fee4fcc0b3d7c3771b11ca64885505fb449a
-DIST libcxx-3.6.1.src.tar.xz 943756 SHA256 5a5c653becf3978d4c4f6095708660855bed691210a9426bb839eecd88b6c0f9 SHA512 96d7700ef1c15327b68e8865c2294a3455f09e166991d4465c45bf870fe2d9ce4ddc9af1cd52b900a8a6a9f89c096b9ee1b2c2af58b550f7bc224505eb04d8ea WHIRLPOOL e7eba2d69d679198725147845d2e92631294b27ab2eb73bc057f6851bffbae941fb2570d66bdc28a7382b69d7dc87558e12b730f87a7e9a54f9d149eea1209c9
-DIST libcxx-3.6.2.src.tar.xz 944020 SHA256 52f3d452f48209c9df1792158fdbd7f3e98ed9bca8ebb51fcd524f67437c8b81 SHA512 1eb575921ca0d636c4b7ba21b3ad2c09468d779c69b3106ceefde294344cf20a48a03f9d38ea0db9f8b909f56f0fd1a56a255101305318e04d9f2d20af358ba6 WHIRLPOOL ec225d10cbfe3ca5eba2ed5f16ac6c19914ee75d71db2a1d8ca30f326c9fd5576899361f4397f2ee5d09dd3e8abaca82080c63e303b90d6f19f755465a11a065
DIST libcxx-3.7.0.src.tar.xz 994580 SHA256 c18f3c8333cd7e678c1424a57fe5e25efe740ca7caf62ac67152b4723f3ad08e SHA512 e71d04efa0fafab129a97ca6f4fd7b5f185258de7455c7a25d0964f459bc6068c69c5d67199f6d7cd3541bdce630106cbaf3b7099e4737dddbdd57c77a3fe054 WHIRLPOOL 26672e3f6e0772504e7ee174c37e5fc20079c730ac8bd0d2563d5415ca9589360aa3be42a8aac15eb5a63c69227bd4911aa822b158b9a35e3d74ec0d71bb1300
+DIST libcxx-3.7.1.src.tar.xz 995724 SHA256 357fbd4288ce99733ba06ae2bec6f503413d258aeebaab8b6a791201e6f7f144 SHA512 08d2399a8b36aa15290733256c896c9fa43f1a1223bc5c73bbcd014fddf8880e514d2a6dcc456bcf18b537c01fb6911b092e6d9958bccd8e64e9f375ed7a1ab9 WHIRLPOOL 19f77946abf48cbdd3e7ea21fd009ca3cc5f607dfe0512a44b102847044bb1d5ae4b16f503f18b14ebd9ea115256e87af07409907ba2a65f6061e217a502a359
diff --git a/sys-libs/libcxx/libcxx-0.0_p20130725.ebuild b/sys-libs/libcxx/libcxx-0.0_p20130725.ebuild
deleted file mode 100644
index dde2eea354f8..000000000000
--- a/sys-libs/libcxx/libcxx-0.0_p20130725.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
- SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt static-libs test"
-
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
- !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )"
-DEPEND="${RDEPEND}
- test? ( sys-devel/clang )
- app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
- if ! use libcxxrt ; then
- ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
- ewarn "libsupc++. Please note that this is not well supported."
- ewarn "In particular, static linking will not work."
- fi
- if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
- eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-}
-
-src_prepare() {
- cp -f "${FILESDIR}/Makefile" lib/ || die
- multilib_copy_sources
-}
-
-src_configure() {
- export LIBS="-lpthread -lrt -lc -lgcc_s"
- if use libcxxrt ; then
- append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
- LIBS="-lcxxrt ${LIBS}"
- cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
- else
- # Very hackish, see $HOMEPAGE
- # If someone has a clever idea, please share it!
- local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
- local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
- append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="-lsupc++ ${LIBS}"
- local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
- for i in ${libsupcxx_includes} ; do
- local found=""
- [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
- for j in ${libcxx_gcc_dirs} ; do
- if [ -f "${j}/${i}" ] ; then
- cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
- found=yes
- fi
- done
- [ -n "${found}" ] || die "Header not found: ${i}"
- done
- fi
-
- tc-export AR CC CXX
-
- append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
- cd "${BUILD_DIR}/lib" || die
- emake shared
- use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
- cd "${BUILD_DIR}/test"
- LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
- CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
- HEADER_INCLUDE="-I${BUILD_DIR}/include" \
- SOURCE_LIB="-L${BUILD_DIR}/lib" \
- LIBS="-lm" \
- ./testit || die
-}
-
-# Usage: deps
-gen_ldscript() {
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
- cat <<-END_LDSCRIPT
-/* GNU ld script
- Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
- if use libcxxrt ; then
- # Move it first.
- mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
- # Generate libc++.a ldscript for inclusion of its dependencies so that
- # clang++ -stdlib=libc++ -static works out of the box.
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
- # On Linux/glibc it does not link without libpthread or libdl. It is
- # fine on FreeBSD.
- use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
- fi
- # TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
- if use libcxxrt ; then
- mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
- fi
- # TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
- cd "${BUILD_DIR}/lib"
- if use static-libs ; then
- dolib.a libc++.a
- gen_static_ldscript
- fi
- dolib.so libc++.so*
- gen_shared_ldscript
-}
-
-multilib_src_install_all() {
- einstalldocs
- insinto /usr/include/c++/v1
- doins -r include/*
-}
-
-pkg_postinst() {
- elog "This package (${PN}) is mainly intended as a replacement for the C++"
- elog "standard library when using clang."
- elog "To use it, instead of libstdc++, use:"
- elog " clang++ -stdlib=libc++"
- elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-0.0_p20131222.ebuild b/sys-libs/libcxx/libcxx-0.0_p20131222.ebuild
deleted file mode 100644
index 4ceb09fe3904..000000000000
--- a/sys-libs/libcxx/libcxx-0.0_p20131222.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
- SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt static-libs test"
-
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
- !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )"
-DEPEND="${RDEPEND}
- test? ( sys-devel/clang )
- app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
- if ! use libcxxrt ; then
- ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
- ewarn "libsupc++. Please note that this is not well supported."
- ewarn "In particular, static linking will not work."
- fi
- if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
- eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-}
-
-src_prepare() {
- cp -f "${FILESDIR}/Makefile" lib/ || die
- multilib_copy_sources
-}
-
-src_configure() {
- export LIBS="-lpthread -lrt -lc -lgcc_s"
- if use libcxxrt ; then
- append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
- LIBS="-lcxxrt ${LIBS}"
- cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
- else
- # Very hackish, see $HOMEPAGE
- # If someone has a clever idea, please share it!
- local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
- local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
- append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="-lsupc++ ${LIBS}"
- local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
- for i in ${libsupcxx_includes} ; do
- local found=""
- [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
- for j in ${libcxx_gcc_dirs} ; do
- if [ -f "${j}/${i}" ] ; then
- cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
- found=yes
- fi
- done
- [ -n "${found}" ] || die "Header not found: ${i}"
- done
- fi
-
- tc-export AR CC CXX
-
- append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
- cd "${BUILD_DIR}/lib" || die
- emake shared
- use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
- cd "${BUILD_DIR}/test"
- LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
- CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
- HEADER_INCLUDE="-I${BUILD_DIR}/include" \
- SOURCE_LIB="-L${BUILD_DIR}/lib" \
- LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
- ./testit || die
- # TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
- cat <<-END_LDSCRIPT
-/* GNU ld script
- Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
- if use libcxxrt ; then
- # Move it first.
- mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
- # Generate libc++.a ldscript for inclusion of its dependencies so that
- # clang++ -stdlib=libc++ -static works out of the box.
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
- # On Linux/glibc it does not link without libpthread or libdl. It is
- # fine on FreeBSD.
- use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
- fi
- # TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
- if use libcxxrt ; then
- mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
- fi
- # TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
- cd "${BUILD_DIR}/lib"
- if use static-libs ; then
- dolib.a libc++.a
- gen_static_ldscript
- fi
- dolib.so libc++.so*
- gen_shared_ldscript
-}
-
-multilib_src_install_all() {
- einstalldocs
- insinto /usr/include/c++/v1
- doins -r include/*
-}
-
-pkg_postinst() {
- elog "This package (${PN}) is mainly intended as a replacement for the C++"
- elog "standard library when using clang."
- elog "To use it, instead of libstdc++, use:"
- elog " clang++ -stdlib=libc++"
- elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild b/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild
deleted file mode 100644
index 4ceb09fe3904..000000000000
--- a/sys-libs/libcxx/libcxx-0.0_p20140322.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else
- SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt static-libs test"
-
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
- !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )"
-DEPEND="${RDEPEND}
- test? ( sys-devel/clang )
- app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
- if ! use libcxxrt ; then
- ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
- ewarn "libsupc++. Please note that this is not well supported."
- ewarn "In particular, static linking will not work."
- fi
- if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
- eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-}
-
-src_prepare() {
- cp -f "${FILESDIR}/Makefile" lib/ || die
- multilib_copy_sources
-}
-
-src_configure() {
- export LIBS="-lpthread -lrt -lc -lgcc_s"
- if use libcxxrt ; then
- append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
- LIBS="-lcxxrt ${LIBS}"
- cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
- else
- # Very hackish, see $HOMEPAGE
- # If someone has a clever idea, please share it!
- local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
- local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
- append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="-lsupc++ ${LIBS}"
- local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
- for i in ${libsupcxx_includes} ; do
- local found=""
- [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
- for j in ${libcxx_gcc_dirs} ; do
- if [ -f "${j}/${i}" ] ; then
- cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
- found=yes
- fi
- done
- [ -n "${found}" ] || die "Header not found: ${i}"
- done
- fi
-
- tc-export AR CC CXX
-
- append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
- cd "${BUILD_DIR}/lib" || die
- emake shared
- use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
- cd "${BUILD_DIR}/test"
- LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
- CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
- HEADER_INCLUDE="-I${BUILD_DIR}/include" \
- SOURCE_LIB="-L${BUILD_DIR}/lib" \
- LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
- ./testit || die
- # TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
- cat <<-END_LDSCRIPT
-/* GNU ld script
- Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
- if use libcxxrt ; then
- # Move it first.
- mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
- # Generate libc++.a ldscript for inclusion of its dependencies so that
- # clang++ -stdlib=libc++ -static works out of the box.
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
- # On Linux/glibc it does not link without libpthread or libdl. It is
- # fine on FreeBSD.
- use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
- fi
- # TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
- if use libcxxrt ; then
- mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
- fi
- # TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
- cd "${BUILD_DIR}/lib"
- if use static-libs ; then
- dolib.a libc++.a
- gen_static_ldscript
- fi
- dolib.so libc++.so*
- gen_shared_ldscript
-}
-
-multilib_src_install_all() {
- einstalldocs
- insinto /usr/include/c++/v1
- doins -r include/*
-}
-
-pkg_postinst() {
- elog "This package (${PN}) is mainly intended as a replacement for the C++"
- elog "standard library when using clang."
- elog "To use it, instead of libstdc++, use:"
- elog " clang++ -stdlib=libc++"
- elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-3.6.1.ebuild b/sys-libs/libcxx/libcxx-3.6.1.ebuild
deleted file mode 100644
index 92689d826fc6..000000000000
--- a/sys-libs/libcxx/libcxx-3.6.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
- SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
- S="${WORKDIR}/${P}.src"
-else
- SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt +static-libs test"
-
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
- !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] )"
-DEPEND="${RDEPEND}
- test? ( sys-devel/clang )
- app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
- if ! use libcxxrt ; then
- ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
- ewarn "libsupc++. Please note that this is not well supported."
- ewarn "In particular, static linking will not work."
- fi
- if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
- eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-}
-
-src_prepare() {
- cp -f "${FILESDIR}/Makefile" lib/ || die
- multilib_copy_sources
-}
-
-src_configure() {
- export LIBS="-lpthread -lrt -lc -lgcc_s"
- if use libcxxrt ; then
- append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
- LIBS="-lcxxrt ${LIBS}"
- cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
- else
- # Very hackish, see $HOMEPAGE
- # If someone has a clever idea, please share it!
- local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
- local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
- append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="-lsupc++ ${LIBS}"
- local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
- for i in ${libsupcxx_includes} ; do
- local found=""
- [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
- for j in ${libcxx_gcc_dirs} ; do
- if [ -f "${j}/${i}" ] ; then
- cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
- found=yes
- fi
- done
- [ -n "${found}" ] || die "Header not found: ${i}"
- done
- fi
-
- tc-export AR CC CXX
-
- append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
- cd "${BUILD_DIR}/lib" || die
- emake shared
- use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
- cd "${BUILD_DIR}/test"
- LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
- CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
- HEADER_INCLUDE="-I${BUILD_DIR}/include" \
- SOURCE_LIB="-L${BUILD_DIR}/lib" \
- LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
- ./testit || die
- # TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
- cat <<-END_LDSCRIPT
-/* GNU ld script
- Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
- if use libcxxrt ; then
- # Move it first.
- mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
- # Generate libc++.a ldscript for inclusion of its dependencies so that
- # clang++ -stdlib=libc++ -static works out of the box.
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
- # On Linux/glibc it does not link without libpthread or libdl. It is
- # fine on FreeBSD.
- use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
- fi
- # TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
- if use libcxxrt ; then
- mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
- fi
- # TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
- cd "${BUILD_DIR}/lib"
- if use static-libs ; then
- dolib.a libc++.a
- gen_static_ldscript
- fi
- dolib.so libc++.so*
- gen_shared_ldscript
-}
-
-multilib_src_install_all() {
- einstalldocs
- insinto /usr/include/c++/v1
- doins -r include/*
-}
-
-pkg_postinst() {
- elog "This package (${PN}) is mainly intended as a replacement for the C++"
- elog "standard library when using clang."
- elog "To use it, instead of libstdc++, use:"
- elog " clang++ -stdlib=libc++"
- elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-3.6.2.ebuild b/sys-libs/libcxx/libcxx-3.6.2.ebuild
deleted file mode 100644
index 92689d826fc6..000000000000
--- a/sys-libs/libcxx/libcxx-3.6.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
- SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
- S="${WORKDIR}/${P}.src"
-else
- SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
- KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
- KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt +static-libs test"
-
-RDEPEND="libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
- !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] )"
-DEPEND="${RDEPEND}
- test? ( sys-devel/clang )
- app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
- if ! use libcxxrt ; then
- ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
- ewarn "libsupc++. Please note that this is not well supported."
- ewarn "In particular, static linking will not work."
- fi
- if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
- eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
- eerror "Please use gcc-config to switch to gcc-4.7 or later version."
- die
- fi
-}
-
-src_prepare() {
- cp -f "${FILESDIR}/Makefile" lib/ || die
- multilib_copy_sources
-}
-
-src_configure() {
- export LIBS="-lpthread -lrt -lc -lgcc_s"
- if use libcxxrt ; then
- append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
- LIBS="-lcxxrt ${LIBS}"
- cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
- else
- # Very hackish, see $HOMEPAGE
- # If someone has a clever idea, please share it!
- local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
- local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
- append-cppflags -D__GLIBCXX__ ${includes}
- LIBS="-lsupc++ ${LIBS}"
- local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
- for i in ${libsupcxx_includes} ; do
- local found=""
- [ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
- for j in ${libcxx_gcc_dirs} ; do
- if [ -f "${j}/${i}" ] ; then
- cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
- found=yes
- fi
- done
- [ -n "${found}" ] || die "Header not found: ${i}"
- done
- fi
-
- tc-export AR CC CXX
-
- append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
- cd "${BUILD_DIR}/lib" || die
- emake shared
- use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
- cd "${BUILD_DIR}/test"
- LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
- CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
- HEADER_INCLUDE="-I${BUILD_DIR}/include" \
- SOURCE_LIB="-L${BUILD_DIR}/lib" \
- LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
- ./testit || die
- # TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
- local output_format
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
- cat <<-END_LDSCRIPT
-/* GNU ld script
- Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
- if use libcxxrt ; then
- # Move it first.
- mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
- # Generate libc++.a ldscript for inclusion of its dependencies so that
- # clang++ -stdlib=libc++ -static works out of the box.
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
- # On Linux/glibc it does not link without libpthread or libdl. It is
- # fine on FreeBSD.
- use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
- fi
- # TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
- if use libcxxrt ; then
- mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
- local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
- gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
- fi
- # TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
- cd "${BUILD_DIR}/lib"
- if use static-libs ; then
- dolib.a libc++.a
- gen_static_ldscript
- fi
- dolib.so libc++.so*
- gen_shared_ldscript
-}
-
-multilib_src_install_all() {
- einstalldocs
- insinto /usr/include/c++/v1
- doins -r include/*
-}
-
-pkg_postinst() {
- elog "This package (${PN}) is mainly intended as a replacement for the C++"
- elog "standard library when using clang."
- elog "To use it, instead of libstdc++, use:"
- elog " clang++ -stdlib=libc++"
- elog "to compile your C++ programs."
-}
diff --git a/sys-libs/libcxx/libcxx-3.6.0.ebuild b/sys-libs/libcxx/libcxx-3.7.1.ebuild
similarity index 100%
rename from sys-libs/libcxx/libcxx-3.6.0.ebuild
rename to sys-libs/libcxx/libcxx-3.7.1.ebuild
diff --git a/virtual/linux-sources/linux-sources-0.ebuild b/virtual/linux-sources/linux-sources-0.ebuild
index c89f025704b4..1288479be3ab 100644
--- a/virtual/linux-sources/linux-sources-0.ebuild
+++ b/virtual/linux-sources/linux-sources-0.ebuild
@@ -27,7 +27,6 @@ RDEPEND="|| (
sys-kernel/rt-sources
sys-kernel/tuxonice-sources
sys-kernel/usermode-sources
- sys-kernel/vserver-sources
sys-kernel/xbox-sources
sys-kernel/zen-sources
sys-kernel/aufs-sources
diff --git a/virtual/linux-sources/linux-sources-1.ebuild b/virtual/linux-sources/linux-sources-1.ebuild
index 02788330ab0d..0dc3581b89c2 100644
--- a/virtual/linux-sources/linux-sources-1.ebuild
+++ b/virtual/linux-sources/linux-sources-1.ebuild
@@ -27,7 +27,6 @@ RDEPEND="|| (
sys-kernel/rt-sources
sys-kernel/tuxonice-sources
sys-kernel/usermode-sources
- sys-kernel/vserver-sources
sys-kernel/xbox-sources
sys-kernel/zen-sources
sys-kernel/aufs-sources
diff --git a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r5.ebuild b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r5.ebuild
index 686230b53e75..d87c6d42c8ae 100644
--- a/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r5.ebuild
+++ b/virtual/perl-Math-Complex/perl-Math-Complex-1.590.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/virtual/perl-autodie/perl-autodie-2.230.0.ebuild b/virtual/perl-autodie/perl-autodie-2.230.0.ebuild
index 96d7b8b68b5c..e13db7351ed9 100644
--- a/virtual/perl-autodie/perl-autodie-2.230.0.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.230.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/virtual/perl-autodie/perl-autodie-2.260.0.ebuild b/virtual/perl-autodie/perl-autodie-2.260.0.ebuild
index 0849cbf99c68..60ddef2a6f27 100644
--- a/virtual/perl-autodie/perl-autodie-2.260.0.ebuild
+++ b/virtual/perl-autodie/perl-autodie-2.260.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 4e6d99365abb..46405af4f14f 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,4 +1,2 @@
-DIST bugzilla-4.2.11.tar.gz 2955315 SHA256 b3f94024a405469b62fb1aec47cea25fb4d52c8e6009b2723c43c7d9442c7d17 SHA512 80c400c6887e4dd15201de61651dabcf709a019c3a17323d94a845ae899bcbe43d81ca46f1ae2e41a173e1a06e4d4edc147cfd62dbce08a23df90a6f8c21631c WHIRLPOOL a1445cbd05fd9730ffbe70e2f9740e64ee9b7e5344c4ade77f7237fbefde698bd598f95af5dedabc4ca581465f6be681a700ef329216fbeec107d8c5f29f1a38
DIST bugzilla-4.4.11.tar.gz 4943814 SHA256 10082b506a822f36098597fce1079494ef50bab91b213c3f448c738257db182a SHA512 6ddee272ee471aeb7790e69c39c1cab0541c1657f9cf54f887242d9150ebe77b8301dcc74d6b69bb398eda880f4139b5d26046ae081bff71bd7c6716f2875bc2 WHIRLPOOL b839254d4e759b4c98a6eab52e6f14ef3e1fcf006f9a288c3ac4af79c3abd8a5adcf7303ae8208d7106c8c51caecd6287950c8f0e0855eca04e4d92c4d9b797d
-DIST bugzilla-4.4.6.tar.gz 2956046 SHA256 ac3547195f2ce156488aac2cc537620775e08a9d888441daab2b40ab66ab01f4 SHA512 af95af117f7d5ada390a94716f1d3ed9b97e06f47c028c57635b2b4a720827e4749bee23842b7ff7d3a2ee8cc6257ccf2dc2b135c821838e78a31ceb63ce1b68 WHIRLPOOL 90daa07e1f9c064f4954d413348af958544091ffa71e27d0fb8ba7e4265a96e8d1d6e5903edd71e90ddd34f9c6a44d1cdab3e7bc2db2c97cb576182692be8743
DIST bugzilla-5.0.2.tar.gz 4004728 SHA256 82fa7bc8e27cfc9fe42d3fce3bfb6e7536bba245d76c2ee268d56253d16e3de3 SHA512 1ec554538382fd27f1cbb33b240779ec49a20c130e9e0b0fa8b64032a44e0eda5970b528b05d16877f5a75db6259da899ee662607df7bb52889936aec7ed05f4 WHIRLPOOL 6d8357054a3bef9cef4a768671a5b06e0326c738eca148fc696c8291c454510a4a066376cdea17a08a1d411f3bf233585886db077bd5065dd28c3531474999be
diff --git a/www-apps/bugzilla/bugzilla-4.2.11.ebuild b/www-apps/bugzilla/bugzilla-4.2.11.ebuild
deleted file mode 100644
index 3f3b27f4cf1c..000000000000
--- a/www-apps/bugzilla/bugzilla-4.2.11.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit webapp depend.apache versionator eutils
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1"
-KEYWORDS="amd64 x86"
-
-IUSE="modperl extras graphviz mysql postgres sqlite test"
-
-COMMON_DEPS="
- >=dev-lang/perl-5.8.8
-
- >=dev-perl/CGI-3.510
- virtual/perl-Digest-SHA
- >=dev-perl/TimeDate-1.16
- >=dev-perl/DateTime-0.50
- >=dev-perl/DateTime-TimeZone-0.71
- >=dev-perl/DBI-1.601
- >=dev-perl/Template-Toolkit-2.22
- >=dev-perl/Email-Send-2.190
- >=dev-perl/Email-MIME-1.904
- dev-perl/URI
- >=dev-perl/List-MoreUtils-0.22
-
- virtual/perl-File-Path
- virtual/perl-Scalar-List-Utils
-
- >=virtual/perl-File-Spec-3.27.01
- >=virtual/perl-MIME-Base64-3.07
-
- dev-perl/Math-Random-ISAAC
-"
-
-DEPEND="test? ( ${COMMON_DEPS} )"
-RDEPEND="
- virtual/httpd-cgi
-
- ${COMMON_DEPS}
-
- postgres? ( >=dev-perl/DBD-Pg-1.49 )
- mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
- sqlite? ( >=dev-perl/DBD-SQLite-1.29 )
-
- extras? (
- >=dev-perl/GD-2.35[png,truetype]
- >=dev-perl/Chart-2.4.1
- dev-perl/Template-GD
- dev-perl/GDTextUtil
- dev-perl/GDGraph
- dev-perl/XML-Twig
- >=dev-perl/MIME-tools-5.427
- dev-perl/libwww-perl
- >=dev-perl/PatchReader-0.9.6
- dev-perl/perl-ldap
- dev-perl/RadiusPerl
- dev-perl/Authen-SASL
- >=dev-perl/SOAP-Lite-0.712
- dev-perl/JSON-RPC
- >=dev-perl/JSON-XS-2.0
- dev-perl/Test-Taint
- >=dev-perl/HTML-Parser-3.67
- dev-perl/HTML-Scrubber
- >=virtual/perl-Encode-2.21
- dev-perl/Encode-Detect
- dev-perl/Email-MIME-Attachment-Stripper
- dev-perl/Email-Reply
- dev-perl/TheSchwartz
- dev-perl/Daemon-Generic
- dev-perl/File-MimeInfo
-
- || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
- dev-perl/MIME-tools
- )
-
- modperl? (
- www-apache/mod_perl:1
- >=dev-perl/Apache-SizeLimit-0.96
- )
-
- graphviz? ( media-gfx/graphviz )
-"
-
-# RadiusPerl for extras? bug 252128
-
-want_apache modperl
-
-pkg_setup() {
- depend.apache_pkg_setup modperl
- webapp_pkg_setup
-}
-
-src_prepare() {
- # Get a rid of the bzr files
- rm -rf .bzr*
-
- # Remove bundled perl modules
- rm -rf lib/
-}
-
-src_test() {
- # Shall we remove runtests.pl and t/,xt/ on install?
- perl runtests.pl || die
-}
-
-src_install () {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r . || die
- doins "${FILESDIR}"/bugzilla.cron.{daily,tab} || die
-
- webapp_hook_script "${FILESDIR}"/reconfig
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-
- if use extras; then
- newconfd "${FILESDIR}"/bugzilla-queue.confd bugzilla-queue || die
- newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue || die
- fi
-
- # bug #124282
- chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-
- chmod u+x "${D}${MY_HTDOCSDIR}"/jobqueue.pl
-
- # configuration must be executable
- chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-
- # bug 487476
- mkdir "${D}${MY_HTDOCSDIR}"/lib
-}
diff --git a/www-apps/bugzilla/bugzilla-4.4.6.ebuild b/www-apps/bugzilla/bugzilla-4.4.6.ebuild
deleted file mode 100644
index 3f3b27f4cf1c..000000000000
--- a/www-apps/bugzilla/bugzilla-4.4.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit webapp depend.apache versionator eutils
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1"
-KEYWORDS="amd64 x86"
-
-IUSE="modperl extras graphviz mysql postgres sqlite test"
-
-COMMON_DEPS="
- >=dev-lang/perl-5.8.8
-
- >=dev-perl/CGI-3.510
- virtual/perl-Digest-SHA
- >=dev-perl/TimeDate-1.16
- >=dev-perl/DateTime-0.50
- >=dev-perl/DateTime-TimeZone-0.71
- >=dev-perl/DBI-1.601
- >=dev-perl/Template-Toolkit-2.22
- >=dev-perl/Email-Send-2.190
- >=dev-perl/Email-MIME-1.904
- dev-perl/URI
- >=dev-perl/List-MoreUtils-0.22
-
- virtual/perl-File-Path
- virtual/perl-Scalar-List-Utils
-
- >=virtual/perl-File-Spec-3.27.01
- >=virtual/perl-MIME-Base64-3.07
-
- dev-perl/Math-Random-ISAAC
-"
-
-DEPEND="test? ( ${COMMON_DEPS} )"
-RDEPEND="
- virtual/httpd-cgi
-
- ${COMMON_DEPS}
-
- postgres? ( >=dev-perl/DBD-Pg-1.49 )
- mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
- sqlite? ( >=dev-perl/DBD-SQLite-1.29 )
-
- extras? (
- >=dev-perl/GD-2.35[png,truetype]
- >=dev-perl/Chart-2.4.1
- dev-perl/Template-GD
- dev-perl/GDTextUtil
- dev-perl/GDGraph
- dev-perl/XML-Twig
- >=dev-perl/MIME-tools-5.427
- dev-perl/libwww-perl
- >=dev-perl/PatchReader-0.9.6
- dev-perl/perl-ldap
- dev-perl/RadiusPerl
- dev-perl/Authen-SASL
- >=dev-perl/SOAP-Lite-0.712
- dev-perl/JSON-RPC
- >=dev-perl/JSON-XS-2.0
- dev-perl/Test-Taint
- >=dev-perl/HTML-Parser-3.67
- dev-perl/HTML-Scrubber
- >=virtual/perl-Encode-2.21
- dev-perl/Encode-Detect
- dev-perl/Email-MIME-Attachment-Stripper
- dev-perl/Email-Reply
- dev-perl/TheSchwartz
- dev-perl/Daemon-Generic
- dev-perl/File-MimeInfo
-
- || ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
- dev-perl/MIME-tools
- )
-
- modperl? (
- www-apache/mod_perl:1
- >=dev-perl/Apache-SizeLimit-0.96
- )
-
- graphviz? ( media-gfx/graphviz )
-"
-
-# RadiusPerl for extras? bug 252128
-
-want_apache modperl
-
-pkg_setup() {
- depend.apache_pkg_setup modperl
- webapp_pkg_setup
-}
-
-src_prepare() {
- # Get a rid of the bzr files
- rm -rf .bzr*
-
- # Remove bundled perl modules
- rm -rf lib/
-}
-
-src_test() {
- # Shall we remove runtests.pl and t/,xt/ on install?
- perl runtests.pl || die
-}
-
-src_install () {
- webapp_src_preinst
-
- insinto "${MY_HTDOCSDIR}"
- doins -r . || die
- doins "${FILESDIR}"/bugzilla.cron.{daily,tab} || die
-
- webapp_hook_script "${FILESDIR}"/reconfig
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-
- if use extras; then
- newconfd "${FILESDIR}"/bugzilla-queue.confd bugzilla-queue || die
- newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue || die
- fi
-
- # bug #124282
- chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-
- chmod u+x "${D}${MY_HTDOCSDIR}"/jobqueue.pl
-
- # configuration must be executable
- chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-
- # bug 487476
- mkdir "${D}${MY_HTDOCSDIR}"/lib
-}
diff --git a/www-apps/joomla/Manifest b/www-apps/joomla/Manifest
index 484da6aa228f..770f42dbbdcc 100644
--- a/www-apps/joomla/Manifest
+++ b/www-apps/joomla/Manifest
@@ -1 +1 @@
-DIST Joomla_3.4.3-Stable-Full_Package.tar.bz2 6334337 SHA256 a7aecfba6d9f753ca5307361fae478fb2736d84f4085e33d9dc6b64c1ff613b7 SHA512 6fdb9d773c5958347fb7e2e596d4dada1e762ecbd9ba05a8a6a0c1d7411f07d22b70529a44232f662b5765e1ded4d5e85e40da31badf55bb197bf8480febb1db WHIRLPOOL 713aa991219c37b4ef89a912b6a4794dcdae03161a2f2b929a0a1c7b69e5f2612186b2e599928d885b1cae887b2dacca4bf3e2ebc68d56a7be1b3e4c0f114a12
+DIST Joomla_3.4.8-Stable-Full_Package.tar.bz2 6387109 SHA256 b1ef1117c40ebc98ffe1274f337da4abdeaf7f44269acd0631156347925ee323 SHA512 e20b896c0e50178155c5055a52ccac0328d0fc113fbc67ac202f31f0cb8f2209693638e7307f7473bbb87bad3c4f93a43c0f2e984c64dbaf635a2b0840a2976a WHIRLPOOL f40460e56f030d9a188f4a21e8e4545fc8b699ee377505bdebe03f374991095ba613d4e4ba22438996e0d1c638d63edbbe6b0d3b63988551eb9c49cb5394c96c
diff --git a/www-apps/joomla/joomla-3.4.3.ebuild b/www-apps/joomla/joomla-3.4.8.ebuild
similarity index 79%
rename from www-apps/joomla/joomla-3.4.3.ebuild
rename to www-apps/joomla/joomla-3.4.8.ebuild
index 3e341293ad71..e3ead253b8f2 100644
--- a/www-apps/joomla/joomla-3.4.3.ebuild
+++ b/www-apps/joomla/joomla-3.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,9 +7,10 @@ inherit webapp versionator
MY_PV=$(replace_version_separator '_' '-')
-DESCRIPTION="Joomla is a powerful Open Source Content Management System"
+DESCRIPTION="A powerful Open Source Content Management System"
HOMEPAGE="http://www.joomla.org/"
-SRC_URI="https://github.com/joomla/joomla-cms/releases/download/${MY_PV}/Joomla_${MY_PV}-Stable-Full_Package.tar.bz2"
+M_PN="Joomla_${MY_PV}-Stable-Full_Package"
+SRC_URI="https://github.com/${PN}/${PN}-cms/releases/download/${MY_PV}/${M_PN}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -17,11 +18,9 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
S="${WORKDIR}"
need_httpd_cgi
-DEPEND="${DEPEND}
- app-arch/unzip"
RDEPEND=">=dev-lang/php-5.3.10[json,zlib,xml]
virtual/httpd-php
- || ( dev-lang/php[mysql] dev-lang/php[postgres] )"
+ || ( dev-lang/php[mysql] dev-lang/php[postgres] )"
src_install () {
webapp_src_preinst
diff --git a/www-apps/joomla/metadata.xml b/www-apps/joomla/metadata.xml
index 9e95d7033246..623cf9b6e892 100644
--- a/www-apps/joomla/metadata.xml
+++ b/www-apps/joomla/metadata.xml
@@ -6,7 +6,7 @@
harold@naparst.com
Harold Naparst
- Primary Maintainer, Assign bugs
+ Primary proxied maintainer, set to assignee in all bugs
oli.huber@gmail.com
diff --git a/x11-libs/gtk+/gtk+-3.16.7.ebuild b/x11-libs/gtk+/gtk+-3.16.7.ebuild
index 22c2a6a64210..3b97f905c965 100644
--- a/x11-libs/gtk+/gtk+-3.16.7.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.7.ebuild
@@ -133,7 +133,7 @@ src_prepare() {
strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
fi
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
epatch_user
diff --git a/x11-libs/gtk+/gtk+-3.18.5.ebuild b/x11-libs/gtk+/gtk+-3.18.5.ebuild
index b0bc1113f4c0..f81b5fdd0941 100644
--- a/x11-libs/gtk+/gtk+-3.18.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.5.ebuild
@@ -128,7 +128,7 @@ src_prepare() {
strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
fi
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
epatch_user
diff --git a/x11-libs/gtk+/gtk+-3.18.6.ebuild b/x11-libs/gtk+/gtk+-3.18.6.ebuild
index 14a40da07c74..1033f2809746 100644
--- a/x11-libs/gtk+/gtk+-3.18.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.6.ebuild
@@ -128,7 +128,7 @@ src_prepare() {
strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
fi
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
epatch_user
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 88e5179d771f..4dc9c0fd83a3 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,6 +1,4 @@
DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
-DIST vte-0.36.4.tar.xz 1012848 SHA256 aa549b114c80e18791b57031e5c1714aeb4a104405e3ba78dfd4ac374a71e2a1 SHA512 97bb226abaf2100a21856040039640005809eae647432c03a33eb691c8b0a29c13bd8cf824790c2a6360356c8c5d1b61c48b4a7893c7f0a8d3678b1a0914aa31 WHIRLPOOL d1294540c67e3253b166dc351b68534d9f36b1306449e2a319705cafe0317452e3bbe1768fdc30523f85270c2b949b9d9cf606695989968da4a099355413904c
DIST vte-0.36.5.tar.xz 1017504 SHA256 c2c2ce9640f08b07667f1037862fe991081495446b735c0afb98f45e35b64edf SHA512 43f9211381238ca6cb7f49c8a9dd8f48f702e9968e038fa26ee69228c1fc86061d5dbfabb2c27f677280e89ae9080f20594f3c27481246e3f91dd5f3ea0354f6 WHIRLPOOL 22be408deecedfb7c674fbc49bac2852e5e1c28f25cd7998d20042f15a905158b2698f3e2a0a8fd4a78b89929e773779787dff9af9c6c5e006ee30ed6efdc59d
-DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
DIST vte-0.42.1.tar.xz 924740 SHA256 9e00e2e9e94f4202b979c871f407a8815890bc0f4a8448a08534f76ab0fc9d34 SHA512 4cf917d3f343973dcb816a341276bfab7784a9f4dc6f8fb402193e9a9062503ac192ccc274fe92bb20a17ac182d21fd2268bf9c1ddea817f730db5612e3b21c0 WHIRLPOOL 65839ff61d227a62de51d31bc58fc0baa5b4126d3d1ff482c18b9086a59e91a46f0943512c056182aae1d9801656395989f0b2c8b0470b123d9cd2c6a611c061
diff --git a/x11-libs/vte/vte-0.36.4.ebuild b/x11-libs/vte/vte-0.36.4.ebuild
deleted file mode 100644
index bd4acbaf332b..000000000000
--- a/x11-libs/vte/vte-0.36.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.90"
-IUSE="debug glade +introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
-RDEPEND="
- >=dev-libs/glib-2.31.13:2
- >=x11-libs/gtk+-3.1.9:3[introspection?]
- >=x11-libs/pango-1.22.0
-
- sys-libs/ncurses:0=
- x11-libs/libX11
- x11-libs/libXft
-
- glade? ( >=dev-util/glade-3.9:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=663779
- epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=""
-
- if [[ ${CHOST} == *-interix* ]]; then
- myconf="${myconf} --disable-Bsymbolic"
-
- # interix stropts.h is empty...
- export ac_cv_header_stropts_h=no
- fi
-
- # Python bindings are via gobject-introspection
- # Ex: from gi.repository import Vte
- # Do not disable gnome-pty-helper, bug #401389
- gnome2_src_configure \
- --disable-deprecation \
- --disable-static \
- $(use_enable debug) \
- $(use_enable glade glade-catalogue) \
- $(use_enable introspection) \
- ${myconf}
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- gnome2_src_install
- rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-}
diff --git a/x11-libs/vte/vte-0.38.3.ebuild b/x11-libs/vte/vte-0.38.3.ebuild
deleted file mode 100644
index 88937da52979..000000000000
--- a/x11-libs/vte/vte-0.38.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="2.91"
-IUSE="debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
-RDEPEND="
- >=dev-libs/glib-2.40:2
- >=x11-libs/gtk+-3.8:3[introspection?]
- >=x11-libs/pango-1.22.0
-
- sys-libs/ncurses:0=
- x11-libs/libX11
- x11-libs/libXft
-
- glade? ( >=dev-util/glade-3.9:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-RDEPEND="${RDEPEND}
- !x11-libs/vte:2.90[glade]
-"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- local myconf=""
-
- if [[ ${CHOST} == *-interix* ]]; then
- myconf="${myconf} --disable-Bsymbolic"
-
- # interix stropts.h is empty...
- export ac_cv_header_stropts_h=no
- fi
-
- # Python bindings are via gobject-introspection
- # Ex: from gi.repository import Vte
- # Do not disable gnome-pty-helper, bug #401389
- gnome2_src_configure \
- --disable-deprecation \
- --disable-test-application \
- --disable-static \
- $(use_enable debug) \
- $(use_enable glade glade-catalogue) \
- $(use_enable introspection) \
- $(use_enable vala) \
- ${myconf}
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog HACKING NEWS README"
- gnome2_src_install
- mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
-}
diff --git a/x11-terms/guake/guake-0.8.3.ebuild b/x11-terms/guake/guake-0.8.3.ebuild
index 0cdc6ed49b4a..83e39e24ece1 100644
--- a/x11-terms/guake/guake-0.8.3.ebuild
+++ b/x11-terms/guake/guake-0.8.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
RDEPEND="
dev-libs/keybinder:0[python]