diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index c8bf1eb9c389..068790361750 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -1,2 +1,2 @@
-DIST util-linux-2.26-20150310.diff.bz2 41017 SHA256 18d88810d5d6e95313c23162566bcf7e1a7b785bed5dd395127c144127c9e9ef SHA512 c8e7d7a4795d2ed75af5e0513c19510ca649682df86655ecabe1563586bdb46f32bb9abd6cfb09df230f935cfa396e0d63b1545a40a5f4ce47524a82e7dd7ca6 WHIRLPOOL 2ca00b9ec52b64ce1e083b9a706003d1f0445fb5d7f391e28b698c684dba5cb8bc2a590565dcc23ac6527b8099838435b86e7a78097ab8a19491fe14b6c50ca6
-DIST util-linux-2.26.tar.xz 3847960 SHA256 a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489 SHA512 af07d49a433fce683da7bdf9aea5693ad108aa16166e0147716175bd779fe5090029617dd7db153bc0f5efcf7bdd377761a616efd4cca90a87bf317132ede88c WHIRLPOOL 4f7c9463bfe1523819671824de26e051c496c86884ca34b25208762179345c799fe61e566228ebfcbca2f2b63163539e37b06e438a58f562cf7b53f954564150
+DIST loop-AES-v3.7j.tar.bz2 326818 SHA256 67ede839d4cac657359c39b05eac46f6991054768a7e1096bef5b92edb3b8aba SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7 WHIRLPOOL a3798edc3f1393ddf97aeada84c1c5a6e74b8cef94e72629774c4db70001206d5cd429df61035a215131f0281ef284469751eefad1f7ee3fd7cf24153b57077d
+DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
similarity index 89%
rename from app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
rename to app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
index f147458398c5..db63e9360895 100644
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.26.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@@ -3,17 +3,17 @@
EAPI="6"
-inherit eutils toolchain-funcs libtool flag-o-matic
+inherit eutils autotools toolchain-funcs libtool flag-o-matic
MY_PV="${PV/_/-}"
MY_P="util-linux-${MY_PV}"
-LOOPAES_PV="${PV}-20150310"
+LOOPAES_P="loop-AES-v3.7j"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Loop-AES losetup utility"
HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
- http://loop-aes.sourceforge.net/updates/util-linux-${LOOPAES_PV}.diff.bz2"
+ http://loop-aes.sourceforge.net/loop-AES/${LOOPAES_P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
@@ -27,8 +27,8 @@ DEPEND="${RDEPEND}
src_prepare() {
default
- epatch "${WORKDIR}"/util-linux-*.diff
- elibtoolize
+ epatch "${WORKDIR}/${LOOPAES_P}/util-linux-${PV}.diff"
+ eautoreconf
}
lfs_fallocate_test() {
@@ -57,6 +57,7 @@ src_configure() {
econf \
--libdir='${prefix}/'"$(get_libdir)" \
--disable-all-programs \
+ --disable-pylibmount \
--enable-libsmartcols \
--enable-losetup \
--without-ncurses \
diff --git a/app-doc/pms/pms-6_p20151113.ebuild b/app-doc/pms/pms-6_p20151113.ebuild
index 3b67119f1930..d187e0c4f8b5 100644
--- a/app-doc/pms/pms-6_p20151113.ebuild
+++ b/app-doc/pms/pms-6_p20151113.ebuild
@@ -38,7 +38,7 @@ src_install() {
dodoc pms.pdf eapi-cheatsheet.pdf
if use html; then
docinto html
- dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
+ dodoc *.html pms.css
dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
fi
}
diff --git a/app-doc/pms/pms-9999.ebuild b/app-doc/pms/pms-9999.ebuild
index 0a84070b4196..0527613e2a13 100644
--- a/app-doc/pms/pms-9999.ebuild
+++ b/app-doc/pms/pms-9999.ebuild
@@ -36,7 +36,7 @@ src_install() {
dodoc pms.pdf eapi-cheatsheet.pdf
if use html; then
docinto html
- dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
+ dodoc *.html pms.css
dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
fi
}
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 0333eb4ad581..9511916028f4 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -3,3 +3,4 @@ DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da
DIST mc-4.8.16.tar.xz 2387724 SHA256 bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 SHA512 209a4f92f493d1df5d9976bbd2547b92172270fd35c221e4d4d99630b3530a5cc849bfdff842b47f35e32d215d5af35aadd5cd02bd12567f3736ad4915abb944 WHIRLPOOL 88ec84c10c7f0137b799f7754f25beb372326856107b32fa80f5ecc73dcc9ce6249a8ddc528d2d3e6f723d396828c30dd056b5a3b9b79eb33a0230e9a0c79454
DIST mc-4.8.17.tar.xz 2457156 SHA256 0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d SHA512 e995e5b1eb0a5831fe567e4398c9a68fa610c8631f1f13fb277f67f709656bc97bd7b20f289bdace35276984556edd1aed324412d225698c5853809a6d128f72 WHIRLPOOL ad36526d4961baafd35ed55c600c534826036afb1a7b14b81f9617ea766a6cc9100b317a49349428c36b091389e20fa4abd01c931e2e93d9028024857f2419c1
DIST mc-4.8.18.tar.xz 2462080 SHA256 f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8 WHIRLPOOL dd0c1cdfe93468ebc399b270d693751bc7c0665cb49040d9409c3a336c953be0d304c463b8c8a0a26e42c720c116a4b4bd9b930caa2f2101298e01c4ac5c6237
+DIST mc-4.8.19.tar.xz 2521808 SHA256 eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531 WHIRLPOOL 21c57a2717c58488cc7aa5ba5159b9231e09181059662f392a5212a17aa5475493793d49b99e73ebe74d9594201a84cfc63c3a460654579b7399cc563594ab7a
diff --git a/app-misc/mc/mc-4.8.19.ebuild b/app-misc/mc/mc-4.8.19.ebuild
new file mode 100644
index 000000000000..9841436fbc29
--- /dev/null
+++ b/app-misc/mc/mc-4.8.19.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RESTRICT=test # fails rar test
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+ gpm? ( sys-libs/gpm )
+ kernel_linux? ( sys-fs/e2fsprogs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh2 )
+ slang? ( >=sys-libs/slang-2 )
+ !slang? ( sys-libs/ncurses:0= )
+ spell? ( app-text/aspell )
+ X? ( x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( dev-libs/check )
+ "
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myscreen=ncurses
+ use slang && myscreen=slang
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+ local homedir=".mc"
+ use xdg && homedir="XDG"
+
+ econf \
+ --disable-silent-rules \
+ --disable-dependency-tracking \
+ $(use_enable nls) \
+ --enable-vfs \
+ $(use_enable kernel_linux vfs-undelfs) \
+ --enable-charset \
+ $(use_with X x) \
+ $(use_enable samba vfs-smb) \
+ $(use_enable sftp vfs-sftp) \
+ $(use_enable spell aspell) \
+ $(use_with gpm gpm-mouse) \
+ --with-screen=${myscreen} \
+ $(use_with edit internal-edit) \
+ $(use_enable mclib) \
+ $(use_enable test tests) \
+ --with-homedir=${homedir}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README NEWS
+
+ # fix bug #334383
+ if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+ fowners root:tty /usr/libexec/mc/cons.saver
+ fperms g+s /usr/libexec/mc/cons.saver
+ fi
+
+ if ! use xdg ; then
+ sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+ -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+ fi
+}
+
+pkg_postinst() {
+ elog "To enable exiting to latest working directory,"
+ elog "put this into your ~/.bashrc:"
+ elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/metromap/metadata.xml b/app-misc/metromap/metadata.xml
index 7c3205ab0caa..ceeed1534bdd 100644
--- a/app-misc/metromap/metadata.xml
+++ b/app-misc/metromap/metadata.xml
@@ -1,16 +1,8 @@
-
- nikoli@gmx.us
- Nikoli
-
maksbotan@gentoo.org
Maxim Koltsov
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
index fce10001488a..a53cce1009b9 100644
--- a/app-text/goldendict/metadata.xml
+++ b/app-text/goldendict/metadata.xml
@@ -1,18 +1,10 @@
-
- nikoli@gmx.us
- Nikoli
-
qt@gentoo.org
Gentoo Qt Project
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
goldendict/goldendict
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 82c27afd6bd0..6bacd45efb28 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,2 +1,2 @@
DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
-DIST simgear-2017.1.1.tar.bz2 1236106 SHA256 1815f6a2c3f43bb6121b2394e68f8e6e341c14a7a40e4163c0bcc105ee06ccbc SHA512 8920b41127eac40e3633444eae2cd7b61ac8a386164571a5f1205c92da7f555d54824fc39ab2e1af40860cb507eb358679282adede371c9a81c858bbcaadc9dd WHIRLPOOL 2b1fcce13c5919ac8fe248320a0289ac1dd317224f9a9b9ab9fd000e627ea726b1b2abf5e0fec6f924bc8561f408281dffd907081f82cd0b0e48ab5be8e97169
+DIST simgear-2017.1.2.tar.bz2 1235662 SHA256 69c8223051b039b00038aabbb8660cecce1866e3f854dadd9543db824d232f6b SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404 WHIRLPOOL a6b18db36078e1e26c8915ef72a5bb890bcef7433c6c641f314533c637cbcd3a626e4146ddbf7551fc179b9b07989baba04559a0f1684c4b00e94760ddace2cb
diff --git a/dev-games/simgear/simgear-2017.1.1.ebuild b/dev-games/simgear/simgear-2017.1.2.ebuild
similarity index 98%
rename from dev-games/simgear/simgear-2017.1.1.ebuild
rename to dev-games/simgear/simgear-2017.1.2.ebuild
index ddd8ca08d242..d1fdac8b30b5 100644
--- a/dev-games/simgear/simgear-2017.1.1.ebuild
+++ b/dev-games/simgear/simgear-2017.1.2.ebuild
@@ -37,7 +37,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF
+ -DENABLE_SIMD=ON
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index e1e26cab473c..b18a51cc4e30 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -39,7 +39,7 @@ src_configure() {
-DENABLE_DNS=$(usex dns)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF
+ -DENABLE_SIMD=ON
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index e98524d2d94e..a86c1b453cc6 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -14,3 +14,7 @@ DIST icedtea-bin-examples-7.2.6.8-amd64.tar.xz 1796596 SHA256 115bc46dcd307ca9ab
DIST icedtea-bin-examples-7.2.6.8-x86.tar.xz 1796976 SHA256 50c9601c379d51d732ad7e349d2b873973ff2b1f383d7fade4fb2139eee15e8f SHA512 ab3101a86fcc62c2ca159830dffaff561f54cf1dc75ebce45efd72341881c97b078b8213040f70e41b421b17d81c3fa093371be2e160bcfaca7d5ef6ad2dfd31 WHIRLPOOL e2ebfc5fc099e03eab164d09d7ad13db8b97fcb6514961e5b0203bcb42f4ba28a45aadcbcbccf9d6933beb98c6929cecd6f61a51e5260d7c1a078d8d5535f921
DIST icedtea-bin-src-3.3.0.tar.xz 45698204 SHA256 47aca8467e1b5baf61ba59d80786a54d2f5b2f4651de2d87604ecab0318117a2 SHA512 668d8fa653d2e773c633e74f9043c7ee0a67f04775c8e317f2515c47a85a0cb2732e2d7a30ad0ce05521c32e6d1de19ccfbc7558b4b3d4b60b73765e1a854eaa WHIRLPOOL 0fd4dd6a7483dbd5826938922a339364b006324f01da7d39eba7d38eb73010abd47f9cfe5b16d419163c34e302973e4c5eba0c1fcf759f584dd3d7947c3a59ad
DIST icedtea-bin-src-7.2.6.8.tar.xz 40105456 SHA256 9fcc1ebcfa3518804c45215f4e83ea282a87dff2b4b52461cd878c77a5812b2d SHA512 3ba29db8f6edeb3433d03a1b679ea21ead501c7e343fdee15531ff0e86061bca3e37498c75362aaee319424dc6464803659c24089def3f3c579bcf86fe7a6ba6 WHIRLPOOL d0ab4d61ba741b9955deb958927efff871c8941127707dee860a4317c1fdf17301b456739591a81f998d9a2bdaf55eccdd26717df228e9c70960b101e8dd7ab3
+DIST icedtea-bin-sunec-3.3.0-amd64.tar.xz 58104 SHA256 4a6a621b8fe4375e4bb8b5af40b05601ed51e7afa2a487cd58f0f3da1d634f09 SHA512 0753b3880f2337c60c34b31d60ffbd98e3f11da130771301a6fa01ae4d407705f41f99d53740bcce7972e62df3f277a1c8d4b6c8c5127c349bf0e78daac0b36c WHIRLPOOL 500fcbd2dca3e652804f04b0fc1dc57974d44e1556fdfa7cead513228765cf4f5e664a3771316fb85612efbdbe0eda2302042dda05f43a868c6cb68bcc6d713d
+DIST icedtea-bin-sunec-3.3.0-arm.tar.xz 54160 SHA256 17551c0f12d9769ec5a94c33aac4f8feba71b7c9ed6ce2ddc22d2b9165cae062 SHA512 4e53cbd500bcfc62a491c2e1f7a3bf1e75080e4e5694406d2fe2eea983b506893d6d076262af196ea728f0a15963d6219c3745b32b2e8501a5ac5239b047eaff WHIRLPOOL 2aeb9f1841839ba58c14bc5be2c9a43dcede9b4ecf200d20338977d94c99a5d9fdb972af51176cc2496189f1fbfaf438f138db7e9787bbe0ce924c75acf9fce6
+DIST icedtea-bin-sunec-3.3.0-ppc64.tar.xz 52984 SHA256 796d90328f9ae45eabf0d1f18a3be69468433dfc742c21469a092f5933559fbb SHA512 55ce61e02381bab6951acc652e57a0870ac31076f23a3ab53bf8b6facb3357dba50d93f3cc7f40eed15e17adb91ebc6f4d944a680ff5bfc7d343caf14014dc18 WHIRLPOOL 8f7f217025d9eb20042fdb0adae03fc34fca21ff59c9c9adb61982da785eab64cb2f87bc7e9fb5c7d9012e27f4a11198c5fa0f1b08dc086c42ed4b55315b2ee5
+DIST icedtea-bin-sunec-3.3.0-x86.tar.xz 68916 SHA256 9805096afc88877ec906eac355962324a621c13256c4bb57753dfaaa0ccff2da SHA512 66b333d84d7b365f53a9c4aba7c0f848d39cdd3580a0065afeff18a3f57701f2ea8ca4342dc48d49b41e837cb1b4f79ead2d85dad4a3293fa128373f100b9009 WHIRLPOOL 17b73389a4c175b7238da8553b79e98a87774212ba413a2f64178717df36432e1b1bdd0f56b2e96177f5257d8e9f433e9b08a3b23096a05179676f480f4d3a8f
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.3.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..80e7bd7d99fe
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.3.0-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+ source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+ multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ${BASE_URI}/${PN}-sunec-${PV}-x86.tar.xz ) ) )"
+
+for abi in amd64 arm ppc64 x86; do
+ SRC_URI+="
+ ${abi}? (
+ ${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
+ ${BASE_URI}/${PN}-sunec-${PV}-${abi}.tar.xz
+ examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
+ )"
+done
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+ >=media-libs/fontconfig-2.11:1.0%
+ >=media-libs/freetype-2.5.5:2%
+ >=media-libs/lcms-2.6:2%
+ >=sys-libs/zlib-1.2.8-r1%
+ virtual/jpeg:62%
+ alsa? ( >=media-libs/alsa-lib-1.0% )
+ cups? ( >=net-print/cups-2.0% )
+ gtk? (
+ >=dev-libs/atk-2.16.0%
+ >=x11-libs/cairo-1.14.2%
+ x11-libs/gdk-pixbuf:2%
+ >=x11-libs/gtk+-2.24:2%
+ >=x11-libs/pango-1.36%
+ )
+ !headless-awt? (
+ media-libs/giflib:0/7%
+ =media-libs/libpng-1.6*%
+ >=x11-libs/libX11-1.6%
+ >=x11-libs/libXcomposite-0.4%
+ >=x11-libs/libXext-1.3%
+ >=x11-libs/libXi-1.7%
+ >=x11-libs/libXrender-0.9.8%
+ >=x11-libs/libXtst-1.2%
+ )"
+
+RDEPEND=">=sys-devel/gcc-4.9.4[multilib?]
+ >=sys-libs/glibc-2.22[multilib?]
+ virtual/ttf-fonts
+ selinux? ( sec-policy/selinux-java )
+ multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+ !multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_prepare() {
+ default
+
+ if ! use alsa; then
+ rm -v */jre/lib/*/libjsoundalsa.* || die
+ fi
+
+ if use headless-awt; then
+ rm -vr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+ */{,jre/}bin/policytool */bin/appletviewer || die
+ fi
+}
+
+multilib_src_install() {
+ local dest="/opt/${P}-${ABI}"
+ dest="${dest/%-${DEFAULT_ABI}/}"
+ local ddest="${ED}${dest#/}"
+ dodir "${dest}"
+
+ if multilib_is_native_abi; then
+ dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+ use doc && dodoc -r ${P}/doc/html
+
+ # doins doesn't preserve executable bits.
+ cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+ if use examples; then
+ cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+ fi
+
+ if use source; then
+ cp ${P}/src.zip "${ddest}" || die
+ fi
+
+ # Use default VMHANDLE.
+ java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+ else
+ local x native=$(get_system_arch ${DEFAULT_ABI})
+
+ for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+ dodir "${dest}"${x%/*}
+ cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+ done
+
+ for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+ [[ ${x##*/} = ${native} ]] && continue
+ [[ -e "${ddest}"/${x#*/} ]] && continue
+ dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+ done
+
+ # Use ABI-suffixed VMHANDLE.
+ VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+ fi
+
+ # Both icedtea itself and the icedtea ebuild set PAX markings but we
+ # disable them for the icedtea-bin build because the line below will
+ # respect end-user settings when icedtea-bin is actually installed.
+ java-vm_set-pax-markings "${ddest}"
+
+ # Each invocation appends to the config.
+ java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+ if use multilib; then
+ multilib_foreach_abi multilib_src_install
+ else
+ multilib_src_install
+ fi
+
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-libs/fddl/fddl-20111124-r1.ebuild b/dev-libs/fddl/fddl-20111124-r1.ebuild
new file mode 100644
index 000000000000..c28910e71706
--- /dev/null
+++ b/dev-libs/fddl/fddl-20111124-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib vcs-snapshot
+
+DESCRIPTION="Free Decision Diagram Library"
+HOMEPAGE="http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( AUTHORS ChangeLog INSTALL RELEASE )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # Remove references to files that were not shipped,
+ # prefer dynamic linking
+ sed -i \
+ -e 's|unaryoperation.cpp||g' \
+ -e 's|unaryoperation.h||g' \
+ -e 's|binaryoperation.cpp||g' \
+ -e 's|binaryoperation.h||g' \
+ -e '/add_library/s/FDDL /FDDL SHARED /' \
+ -e '/add_library/s/FDDL /FDDL SHARED /' \
+ -e "/^install/s:DESTINATION lib:DESTINATION $(get_libdir):" \
+ src/CMakeLists.txt || die
+ # Do not build tests that depend on above files
+ sed -i \
+ {,tests/}CMakeLists.txt \
+ -e '/test_unaryop/d' \
+ -e '/test_binaryop/d' \
+ || die
+}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
new file mode 100644
index 000000000000..af1af83747d1
--- /dev/null
+++ b/dev-libs/libmspack/Manifest
@@ -0,0 +1 @@
+DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
diff --git a/dev-libs/libmspack/libmspack-0.5_alpha.ebuild b/dev-libs/libmspack/libmspack-0.5_alpha.ebuild
new file mode 100644
index 000000000000..b8c96e78ed03
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.5_alpha.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable debug) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ default
+ cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+ fi
+}
+
+multilib_src_install_all() {
+ DOCS=(AUTHORS ChangeLog NEWS README TODO)
+ prune_libtool_files --all
+ use doc && HTML_DOCS=(doc/*)
+ default_src_install
+ if use doc; then
+ rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+ fi
+}
diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
new file mode 100644
index 000000000000..ea4e7c21a844
--- /dev/null
+++ b/dev-libs/libmspack/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ reavertm@gentoo.org
+ Maciej Mrozowski
+
+
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6.ebuild
index b228ea584504..1a114406c7d6 100644
--- a/dev-python/enum34/enum34-1.1.6.ebuild
+++ b/dev-python/enum34/enum34-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/miniupnpc/metadata.xml b/dev-python/miniupnpc/metadata.xml
index 1924c6edc194..998965a402cd 100644
--- a/dev-python/miniupnpc/metadata.xml
+++ b/dev-python/miniupnpc/metadata.xml
@@ -5,12 +5,4 @@
mgorny@gentoo.org
Michał Górny
-
- nikoli@gmx.us
- Nikoli
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-python/python-poppler-qt4/Manifest b/dev-python/python-poppler-qt4/Manifest
index 4fe829a9c363..45e7a0cb2e1e 100644
--- a/dev-python/python-poppler-qt4/Manifest
+++ b/dev-python/python-poppler-qt4/Manifest
@@ -1 +1,2 @@
DIST python-poppler-qt4-0.18.1.tar.gz 15555 SHA256 c6903c4b6ab71730ae2a1da9fb95830a83da82185b5ef6b8184b16c0cae908ba SHA512 f1451e3b60cb51eb3c07d906144ecff2a2737b68018645390441b2eb4942450e2e836a3e20d926c82a7536ae7b3963f7a869a5d7a3274befde7d01144b116a44 WHIRLPOOL 2ef090817a78baa1b55997baf4e6eb61aa21e6d064826bfc14db27e145a477d3b3ff28b6f10076cade979e9f1634cfbe43e3bee51d841d4ea4fbd72cddcd6ce4
+DIST python-poppler-qt4-0.24.0.tar.gz 17452 SHA256 164297bcb03dc0cd943342915bf49e678db13957ebc2f1f3bd988f04145fb236 SHA512 5f03e85f80f2ed4d560ee001a1c0394ddb2ccde504bf8564ceb700af27df8ed41de9fd60e058ce72e32d8ea37cb7706446f0793b25d8475803956653b82e593d WHIRLPOOL 8c242951c47d7552cdf61c55b5074ecc600efe52cc948ea96cab5c06d39f6d2beb72cdd642bb5dfde89952e3799691b0911dd86bdc46e4107f07e96986b3984a
diff --git a/dev-python/python-poppler-qt4/python-poppler-qt4-0.24.0.ebuild b/dev-python/python-poppler-qt4/python-poppler-qt4-0.24.0.ebuild
new file mode 100644
index 000000000000..cab4b8413c80
--- /dev/null
+++ b/dev-python/python-poppler-qt4/python-poppler-qt4-0.24.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python binding for libpoppler-qt4"
+HOMEPAGE="https://github.com/wbsoft/python-poppler-qt4"
+SRC_URI="https://github.com/wbsoft/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-text/poppler:=[qt4]
+ dev-python/PyQt4[${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.0.2.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
similarity index 96%
rename from dev-ruby/ruby-termios/ruby-termios-1.0.2.ebuild
rename to dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
index 10272de0c710..bdc574354d6c 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.0.2.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
@@ -11,6 +11,8 @@ RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
# with a normal TTY, bug 340575.
RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_BINWRAP=""
+
inherit multilib ruby-fakegem
DESCRIPTION="A Ruby interface to termios"
diff --git a/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild b/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild
index 0e7fd7d4f909..e2622fad1201 100644
--- a/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
LICENSE="Ruby"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=""
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index 5ae5850c13c5..477c6754c875 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1 +1,2 @@
DIST travis-1.8.2.gem 192000 SHA256 1ae0415a342838f9faeedbb8a8536ed3c40d9e6872ae37c39d1216fe211f085e SHA512 e047b72d76804d6987698fc47e7acf62125b04862e6671d4887c3d982ecc3b16c4ff1aee8afed5b29ab7c39d622afdbee21d4365f81abb7d505f9092cb4a6a52 WHIRLPOOL 21f8aa6894d3cd2cdeae09da4594dc53aed8be26bf1ce872ecceab66ebf4979e390003a6c6c33cb712ff094091f6679f44b2ad729bd63fd22bb9cbe9b0d0dd3c
+DIST travis-1.8.6.gem 192512 SHA256 c68c057f350d45488c0cbef277cd1b49ff54a6436e0233b0a7057dbec3f382e8 SHA512 d8d182f9b37feeb25a46737ff2d80f728c971e19756705f4d826eb90eeb9e83ceb398600978885e49fc23a342211c80e67718d68e6dea6c5dedc9a612b5b6039 WHIRLPOOL f5fcf845bf57906b397b8108a670134b58d1603666d20f6035211449d9a72944754e63ed851610063423b11e25f59487d0fd485882d8dc4444d9e416b4a72627
diff --git a/dev-ruby/travis/travis-1.8.6.ebuild b/dev-ruby/travis/travis-1.8.6.ebuild
new file mode 100644
index 000000000000..e357f2a98798
--- /dev/null
+++ b/dev-ruby/travis/travis-1.8.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Travis CI Client (CLI and Ruby library) "
+HOMEPAGE="https://github.com/travis-ci/travis.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+#RESTRICT="test"
+
+DEPEND+="test? ( dev-vcs/git )"
+RDEPEND+="dev-vcs/git"
+
+ruby_add_bdepend "
+ test? ( >dev-ruby/rack-test-0.6 )
+ >dev-ruby/sinatra-1.3
+"
+
+ruby_add_rdepend "
+ dev-ruby/backports
+ >dev-ruby/faraday-0.9
+ >=dev-ruby/faraday_middleware-0.9.1
+ >dev-ruby/gh-0.13
+ >dev-ruby/highline-1.6
+ >dev-ruby/launchy-2.1
+ >dev-ruby/pusher-client-0.4
+ >=dev-ruby/typhoeus-0.6.8 =dev-ruby/typhoeus-0*
+"
+
+all_ruby_prepare() {
+ if use test ; then
+ git init --quiet . || die
+ git remote add origin "${HOMEPAGE}" || die
+ touch .travis.yml || die
+ fi
+
+ # Remove failing spec where cause is not fully clear.
+ # May be related to highline compatibility issues.
+ rm spec/cli/login_spec.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ newbashcomp "assets/travis.sh" "travis"
+}
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 0a80c12143b7..a39d0972b9fd 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,3 +1,2 @@
DIST typhoeus-0.6.9.gem 49152 SHA256 5979555fd430ebec72ab1f5630e8f7679979fb21984d8d9dfe3008d4f91794c8 SHA512 5063d3217f35db29d216327b6eed10d6613d018c496935e78aa8e2b10ec21f3372df11fe48155b45387767d5572efa93e74afb0bb9b10782d28e87dead0294a4 WHIRLPOOL a20d25696804d2d444fa6df145360056dd6170ace42a8cab0a84aa425ae7306173331db8ace402f4a1c596925ee8d52702bc91c967f943361a2a852170b03917
-DIST typhoeus-1.1.0.gem 53248 SHA256 7cd206c6e446c5f3f17da7962a3dc656058e254ead7af907da817e7ddaa4bba9 SHA512 5bf65faa69d981e998455e5a82578255bbad9e3f02c26a1d998a91dffb4ba904710869396f9f10c6df8d4d26bd4618e2d3f6aed5069bb1f850bbe558e4609aa1 WHIRLPOOL 8cb9fb900416c381bc72ab6f610c9e74ccd459be6cd1f053d71136b888b4be56693b20b3f0123839688aa7a4c39c16b2a057cdc0912c53c8a6dea22526b83e14
DIST typhoeus-1.1.2.gem 54784 SHA256 80f41502bef74e19f6e251a96c4a9511b45e88018cbb1639f92edf731c1d866d SHA512 1fc1ab1c2c15f1d324858a19f137b8b39a26d3b4938b7b09c7ea88e99bc1c08afb060710464221ff3af327322bc8354ed3486069420d189ba5cab91c76abfdea WHIRLPOOL ee7cf4a4248c9bf3063f308fc98fb6689b0b1680702c298f6ad51dd7578c1100ac8a86bb30a62a19654996bd0f9a10ea518f0353a30c82690e9689039912860a
diff --git a/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild b/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
index 19250de6f6ee..6f9d3d397d53 100644
--- a/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.6.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/typhoeus/typhoeus-1.1.0.ebuild b/dev-ruby/typhoeus/typhoeus-1.1.0.ebuild
deleted file mode 100644
index a541b547ec65..000000000000
--- a/dev-ruby/typhoeus/typhoeus-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
-HOMEPAGE="http://rubygems.org/gems/typhoeus/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
-
-ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 )"
-
-all_ruby_prepare() {
- sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/typhoeus/typhoeus-1.1.2.ebuild b/dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
index 27fe55b95223..b7bac4688be6 100644
--- a/dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
RUBY_FAKEGEM_TASK_DOC=""
@@ -16,7 +16,7 @@ DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling
HOMEPAGE="https://github.com/typhoeus/typhoeus"
LICENSE="Ruby"
-SLOT="0"
+SLOT="1"
KEYWORDS="~amd64"
IUSE=""
diff --git a/dev-util/rustfmt/rustfmt-0.5.0.ebuild b/dev-util/rustfmt/rustfmt-0.5.0.ebuild
index 9c3a89dc0ac0..4ccf2c0b1711 100644
--- a/dev-util/rustfmt/rustfmt-0.5.0.ebuild
+++ b/dev-util/rustfmt/rustfmt-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -35,7 +35,6 @@ inherit cargo
DESCRIPTION="Tool to find and fix Rust formatting issues"
HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
SRC_URI="$(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/rustfmt/rustfmt-0.6.3.ebuild b/dev-util/rustfmt/rustfmt-0.6.3.ebuild
index 598c380546c7..bb7b0a5a35f7 100644
--- a/dev-util/rustfmt/rustfmt-0.6.3.ebuild
+++ b/dev-util/rustfmt/rustfmt-0.6.3.ebuild
@@ -1,4 +1,5 @@
-# Auto-Generated by cargo-ebuild 0.1.3
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -39,11 +40,10 @@ inherit cargo
DESCRIPTION="Tool to find and fix Rust formatting issues"
HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
SRC_URI="$(cargo_crate_uris ${CRATES})"
-RESTRICT="mirror"
-LICENSE="Apache-2.0/MIT" # Update to proper Gentoo format
+LICENSE="|| ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=""
+DEPEND=">=dev-lang/rust-1.8.0"
RDEPEND=""
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index e95ec0777aa5..d0f7eb95f79b 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1054,6 +1054,12 @@ postinst_sources() {
# And now the general message.
if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
ewarn "This means that it is likely to be vulnerable to recent security issues."
+ echo
+ ewarn "Upstream kernel developers recommend always running the latest "
+ ewarn "release of any current long term supported Linux kernel version."
+ ewarn "To see a list of these versions, their most current release and "
+ ewarn "long term support status, please go to https://www.kernel.org ."
+ echo
ewarn "For specific information on why this kernel is unsupported, please read:"
ewarn "https://wiki.gentoo.org/wiki/Project:Kernel_Security"
fi
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index 901cff340460..9fbf24612be3 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1,3 +1,4 @@
DIST bzflag-2.4.2.tar.bz2 15971448 SHA256 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811 SHA512 e5645e825f19896ad4dc1e3bf97c9b52ed3838210d97d5532936a9306623283330c9535288af90f86e32c88a1a7996b2c872b9c081558eea48400b86b3a1a6ff WHIRLPOOL 82a5e543a8fdcb80c516394c63901c80c77fc659090f952cb36f65a9fb14c5ca06d6547dc9d347c6abf0ee706c40437f80edf20c424775bf6e202423e025794c
DIST bzflag-2.4.4.tar.bz2 13922761 SHA256 5842941e53440d2e88c955ddb594964fc5145912f61100832d224c1a017e2ecb SHA512 ee9eefe6a24250f1aa0ac808755f2e3700ea97c559019ca8beefb8d236afd1571314f07a8f19662677526ae364d38617a1a62b356e851c27669cb9acef1a8fd3 WHIRLPOOL c96853e3f1053a9b53c9d6ba27a6f638c2913e87a26d6188151a66f8f78aeeb78fac28e8cefde10d23d65fe02e49b93cd4516993e5b48a6f3f240ec67ab0fc8e
DIST bzflag-2.4.6.tar.bz2 13919761 SHA256 a44506828d09fe26f06658aae7f579080ecbaef5bd19a938dfed604e0c8afb45 SHA512 b2c82b75a99aa47975d98030104654da6ae3943582a22e18faf157c8929d96ab255a4343e044baa76714b8564c60194b6edbc7b8e28a3352848c471365678205 WHIRLPOOL 069dc60acc93b6159bac330c81a63493e370590ce09b871a17acdfcdf8b9ac6f84c6937ecc29df5d826a475f527f6fdaabf3b26f31ec5ef29824964f43c232de
+DIST bzflag-2.4.8.tar.bz2 14048447 SHA256 43ca4d1775dac4180feb67cc4450b5db82aab9a63e460ac769c8f40d22e03122 SHA512 b83eb4d5297ff8a75193b898a3de6eef7354196cb46f97f4828d7611e72476c3c7f1369dca80f8f3222b9e3a689cbcd7c735652b483b635e7422e18689bb9b82 WHIRLPOOL 9c1c49961e40dcf8d2219329c8448f60e0e0c307e854bc3d04047fe6ab1927e90a27d4e540fe0a2c0308b10fa2c4a123441921c03e4bfad9983595fa0e1da7cb
diff --git a/games-action/bzflag/bzflag-2.4.8.ebuild b/games-action/bzflag/bzflag-2.4.8.ebuild
new file mode 100644
index 000000000000..d63f9d37f345
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="http://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated upnp"
+
+DEPEND="
+ net-dns/c-ares
+ >=net-misc/curl-7.15.0
+ sys-libs/ncurses:0
+ sys-libs/zlib
+ !dedicated? (
+ media-libs/libsdl[joystick,sound,video]
+ virtual/glu
+ virtual/opengl )
+ upnp? ( net-libs/miniupnpc )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+
+ if use dedicated ; then
+ ewarn
+ ewarn "You are building a server-only copy of BZFlag"
+ ewarn
+ myconf="--disable-client --without-SDL"
+ fi
+
+ econf \
+ $(use_enable upnp UPnP) \
+ ${myconf}
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+ default
+
+ if ! use dedicated ; then
+ newicon data/bzflag-48x48.png ${PN}.png
+ make_desktop_entry ${PN} "BZFlag"
+ fi
+
+ prune_libtool_files --modules
+}
diff --git a/games-action/bzflag/files/bzflag-2.4.8-configure.patch b/games-action/bzflag/files/bzflag-2.4.8-configure.patch
new file mode 100644
index 000000000000..b280621f6ec2
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.8-configure.patch
@@ -0,0 +1,37 @@
+diff -ru bzflag-2.4.4.orig/configure.ac bzflag-2.4.4/configure.ac
+--- bzflag-2.4.4.orig/configure.ac 2016-02-14 19:09:51.000000000 -0500
++++ bzflag-2.4.4/configure.ac 2016-05-05 16:35:35.475935345 -0400
+@@ -215,7 +215,7 @@
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+
+-AC_PATH_PROG(CCACHE, ccache)
++AC_PATH_PROG(CCACHE, ccachex)
+ if test "$CCACHE" ; then
+ CC="ccache $CC"
+ CXX="ccache $CXX"
+@@ -747,13 +747,13 @@
+ #
+ # the GCC version is known to be at least 4.3 because it has C++0x support
+ # possible future warnings: -Wconversion (1894) -Wfloat-equal (317)
+-FLAGS="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
++FLAGSx="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
+ case $host_os in
+ linux*)
+ AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
+ CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
+ CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS"
+- case $host_vendor in
++ case $host_vendorx in
+ pc)
+ if expr `$CC -dumpversion` \>= "3.4" > /dev/null ; then
+ FLAGS=-mtune
+@@ -836,7 +836,7 @@
+ CXXFLAGS="$user_CXXFLAGS"
+ AC_DEFINE(DEBUG, 1, [Debugging enabled])
+ else
+- if test "$GCC" = yes ; then
++ if test "$GCC" = yesx ; then
+ case "`$CC --version 2>&1`" in
+ *LLVM*)
+ # Apple LLVM falsely claims to be GCC
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 999baea96a31..f644b68fc2a9 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,2 +1,2 @@
DIST FlightGear-2016.4.4-data.tar.bz2 1654119067 SHA256 3dfd4b82c99a8bf4b81dd31846efce52ed417be180eaa71020ccc914f9a49668 SHA512 e9a8dfb17c03fb2961e4d031ef63d56c580f029a7ceee816e67c3944a3a79f476ee1c6ad40ce8af530c8551497d9e1329b00805499ad85c4610c07bfaf22d3aa WHIRLPOOL 249ba21e7ad58c885a92094ec403d99bc8879e9c6638b8ebc2e48053c5524c62383c95ddb9bac3039ddbcd50a90b4a690676df642125e4219fc3c7e94f793717
-DIST FlightGear-2017.1.1-data.tar.bz2 1460031625 SHA256 873c0906934b3d795db9fd78889a5c6badc2fe15229bef549974b1492042fd80 SHA512 7f6f0bbe5807d45a2613a164d3111383c7bab330b05367f064974719f0a7bfceb13146852bf061ced284e57c86aa7eec74a1cb6869616f45d0a48e51abfc1607 WHIRLPOOL 2186387798b22bb7c30bcb503ae219477eaae380a76537a6ea1bc3e16a790626f32d64dc7837941d58799d063773228f0c37239b6217e35bcb54c43f60a95d32
+DIST FlightGear-2017.1.2-data.tar.bz2 1460657435 SHA256 99d38d0478a8c8031f59376112bd54a6f996e1d363807b3bb45786384cfb2753 SHA512 0498b662a26c03dd08a1861d63e982adeded1a01db34ccf09d2acd9420a0b0343242216c58fa2a2ce215806690eb4d1796114f15f3adbd391fa18421629d4f97 WHIRLPOOL 45a1898ed0ca108d501f3bd35153a2107c4e4f682e3b49a7e8f49015fa5a6b6468d5177cc79458e23f5ae9b3ee2744540ab82a48561d9ba994cb147adc898650
diff --git a/games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
similarity index 100%
rename from games-simulation/flightgear-data/flightgear-data-2017.1.1.ebuild
rename to games-simulation/flightgear-data/flightgear-data-2017.1.2.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 858334003100..c3aa9fb9e438 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1,2 @@
DIST flightgear-2016.4.4.tar.bz2 7560911 SHA256 d51992cbe40f1812f9821ab27b838d52e04c10551772d57fc2e815f4444dfafc SHA512 3f3d5a72adea9cb9a22b7b355a18492c1c58634e6203d6ae364d7a89f1af0fcc3df446c72c3c83ac9a1f51e05a6cd83c7d7af5f7bc3a5e8e75e3b80f709394a0 WHIRLPOOL 0a3fc48c5ec440cdcc7f2a99b860c51310fd9f256e5577458ccd9fa5202c26751b982918752326c68b5c6d9554eb902c4789df4a6221752870d3eaf263756226
-DIST flightgear-2017.1.1.tar.bz2 8057285 SHA256 8f98bbdc027164564cddf660856e0b2f4924c5c9b6a32735b14cd57b4338a028 SHA512 97421940c10e0afa3ecabeb3b3f676a262ed715ac47174cecceaef6962bc3f4a20c3bbc8505f4d600c6099940294d912148e9adb908ce6dc4546a5d2f2508a01 WHIRLPOOL 18b34c1dad47cd519fed095a000f5f532751f8c3902f2c7170b927c2dbe1c1227c74f270eb8fbc27e6d258373b8f288a96db4f864d1d512a42ebc0ae285832fc
+DIST flightgear-2017.1.2.tar.bz2 8056697 SHA256 41fe2a4ab0c14ed10436026c2edbb83148bf603691487976aaf2a5314f524659 SHA512 26466d6bd567c06cec7744dccba5c4a70d01c5169153c3c660175e9b400b9d1b5cc0d067e4d53d102ba5c20ceffb2217afcc54a0e86bf8aa7b3e7ee5a60aaf07 WHIRLPOOL f7b8a7884d4738a6e803a27b0dd3a5ad7bfc65d25b6c19baca0b0244222b967963ff3663298a8659ff01fd6aa52c4d7ed91f29792c8b77dded36ec6ba687200c
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index 631551696360..e1245c6f6579 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -20,7 +20,13 @@ COMMON_DEPEND="
>=dev-games/openscenegraph-3.2.0[png]
~dev-games/simgear-${PV}
media-libs/openal
- media-libs/speex
+ || (
+ (
+ >=media-libs/speex-1.2.0:0
+ media-libs/speexdsp:0
+ )
+ =dev-qt/qtwebsockets-5.4.1:5 )
)
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -64,6 +62,7 @@ src_configure() {
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
+ -DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
-DENABLE_FGVIEWER=$(usex utils)
-DENABLE_FLITE=OFF
-DENABLE_GPSSMOOTH=$(usex utils)
@@ -77,6 +76,7 @@ src_configure() {
-DENABLE_RTI=OFF
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TESTS=$(usex test)
+ -DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 746af6989996..30b2cbd01775 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -14,26 +14,23 @@ EGIT_BRANCH="next"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
+IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
# zlib is some strange auto-dep from simgear
+# TODO openmp
COMMON_DEPEND="
dev-db/sqlite:3
>=dev-games/openscenegraph-3.2.0[png]
~dev-games/simgear-${PV}
media-libs/openal
- || (
- (
- >=media-libs/speex-1.2.0
- media-libs/speexdsp
- )
- =media-libs/speex-1.2.0:0
+ media-libs/speexdsp:0
media-sound/gsm
sys-libs/zlib
virtual/glu
x11-libs/libX11
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+ gdal? ( >=sci-libs/gdal-2.0.0:0 )
qt5? (
>=dev-qt/qtcore-5.4.1:5
>=dev-qt/qtgui-5.4.1:5
@@ -46,6 +43,7 @@ COMMON_DEPEND="
media-libs/glew:0
media-libs/libpng:0
virtual/opengl
+ qt5? ( >=dev-qt/qtwebsockets-5.4.1:5 )
)
"
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
@@ -65,28 +63,31 @@ DOCS=(AUTHORS ChangeLog NEWS README Thanks)
src_configure() {
local mycmakeargs=(
- -DENABLE_FGCANVAS=$(usex qt5 && usex utils)
+ -DENABLE_DEMCONVERT=$(usex gdal && usex utils)
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
+ -DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
-DENABLE_FGVIEWER=$(usex utils)
-DENABLE_FLITE=OFF
+ -DENABLE_GDAL=$(usex gdal)
-DENABLE_GPSSMOOTH=$(usex utils)
-DENABLE_JS_DEMO=$(usex utils)
-DENABLE_JSBSIM=ON
-DENABLE_LARCSIM=ON
-DENABLE_LOGGING=$(usex test)
-DENABLE_METAR=$(usex utils)
+ -DENABLE_OPENMP=$(usex openmp)
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF # NOTE dead codepath in Gentoo anyway
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TESTS=$(usex test)
-DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
-DENABLE_YASIM=ON
-DEVENT_INPUT=$(usex udev)
+ -DFG_BUILD_TYPE=Dev
-DFG_DATA_DIR=/usr/share/${PN}
-DJSBSIM_TERRAIN=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
index 50f99784e5fe..519cdc02d1e3 100644
--- a/games-simulation/flightgear/metadata.xml
+++ b/games-simulation/flightgear/metadata.xml
@@ -11,6 +11,7 @@