diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 08f6220a1a3e..e0df7e04f2ae 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1 +1,2 @@
DIST entr-3.6.tar.gz 22548 SHA256 a42746d81c548d7e557d500f93422b8ec9731d719309eb2601b8be69ae0dc8eb SHA512 a4f607d69e2222ffaeb50c57532fafa88db550d4ab4c633e57e895a8291bb38f6bdd09e92dba2e6fc70e035b2db050ab4c75fb39cd24d00fbde07ef0c03fff8f WHIRLPOOL fb0e6d16b20a6829478e3a01972b817b73408412ef5a3542b6b087bce02371ae84cd17c8c558ad7565edf73328fe886414478c618e37f409372ed2f48795eb4e
+DIST entr-3.7.tar.gz 23326 SHA256 94efd50c8f7e9d569060d5deebf366c3565e81e814ab332b973d7298fa8ea22f SHA512 a1687ec2da99f65fba3f668e41345ba76cb8c87cc2343d98c0dcc0ac0dedeb40cd8b5fd9aa3eba1dee8add94585de939864633bf0020cea1043699019dfa15fe WHIRLPOOL 1a9077a3cd8939bcea49c42e2a85eb094840942bdd23f6911c32c9d3184f742d06666e12c3d53c5e99026c82a20612bce8fd9441ccb27eddb68b61196a79fee8
diff --git a/app-admin/entr/entr-3.7.ebuild b/app-admin/entr/entr-3.7.ebuild
new file mode 100644
index 000000000000..41caf72596a4
--- /dev/null
+++ b/app-admin/entr/entr-3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv eradman-* "${P}" || die
+}
+
+src_configure() {
+ sh configure || die
+ sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+}
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 69a6186eb85f..aee3781a8488 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -5,3 +5,4 @@ DIST github-backup-utils-2.6.4.tar.gz 51270 SHA256 caf34b54a3961562d545ad2fb68ec
DIST github-backup-utils-2.7.0.tar.gz 51409 SHA256 9556dbd438ea3525692705844c20b5bedc9a942c5415dd3c0fd9e383323dc11f SHA512 16112e8d05001146a182e225c1bb5bdfbe210ddb3993d989a9fe88b88bbf222196a66f1f48b262b198675af8e4b3e3a10120e7dafa7b244137bf29cd879efaaf WHIRLPOOL 9600d45f69f16cb95b0bb0b3cc5620d7bb6c2e65c2ac6b6942287c85487e83bb2b74d0869b411d0b4829cc9dd2da20972a7635780f00facadc28ca9787028a3b
DIST github-backup-utils-2.7.1.tar.gz 68793 SHA256 e1e9ee69a005252ab4899693d43fee1aaebac3783d97c343e16566d0c12cdc17 SHA512 950c24b3fef8775c2a90789c469a81256323c1ede67b3f6691920e78c1489533adf5616f2ac09f9b844382778b5b2b5106f8c467be7d65b47ee06bf732591880 WHIRLPOOL 87cabe2138c58cf41a803cc43c23748a2f3ed578f3488bfb38861db64b81cb31f4d3aa41e6a240788c3bc9a32d9f523dd28cdb099e1b21cc2472d2cde72f7916
DIST github-backup-utils-2.8.2.tar.gz 71392 SHA256 7aaa435d007b2697c3540ce6e2d3e5ba999fa33339ed21f43db6e9bb42c7d78d SHA512 d3801d37f18b41594bfee83b891ce1eb9f1a15972839bd9dfb6469d311484ef94f635da4319b0b9f2d6778d87b935ca5c0bd42ddbf009f292e05b6a654464bf4 WHIRLPOOL f7c730ee6248b2bc7b8017ece697584717337a9a5f42e38544ed57db498863aa8e1fd3a029b00dcfd26a44f9d32448fba3b092fcccfa3277423ab48ebeb295b1
+DIST github-backup-utils-2.9.0.tar.gz 72512 SHA256 c019467eb218e25de0905f56af03bde59f09d06fee1ec2fc8ef21ddddfc8c711 SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b WHIRLPOOL 9134ba916386f6590b4372992133b358f8284ebb4787bf8ae00c199a78df9fe34cbb6de45de3fcee0d3dffeae58e645d46d17ff8489fe443c682b3b685a5d8ae
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/github-backup-utils/metadata.xml b/app-admin/github-backup-utils/metadata.xml
index 3fa81dc58778..3bac2658b1ef 100644
--- a/app-admin/github-backup-utils/metadata.xml
+++ b/app-admin/github-backup-utils/metadata.xml
@@ -5,6 +5,10 @@
wizardedit@gentoo.org
Austin English
+
+ williamh@gentoo.org
+ William Hubbs
+
Provides backup utilities for Github Enterprise installations.
diff --git a/app-arch/pigz/pigz-2.3.4.ebuild b/app-arch/pigz/pigz-2.3.4.ebuild
index 82295edd82ba..575fbbfdcbab 100644
--- a/app-arch/pigz/pigz-2.3.4.ebuild
+++ b/app-arch/pigz/pigz-2.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
IUSE="static symlink test"
LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 4c1865d2d342..66607da59d2d 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,3 +1 @@
-DIST ccid-1.4.24.tar.bz2 594507 SHA256 62cb73c6c009c9799c526f05a05e25f00f0ad86d50f82a714dedcfbf4a7e4176 SHA512 4904165fdd089cd6f28b1c27130119d3433641a9cea5d6700afd1daa2722f763e2b348a42af4a292fdd08da45c7b17b2804b32b1fbe0ff19dccf58ec3310b09f WHIRLPOOL b2f88557ae0e6fb838432eaf0d13be1f7631c7d7f4b4a0c20014b060f0368fb5acba0c15eba7fdf6d9e31dc115a9c0bec5fe1e83468943522c94b8a89e93932c
-DIST ccid-1.4.25.tar.bz2 627456 SHA256 6b062b4ce0f04d6838d58e6faa255ba05222bd8ecb57a2d1116fdbe22f253609 SHA512 97ca4009e5b4522e3db913ab147bd32bd24490c798d31be6614d3b337e0ab47e93a1ae0c1dfe1cf47a41145b3b37f5a10bbbafec980c180b407b511f18f9ac2c WHIRLPOOL bad411d2a8731a8a2e8318df8f4774d1c2c124516ecbd81cd804b3bb1f504c28bd9fa74fb5c33252e9f1c2202dfe7fe952ee7eceeae1acadbae06e0e7ce84b7a
DIST ccid-1.4.26.tar.bz2 628038 SHA256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c WHIRLPOOL 7118e57ca9a394de3b37166bb2c4f4d398fdf744caa0803ef9f1470db7020d999f795ca816a5a70db2b59b64db7225df2dd9366fd329ca34d52b5e4611fd5d21
diff --git a/app-crypt/ccid/ccid-1.4.24.ebuild b/app-crypt/ccid/ccid-1.4.24.ebuild
deleted file mode 100644
index 1249c28cabb3..000000000000
--- a/app-crypt/ccid/ccid-1.4.24.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-STUPID_NUM="4171"
-
-inherit eutils toolchain-funcs udev autotools-utils
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
- usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
- kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README AUTHORS )
-
-src_configure() {
- local myeconfargs=(
- LEX=:
- $(use_enable twinserial)
- $(use_enable usb libusb)
- )
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use kobil-midentity && autotools-utils_src_compile contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use kobil-midentity; then
- dosbin "${BUILD_DIR}"/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
- doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
- fi
-
- if use kernel_linux; then
- # note: for eudev support, rules probably will always need to be
- # installed to /usr
-
- # ccid >=1.4.11 version changed the rules drastically in a minor
- # release to no longer use the pcscd group. Using the old ones in
- # the mean time.
- udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
- # disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
- if ! use kobil-midentity; then
- sed \
- -e '/Kobil_mIDentity_switch/s/^/#/' \
- -i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
- fi
-
- fi
-}
diff --git a/app-crypt/ccid/ccid-1.4.25.ebuild b/app-crypt/ccid/ccid-1.4.25.ebuild
deleted file mode 100644
index ee9249432dec..000000000000
--- a/app-crypt/ccid/ccid-1.4.25.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-STUPID_NUM="4187"
-
-inherit eutils toolchain-funcs udev autotools-utils
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
- usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
- kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README AUTHORS )
-
-src_configure() {
- local myeconfargs=(
- LEX=:
- $(use_enable twinserial)
- $(use_enable usb libusb)
- )
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
- use kobil-midentity && autotools-utils_src_compile contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use kobil-midentity; then
- dosbin "${BUILD_DIR}"/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
- doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
- fi
-
- if use kernel_linux; then
- # note: for eudev support, rules probably will always need to be
- # installed to /usr
-
- # ccid >=1.4.11 version changed the rules drastically in a minor
- # release to no longer use the pcscd group. Using the old ones in
- # the mean time.
- udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
- # disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
- if ! use kobil-midentity; then
- sed \
- -e '/Kobil_mIDentity_switch/s/^/#/' \
- -i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
- fi
-
- fi
-}
diff --git a/app-crypt/ccid/ccid-1.4.26.ebuild b/app-crypt/ccid/ccid-1.4.26.ebuild
index 1b78f4783e0a..6f60824d4ea9 100644
--- a/app-crypt/ccid/ccid-1.4.26.ebuild
+++ b/app-crypt/ccid/ccid-1.4.26.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
IUSE="twinserial kobil-midentity +usb"
RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
index 27c6685818d1..60b451e1bd3e 100644
--- a/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.8.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp static-libs cxx python qt5"
COMMON_DEPEND="app-crypt/gnupg
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index a23c0091cc83..02ecc3d1cb7e 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=""
diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
index 1247fc4a3a0f..ac3a0f56ce15 100644
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc sparc x86"
IUSE=""
DEPEND=">=dev-lang/perl-5.6
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
index ef85072615b7..efb82a521ffe 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999.ebuild
@@ -112,9 +112,6 @@ src_prepare() {
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
-
- #605400
- bash -c 'autoreconf() { :; }; . $0 "$@"' autogen.sh --no-check || die
fi
eapply_user
@@ -123,6 +120,8 @@ src_prepare() {
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|| die "unable to sed ctags.1"
+ bash -c 'autoreconf() { echo nope; }; . $0 "$@"' \
+ ./autogen.sh --no-check || die #605400
AT_M4DIR=m4 eautoreconf
touch src/stamp-h.in || die
}
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.0.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.0.0.ebuild
index 09a86f09038c..ba173b1a641d 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.0.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.0.0.ebuild
@@ -26,4 +26,5 @@ RDEPEND="${CDEPEND}
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
app-emulation/qemu
sys-block/parted
- sys-fs/multipath-tools"
+ sys-fs/multipath-tools
+ !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/qt-virt-manager/Manifest b/app-emulation/qt-virt-manager/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app-emulation/qt-virt-manager/metadata.xml b/app-emulation/qt-virt-manager/metadata.xml
new file mode 100644
index 000000000000..ee309bddf45f
--- /dev/null
+++ b/app-emulation/qt-virt-manager/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ virtualization@gentoo.org
+ Gentoo Virtualization Project
+
+
+
diff --git a/app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild b/app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
new file mode 100644
index 000000000000..11f0c5f38017
--- /dev/null
+++ b/app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/F1ash/qt-virt-manager.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/F1ash/qt-virt-manager/archive/${P}.tar.gz"
+ KEYWORDS=""
+fi
+
+DESCRIPTION="A GUI application for managing virtual machines"
+HOMEPAGE="https://github.com/F1ash/qt-virt-manager"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="smartcard"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-qt/qtnetwork:5
+ >=x11-libs/qtermwidget-0.7.0
+ smartcard? ( >=app-emulation/libcacard-2.5.0 )
+ dev-libs/glib
+ net-misc/spice-gtk
+ net-libs/libvncserver
+ app-emulation/libvirt
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_QT_VERSION=5
+ -DWITH_LIBCACARD="$(usex smartcard ON OFF)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index bf8057b56d97..98a93584809f 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1 +1,2 @@
DIST virt-manager-1.4.0.tar.gz 2667631 SHA256 bf31a40cc48500cbf87a0e93a5838fc3f6ce4e2fa03f8bce6aa2615625e6caca SHA512 6e28b0c4a91a9d96a0b5402e2af2bb0e670eb545824cf73877053c84891449bce236ffe2a79834a34d46443a7e5caa102cbbb0ac54af840a3997fbb61e155d51 WHIRLPOOL 824e088d90015a63264fb425fc94f2f9d21368475719a07777682d3e6a724cd0f20be039ef8164817f223ed72fdfea83033d2787ee19b014374ec520dca860be
+DIST virt-manager-1.4.1.tar.gz 2715863 SHA256 e6c549999f14fbda210c07821910bfa35c086542e166f8b00d7c83717e9f3944 SHA512 ea4cdc16d7adecdb85431fdfbe7305518917b7d66342375b6773462d33d5647c2a4d3f054c08cd44d7c4e7785da92e38b18881a422083e82303b5a3dbd7b4cdd WHIRLPOOL 5b14893ad6fa05452dccb6ff579694f6ae5fc99a4b65feea4b0333bef7db49cd4fb5b83aa8d1baac25d21502982533f610c8b282943e335e7aa79ebfedb91660
diff --git a/app-emulation/virt-manager/virt-manager-1.4.1.ebuild b/app-emulation/virt-manager/virt-manager-1.4.1.ebuild
new file mode 100644
index 000000000000..7e64ce32473c
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-1.4.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ SRC_URI=""
+ KEYWORDS=""
+ EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+else
+ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
+ >=app-emulation/libvirt-glib-1.0.0[introspection]
+ ${PYTHON_DEPS}
+ dev-libs/libxml2[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=sys-libs/libosinfo-0.2.10[introspection]
+ gtk? (
+ x11-libs/gtk+:3[introspection]
+ gnome-base/dconf
+ >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+ net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+ net-misc/x11-ssh-askpass
+ x11-libs/vte:2.91[introspection]
+ gnome-keyring? ( gnome-base/libgnome-keyring )
+ policykit? ( sys-auth/polkit[introspection] )
+ x11-themes/gnome-icon-theme
+ )"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/intltool"
+
+DOCS=( README.md NEWS.md )
+
+src_prepare() {
+ distutils-r1_src_prepare
+}
+
+distutils-r1_python_compile() {
+ local defgraphics=
+
+ esetup.py configure \
+ --qemu-user=qemu \
+ --default-graphics=spice
+}
+
+src_install() {
+ local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+
+ distutils-r1_src_install
+
+ python_fix_shebang \
+ "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
+}
+
+pkg_preinst() {
+ if use gtk; then
+ gnome2_pkg_preinst
+
+ cd "${ED}"
+ export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+ else
+ rm -rf "${ED}/usr/share/virt-manager/virtManager"
+ rm -f "${ED}/usr/share/virt-manager/virt-manager"
+ rm -rf "${ED}/usr/share/virt-manager/ui/"
+ rm -rf "${ED}/usr/share/virt-manager/icons/"
+ rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+ rm -rf "${ED}/usr/share/icons/"
+ rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+ rm -rf "${ED}/usr/bin/virt-manager"
+ fi
+}
+
+pkg_postinst() {
+ use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 281d89234741..7e64ce32473c 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
@@ -12,7 +12,7 @@ DESCRIPTION="A graphical tool for administering virtual machines"
HOMEPAGE="http://virt-manager.org"
if [[ ${PV} = *9999* ]]; then
- inherit git-2
+ inherit git-r3
SRC_URI=""
KEYWORDS=""
EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
@@ -21,13 +21,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
-VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is
- it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te
- tr uk vi zh_CN zh_TW )
-
LICENSE="GPL-2"
SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl ${VM_LINGUAS[@]/#/linguas_}"
+IUSE="gnome-keyring gtk policykit sasl"
RDEPEND="!app-emulation/virtinst
dev-python/libvirt-python[${PYTHON_USEDEP}]
@@ -44,7 +40,7 @@ RDEPEND="!app-emulation/virtinst
>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
net-misc/x11-ssh-askpass
- x11-libs/vte:2.90[introspection]
+ x11-libs/vte:2.91[introspection]
gnome-keyring? ( gnome-base/libgnome-keyring )
policykit? ( sys-auth/polkit[introspection] )
x11-themes/gnome-icon-theme
@@ -57,11 +53,6 @@ DOCS=( README.md NEWS.md )
src_prepare() {
distutils-r1_src_prepare
-
- local lang
- for lang in ${VM_LINGUAS[@]}; do
- use linguas_${lang} || rm -v "po/${lang}.po" || die
- done
}
distutils-r1_python_compile() {
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.4.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.4.ebuild
deleted file mode 100644
index 5a6db7957aba..000000000000
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
-
-S=${FILESDIR}
-
-src_install() {
- insinto /usr/share/eselect/modules
- newins pinentry.eselect-${PV} pinentry.eselect
-}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.5.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.5.ebuild
deleted file mode 100644
index 7ff1f680aafb..000000000000
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
-
-S=${FILESDIR}
-
-src_install() {
- insinto /usr/share/eselect/modules
- newins pinentry.eselect-${PV} pinentry.eselect
-}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
deleted file mode 100644
index 2c64ba489255..000000000000
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Manage /usr/bin/pinentry symlink"
-HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
-
-S=${FILESDIR}
-
-src_install() {
- insinto /usr/share/eselect/modules
- newins pinentry.eselect-${PV} pinentry.eselect
-}
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
index 0b8908526b31..b1dd776c4e3d 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.4 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.4
deleted file mode 100644
index 9066ff261c53..000000000000
--- a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/pinentry implementation"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.4"
-
-SYMLINK_PATH=/usr/bin/pinentry
-SYMLINK_TARGETS=( pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses )
-SYMLINK_DESCRIPTION='pinentry binary'
-
-inherit bin-symlink
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.5 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.5
deleted file mode 100644
index f456349bdc58..000000000000
--- a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/pinentry implementation"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.5"
-
-SYMLINK_PATH=/usr/bin/pinentry
-SYMLINK_TARGETS=( pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses pinentry-gnome3 )
-SYMLINK_DESCRIPTION='pinentry binary'
-
-inherit bin-symlink
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.6 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.6
deleted file mode 100644
index f8f824e5bd1b..000000000000
--- a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manage /usr/bin/pinentry implementation"
-MAINTAINER="ssuominen@gentoo.org"
-VERSION="0.5"
-
-SYMLINK_PATH=/usr/bin/pinentry
-SYMLINK_TARGETS=( pinentry-gnome3 pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses )
-SYMLINK_DESCRIPTION='pinentry binary'
-
-inherit bin-symlink
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 950d96c8ae80..7561ff6e05fc 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1 +1,2 @@
DIST tidy-html5-5.2.0.zip 578494 SHA256 7f6ef14e41a0e9611fcb95e4926287e0d4a46c53335ae7e3aa4fc11ae69d32e2 SHA512 0559bbe24711606b391057b3dbf2692b54e548294f68b310be306b5be80c9265ba7c4aa8da2b13ba0c89dae1dd6d233aebebdba761e25193439a0c0d713e59d8 WHIRLPOOL 7040ad176d2a96936cf250afc16f8376c9febd80ef98976bca318407299e52896c34a23964654efb1d69a2bf49438f6402d4af9d140ce45f6fe7d27bda010dce
+DIST tidy-html5-5.4.0.zip 573217 SHA256 aa9d611cdee60ef0d20941f6c5f09240189e3a90e4ef8994b15bf561ce3ed691 SHA512 788646c0c15a1be58695469977c340cbe7d37fada63faea34b67c1d7ffe6074ed2b6dcd6cc946a0ae99cd5319c9a8c5ffb81958f82b6097a35a3215bc1776fa8 WHIRLPOOL f081b17b22feb05c436756dea7e55cdd98608bc99d085db0121e0fdb297761dc7a87b4793586cdaf841bcc4a6bd1e08a566620030702482bd1ecce7dcdd94c86
diff --git a/app-text/tidy-html5/tidy-html5-5.4.0.ebuild b/app-text/tidy-html5/tidy-html5-5.4.0.ebuild
new file mode 100644
index 000000000000..4632b3e1a371
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
+HOMEPAGE="http://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+RDEPEND="!app-text/htmltidy"
+
+DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
+
+BUILD_DIR="${S}/build/cmake"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_BUILD_TYPE=Release
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd build/cmake || die
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/dev-db/sqlite/sqlite-3.16.2.ebuild b/dev-db/sqlite/sqlite-3.16.2.ebuild
index a8f41dcdc83f..85b1897f9dec 100644
--- a/dev-db/sqlite/sqlite-3.16.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.16.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e454a8b4fb34..73e44fe81c34 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,6 +8,7 @@ DIST apache-tomcat-7.0.75-src.tar.gz 4657629 SHA256 ffa9489ecd9aa0750598e5db0dc3
DIST apache-tomcat-8.0.39-src.tar.gz 5019148 SHA256 566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96 SHA512 0f58f2ef0dc047189672107b1f2586731e9455c3e665210d5634f5f5a16b0afd7ef5c35beaf02e22b874d4898ab62d33638785d9f18714893674bc691b0f9330 WHIRLPOOL 62baaba90f588c43ea503eb336d1b385b3a00b86686c1e232a836975f10d12241416b688279ffcd60dd42afb9d9660b6385e749c0c4d0877217f7494539f2752
DIST apache-tomcat-8.0.41-src.tar.gz 4950440 SHA256 2bbaf50e9c9ffe8d79369c0c16cad04ea256cccde85658d15a011c8f8d1c2b77 SHA512 6d2d104be33f203a5c45e6d0d8a8631542830462da932f1d11eadfb9927ba82e3fa5245321197e610f55ed34622b50743cb3af4699c7cedfb91b9dd2b35f338d WHIRLPOOL 758104c1e2f7aa57ffff07f8711b6c08c67674c4c9b8702f8da2d48839da1802f158aa158aef6386af27e6c95b430c6060436cafbd7accc48c7bced376c5cef8
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
+DIST apache-tomcat-8.5.12-src.tar.gz 5009933 SHA256 af8b7ab3cc3ba17a667fd1fdd943ce5a459e8e887d30902030af7c42e3af2b07 SHA512 de8e928db261143629e415cb3532fbe762620d0500eca021d9a888671e9a609f82039b14db3d64371076be13e2ca6affc045f62bcd38c1608e968cb07d3e77d1 WHIRLPOOL eb927ed655ee49417203264b5cf45bd39629df2e29387a78d9db43f1c9e6376adad641d779a1243a109695aedcaa0a4a886c7edad523488ab02aef0cf94475a5
DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df
-DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049
+DIST apache-tomcat-9.0.0.M18-src.tar.gz 4941860 SHA256 b1e94928835aac40a004bd052ef8c927065581c7bf69a3989867d048ea262648 SHA512 bb950b1efb5eb498a8cde542a13b0eec21209ed971f288b1372948cf67f54243650fbf4dc5b6a512d314b2c6b8d04db6e9ae52cdae2fd46a1d9d8ba7578c7e44 WHIRLPOOL 144c62573a2d0093e870ae93b681922de222867d075b52348e94cc815889f8fdb30127d3e292320e9b4787528446f0cdf4e183a840eeb2a50e7dd74154e30cee
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.12.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.12.ebuild
new file mode 100644
index 000000000000..dd03de7b76e7
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.12.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha18.ebuild
similarity index 100%
rename from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha15.ebuild
rename to dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha18.ebuild
diff --git a/dev-lang/gnat-gcc/files/gcc-spec-env-r1.patch b/dev-lang/gnat-gcc/files/gcc-spec-env-r1.patch
new file mode 100644
index 000000000000..a58926836e4e
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/gcc-spec-env-r1.patch
@@ -0,0 +1,87 @@
+2013-08-22 Magnus Granberg
+
+ * gcc/gcc.c (main): Add support for external spec file via the GCC_SPECS env var
+ and move the process of the user specifed specs.
+
+ This allows us to easily control pie/ssp defaults with gcc-config profiles.
+ Original patch by Rob Holland
+ Extended to support multiple entries separated by ':' by Kevin F. Quinn
+ Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
+ Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by Magnus Granberg
+
+--- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100
++++ gcc-4.8-20130210-work/gcc/gcc.c 2013-07-26 02:32:14.625089864 +0200
+@@ -6427,6 +6428,48 @@ main (int argc, char **argv)
+ do_option_spec (option_default_specs[i].name,
+ option_default_specs[i].spec);
+
++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
++ /* Add specs listed in GCC_SPECS. Note; in the process of separating
++ * each spec listed, the string is overwritten at token boundaries
++ * (':') with '\0', an effect of strtok_r().
++ */
++ specs_file = getenv ("GCC_SPECS");
++ if (specs_file && (strlen(specs_file) > 0))
++ {
++ char *spec, *saveptr;
++ for (spec=strtok_r(specs_file,":",&saveptr);
++ spec!=NULL;
++ spec=strtok_r(NULL,":",&saveptr))
++ {
++ struct user_specs *user = (struct user_specs *)
++ xmalloc (sizeof (struct user_specs));
++ user->next = (struct user_specs *) 0;
++ user->filename = spec;
++ if (user_specs_tail)
++ user_specs_tail->next = user;
++ else
++ user_specs_head = user;
++ user_specs_tail = user;
++ }
++ }
++#endif
++ /* Process any user specified specs in the order given on the command
++ * line. */
++ for (uptr = user_specs_head; uptr; uptr = uptr->next)
++ {
++ char *filename = find_a_file (&startfile_prefixes, uptr->filename,
++ R_OK, true);
++ read_specs (filename ? filename : uptr->filename, false, true);
++ }
++ /* Process any user self specs. */
++ {
++ struct spec_list *sl;
++ for (sl = specs; sl; sl = sl->next)
++ if (sl->name_len == sizeof "self_spec" - 1
++ && !strcmp (sl->name, "self_spec"))
++ do_self_spec (*sl->ptr_spec);
++ }
++
+ /* Process DRIVER_SELF_SPECS, adding any new options to the end
+ of the command line. */
+
+@@ -6535,24 +6578,6 @@ main (int argc, char **argv)
+ PREFIX_PRIORITY_LAST, 0, 1);
+ }
+
+- /* Process any user specified specs in the order given on the command
+- line. */
+- for (uptr = user_specs_head; uptr; uptr = uptr->next)
+- {
+- char *filename = find_a_file (&startfile_prefixes, uptr->filename,
+- R_OK, true);
+- read_specs (filename ? filename : uptr->filename, false, true);
+- }
+-
+- /* Process any user self specs. */
+- {
+- struct spec_list *sl;
+- for (sl = specs; sl; sl = sl->next)
+- if (sl->name_len == sizeof "self_spec" - 1
+- && !strcmp (sl->name, "self_spec"))
+- do_self_spec (*sl->ptr_spec);
+- }
+-
+ if (compare_debug)
+ {
+ enum save_temps save;
diff --git a/dev-lang/gnat-gcc/files/gnat-gcc-4.9.3-make-default-paths-match-slot.patch b/dev-lang/gnat-gcc/files/gnat-gcc-4.9.3-make-default-paths-match-slot.patch
new file mode 100644
index 000000000000..0c197a15c134
--- /dev/null
+++ b/dev-lang/gnat-gcc/files/gnat-gcc-4.9.3-make-default-paths-match-slot.patch
@@ -0,0 +1,27 @@
+--- gcc/Makefile.in.orig 2016-05-20 15:01:04.277726220 -0700
++++ gcc/Makefile.in 2016-05-20 18:40:43.658617109 -0700
+@@ -594,9 +594,9 @@
+ # --------
+
+ # Directory in which the compiler finds libraries etc.
+-libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)
++libsubdir = $(libdir)/gnat-gcc/$(target_noncanonical)/SLOT_MARKER
+ # Directory in which the compiler finds executables
+-libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version)
++libexecsubdir = $(libexecdir)/gnat-gcc/$(target_noncanonical)/SLOT_MARKER
+ # Directory in which all plugin resources are installed
+ plugin_resourcesdir = $(libsubdir)/plugin
+ # Directory in which plugin headers are installed
+@@ -1944,9 +1944,9 @@
+
+ DRIVER_DEFINES = \
+ -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+- -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
+- -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
+- -DDEFAULT_TARGET_VERSION=\"$(version)\" \
++ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gnat-gcc/\" \
++ -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gnat-gcc/\" \
++ -DDEFAULT_TARGET_VERSION=\"SLOT_MARKER\" \
+ -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
+ -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+ -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 1b0cc50b4caa..492902f842f5 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,2 @@
-DIST Botan-1.10.14.tgz 2710757 SHA256 10ed0b394db165733ac9557d8656356b7e9744d38c61c2b9c44cba6d84ff4c1c SHA512 ae524653a99b02d6d8d7bb2b88a446c066fe1044d8fd2708ea2a4cd5aafbe2b0d165d2ce1730669a4df18013cf5b6540bb5944bafea512b4957e3417de512e95 WHIRLPOOL 51aa1d68757ad515f65c255c585be8050efed085800340d43fa068b48647ef8c50fc9e284ac16d0cef3d874f5fa44f143210dcc004561807e1d1b307d89cff9d
DIST Botan-1.10.15.tgz 2711022 SHA256 c0cc8ffd470fda4b257c3ef9faf5cf93751f4c283dfba878148acafedfab70fe SHA512 c3b93f44ad0de9758af11557833ee570aa0724c8b57c9a576b56ab439a7819e0f71a10857ad367b486716164dd4ff551cab2036ecbbbedd75db4b8dc93416bc8 WHIRLPOOL 834cad8b38787581d8d967b2fa6ffb6164e2bf8a124d993733a7d55202439ec543c18cb6cb03721c0e8eb67cbe2a486b8199b3b8784645e0033be298f36640b9
DIST Botan-2.0.1.tgz 4995413 SHA256 a138ed316d11450a8405451b9c9664b8e640a9b7ad84d3f3ad34e8071f364e0b SHA512 c5062ce92a6e6e333b4e6af095ed54d0c4ffacefc6ac87ec651dd1e0937793c9956b7c9c0d3acf49f059505526584168364e01c55ab72c953ad255e8396aed35 WHIRLPOOL 36cec762b05b761d77fc0421379e7c78172c67d1d8c9da4349df34f68d7d1a4fd5cca394ba4bd7c2e1a13a218a6a349b2216bfd7868e93549e37e5cf7ddc7dc1
diff --git a/dev-libs/botan/botan-1.10.14.ebuild b/dev-libs/botan/botan-1.10.14.ebuild
deleted file mode 100644
index 6bb0c29ae79e..000000000000
--- a/dev-libs/botan/botan-1.10.14.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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} )
-
-inherit eutils multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
-
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
- zlib? ( >=sys-libs/zlib-1.2.3 )
- python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
- gmp? ( >=dev-libs/gmp-4.2.2:* )
- ssl? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-src_prepare() {
- default
-
- sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
- sed \
- -e "/DOCDIR/d" \
- -e "/^install:/s/ docs//" \
- -i src/build-data/makefile/unix_shr.in || die "sed failed"
-
- # Fix ImportError with Python 3.
- sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
-
- use python && python_copy_sources
-}
-
-src_configure() {
- local disable_modules="proc_walk,unix_procs"
- use threads || disable_modules+=",pthreads"
- use bindist && disable_modules+=",ecdsa"
- elog "Disabling modules: ${disable_modules}"
-
- # Enable v9 instructions for sparc64
- if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
- CHOSTARCH="sparc32-v9"
- else
- CHOSTARCH="${CHOST%%-*}"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- # foobared buildsystem, --prefix translates into DESTDIR, see also make
- # install in src_install, we need the correct live-system prefix here on
- # Darwin for a shared lib with correct install_name
- ./configure.py \
- --prefix="${EPREFIX}/usr" \
- --libdir=$(get_libdir) \
- --docdir=share/doc \
- --cc=gcc \
- --os=${myos} \
- --cpu=${CHOSTARCH} \
- --with-endian="$(tc-endian)" \
- --without-sphinx \
- --with-tr1=system \
- $(use_with bzip2) \
- $(use_with gmp gnump) \
- $(use_with python boost-python) \
- $(use_with ssl openssl) \
- $(use_with zlib) \
- --disable-modules=${disable_modules} \
- || die "configure.py failed"
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
-
- if use python; then
- building() {
- rm -fr build/python
- ln -s "${BUILD_DIR}" build/python
- cp Makefile.python build/python
- sed -i \
- -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
- build/python/Makefile.python
- emake -f build/python/Makefile.python \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- PYTHON_ROOT="/usr/$(get_libdir)" \
- PYTHON_INC="-I$(python_get_includedir)"
- }
- python_foreach_impl building
- fi
-
- if use doc; then
- einfo "Generation of documentation"
- sphinx-build doc doc_output
- fi
-}
-
-src_test() {
- chmod -R ugo+rX "${S}"
- emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
- LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
- emake DESTDIR="${ED}usr" install
-
- if ! use static-libs; then
- rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
- fi
-
- # Add compatibility symlinks.
- [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
- [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
- dosym botan-config-1.10 /usr/bin/botan-config
- dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
-
- if use python; then
- installation() {
- rm -fr build/python
- ln -s "${BUILD_DIR}" build/python
- emake -f Makefile.python \
- PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
- install
- }
- python_foreach_impl installation
- fi
-
- if use doc; then
- pushd doc_output > /dev/null
- insinto /usr/share/doc/${PF}/html
- doins -r [a-z]* _static
- popd > /dev/null
- fi
-}
diff --git a/dev-libs/botan/botan-1.10.15-r1.ebuild b/dev-libs/botan/botan-1.10.15-r1.ebuild
index 2c0ca2a5b02c..00add8ce3184 100644
--- a/dev-libs/botan/botan-1.10.15-r1.ebuild
+++ b/dev-libs/botan/botan-1.10.15-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
HOMEPAGE="http://botan.randombit.net/"
SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos"
SLOT="0"
LICENSE="BSD"
IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads zlib"
diff --git a/dev-libs/botan/botan-1.10.15.ebuild b/dev-libs/botan/botan-1.10.15.ebuild
deleted file mode 100644
index 012154ba371e..000000000000
--- a/dev-libs/botan/botan-1.10.15.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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} )
-
-inherit eutils multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
- zlib? ( >=sys-libs/zlib-1.2.3 )
- python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
- gmp? ( >=dev-libs/gmp-4.2.2:* )
- ssl? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )"
-
-src_prepare() {
- default
-
- sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
- sed \
- -e "/DOCDIR/d" \
- -e "/^install:/s/ docs//" \
- -i src/build-data/makefile/unix_shr.in || die "sed failed"
-
- # Fix ImportError with Python 3.
- sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
-
- use python && python_copy_sources
-}
-
-src_configure() {
- local disable_modules="proc_walk,unix_procs"
- use threads || disable_modules+=",pthreads"
- use bindist && disable_modules+=",ecdsa"
- elog "Disabling modules: ${disable_modules}"
-
- # Enable v9 instructions for sparc64
- if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
- CHOSTARCH="sparc32-v9"
- else
- CHOSTARCH="${CHOST%%-*}"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- # foobared buildsystem, --prefix translates into DESTDIR, see also make
- # install in src_install, we need the correct live-system prefix here on
- # Darwin for a shared lib with correct install_name
- ./configure.py \
- --prefix="${EPREFIX}/usr" \
- --libdir=$(get_libdir) \
- --docdir=share/doc \
- --cc=gcc \
- --os=${myos} \
- --cpu=${CHOSTARCH} \
- --with-endian="$(tc-endian)" \
- --without-sphinx \
- --with-tr1=system \
- $(use_with bzip2) \
- $(use_with gmp gnump) \
- $(use_with python boost-python) \
- $(use_with ssl openssl) \
- $(use_with zlib) \
- --disable-modules=${disable_modules} \
- || die "configure.py failed"
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
-
- if use python; then
- building() {
- rm -fr build/python
- ln -s "${BUILD_DIR}" build/python
- cp Makefile.python build/python
- sed -i \
- -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
- build/python/Makefile.python
- emake -f build/python/Makefile.python \
- CXX="$(tc-getCXX)" \
- CFLAGS="${CXXFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- PYTHON_ROOT="/usr/$(get_libdir)" \
- PYTHON_INC="-I$(python_get_includedir)"
- }
- python_foreach_impl building
- fi
-
- if use doc; then
- einfo "Generation of documentation"
- sphinx-build doc doc_output
- fi
-}
-
-src_test() {
- chmod -R ugo+rX "${S}"
- emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
- LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
- emake DESTDIR="${ED}usr" install
-
- if ! use static-libs; then
- rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
- fi
-
- # Add compatibility symlinks.
- [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
- [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
- dosym botan-config-1.10 /usr/bin/botan-config
- dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
-
- if use python; then
- installation() {
- rm -fr build/python
- ln -s "${BUILD_DIR}" build/python
- emake -f Makefile.python \
- PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
- install
- }
- python_foreach_impl installation
- fi
-
- if use doc; then
- pushd doc_output > /dev/null
- insinto /usr/share/doc/${PF}/html
- doins -r [a-z]* _static
- popd > /dev/null
- fi
-}
diff --git a/dev-libs/botan/files/botan-1.10.14-build.patch b/dev-libs/botan/files/botan-1.10.14-build.patch
deleted file mode 100644
index 73ee70be5a50..000000000000
--- a/dev-libs/botan/files/botan-1.10.14-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d8cb9d52a7e7e7e20cd371349583794e17fd0778 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev
-Date: Thu, 1 Dec 2016 20:50:35 +0200
-Subject: [PATCH] utils: safeint.h: use botan's to_string
-
-Signed-off-by: Alon Bar-Lev
----
- src/utils/safeint.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/utils/safeint.h b/src/utils/safeint.h
-index e0bd662..0a03e4e 100644
---- a/src/utils/safeint.h
-+++ b/src/utils/safeint.h
-@@ -17,7 +17,7 @@ class Integer_Overflow_Detected : public Exception
- {
- public:
- Integer_Overflow_Detected(const std::string& file, int line) :
-- Exception("Integer overflow detected at " + file + ":" + std::to_string(line))
-+ Exception("Integer overflow detected at " + file + ":" + to_string(line))
- {}
- };
-
---
-2.7.3
-
diff --git a/dev-libs/crypto++/crypto++-5.6.5.ebuild b/dev-libs/crypto++/crypto++-5.6.5.ebuild
index 300de9532923..9b4545ecbe8e 100644
--- a/dev-libs/crypto++/crypto++-5.6.5.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
LICENSE="Boost-1.0"
SLOT="0/5.6" # subslot is so version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
IUSE="static-libs"
DEPEND="app-arch/unzip"
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 1aa54e336da0..1d7767a3ee81 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,20 +1,4 @@
-DIST kpathsea-texmf.d-4.tar.xz 11148 SHA256 d5cc455db13afb9a229892380f835e57e932aedf8d02c8f12895ce682888b88e SHA512 a2906e4f8ec0fdbe31d618878a0633ab52f8dc71ef31d7608190d1f37bf3003b6d2c204520edc249c0c49b8f7308f24a283ca9510033378442093a8194a7bea5 WHIRLPOOL ba1a9aec8f5c040f7124d0720d2600bdb9253d82c859249c871576ac1c5255b81d0b14c3cd381ff8b2e5aae021e694383f93fee3459603615f7187daef35ec2e
-DIST kpathsea-texmf.d-5.tar.xz 11180 SHA256 85d9e1ed697859952a3ba273314f8670454016f3cd1988f0ea17f0cab8630a19 SHA512 23e8134340ae6f10baddef91f642a34c9289d84ccf791bd66779e794cfeed4eeadebd8cb1062e2e545a042e9c64cc9121f893279ddf776aae11c30baffc7f3af WHIRLPOOL b432effa293c410d019b20fa9dc848f3e67b71bb66af27b4e41ed814df688b933ffb30831411358222e170f75c38d2733e671c8224025516cc9c2aed0be8599d
-DIST kpathsea-texmf.d-6.tar.xz 11232 SHA256 9aeccecaf9ba51d25147605b10150047e1f8353942e288a4529b6f28bda2bda8 SHA512 7073c7fb25a53414604395ef02f526e556049b4d296d762fe0b78858d82e0122f0b1fa0b8342e8f81c603e1c1f799702235dcdff08bf56797798e29a15581a9e WHIRLPOOL 919281c784c2efe49e7b0b88c2915ebeadda90251718cfa612a98f9dfa4ed01f4e6b5d3de13fc22f22b4b589f77feeb6d3955e461ea54572f283be20f6246ead
-DIST kpathsea-texmf.d-7.tar.xz 11292 SHA256 9cc7563b54ffc5f75f88e120e5eae21643eae5e97a804bea2bee1f2e33bb4472 SHA512 972a370bcc3534542a8392f0e0066d277bd83f68e684f7a02cf46fa490bec6f2a1f9dde04081f965178a019adb220cf44bc8e4d5862ac70597de64ea8a7e5902 WHIRLPOOL 2ac681e84ac5818bb2332bf5ed15d74c3a09f6b78dced71158ecd0a5b4f49991c10bf143c44c1766c80e784d39199a84319dbec4ff8e86eba58f71268613f949
DIST kpathsea-texmf.d-8.tar.xz 11456 SHA256 054471f13f001f5f24c6aea24fa57d82a3fb349c362be545b5443e0d4db25364 SHA512 496ef6e3134f1b0507b15729416de86d72f41b518f4d382c78c2f39b0d603d3d44f8c8befdab2351d38d2a26fd87e5a73570a67b11dbb3f307b006f409a6f036 WHIRLPOOL a2ed25416b3a5c72b19f5a0ca4308af51496161f68152e471e4a78a1c0f0a5779973bcd3fa4edb37ebb1ca37039f19bb090b772c5913c1449a56c85faccea6b0
-DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
-DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33
-DIST texlive-20140525-source.tar.xz 41657688 SHA256 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be SHA512 09169af15d806abd721e55ffc20ed684c0a7ad60783272d49fabfe9c88857c4abd15b60f30e3f5511ceda1982fdc1d33db8265f97e374bfa5b250dbb5612f8ad WHIRLPOOL fd7fffeeaf319bca5333f6d5d8d9cc6517f76ffe5b2793a73604d844cb7474d83c23826f98d4d11ea5e1a35c0f273e12b2fe6f5945f9880a9577fedad6625014
-DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
-DIST texlive-module-kpathsea-2012.tar.xz 30060 SHA256 528044bcea040d00016c5b22c10a856774368ff4d030907a84647a05dadafc08 SHA512 e89d4a37c0b4555a38f20bf9020355f01416a2483ff2b9535343b678442ec8547663da5e2a2fb84c32d4db621bebf7fb878df52e20fb32123985aaa9d61e44cb WHIRLPOOL 3f332ae9f5409370f9966e29418d22a57af7e1e483c6b24828afaeac8644a73dd658418e1d45d487bf8325770113a3c5593351c39852a7374bf85a481179bfc8
-DIST texlive-module-kpathsea-2013.tar.xz 30120 SHA256 1891e7c6b57aca72d2b6d749526ee49bffe62f10736875c886d7bc1e02eeb8a0 SHA512 7642cebecf5ebe916aee0f8f19d1740e3e3f234454429cb5f88d550f41ec93e8fbfebdf7de0a893bd22cec17222adc9f8c2e6756dd22b21a34ad181baf0753a9 WHIRLPOOL 8d7be24abc8485d29e3fed363d43d0da5d657d98f3de4f28e6ee2f632b0609b846f26b9ccb82fa86b42a449ce21b75742f63db7fe264a0fe2befb1a6de62055f
-DIST texlive-module-kpathsea-2014.tar.xz 30212 SHA256 41b824f75f885f5ec94996230aac840d10403168200ea681d1bd851aab8c661d SHA512 f66a933201fd9d10a47906a4c19c8a54d36a8a1f7be0e2c25a7014e0a52f094c563b6684a2c639ec96ee51aacfd6d725dd77ff50b7d8c6a7c26f45586803c999 WHIRLPOOL e97afa0286f8c4ffb11239172129c805b6d0f845c8cf9e51d1b08045590a8148b3ae3dadc398ffe8558d1e34dc30221351f07f8caf392b5210d0eee0e4b1e130
-DIST texlive-module-kpathsea-2015.tar.xz 30512 SHA256 a026c0880c1884daaeab664cc0e25a6c3325c4d2181cc946b3332716804e4a2a SHA512 7bbb389ce368decdcf8f50a352636e95584e8d6b052cbeb3b0498c88d9147807c37aa0bd81b2860c9cb11d0d0ac4e8a4eef069876fb3ef737c9ac77fac192ab0 WHIRLPOOL 99ae57ca8103eeeaaf38c969a98353fa9dbb7c7edce1389ee7c9a022107157c5193f785b7f8c99f44b66bac6c56b43c0ed06b473b23051db7936fadaa5f6032b
DIST texlive-module-kpathsea-2016.tar.xz 30696 SHA256 4a2e801e167d7d0b50c67e510b730ad92b8ad63cce5e28d7f35e3cc1ed931552 SHA512 330254cf76fd30bf3686dd48710f21c4804f2f6ea9b14e6033b2741c3e6ba627e51efe96da9a1089120d474e36aad1c052285a7ea394b76ee2d4d335b86095fd WHIRLPOOL 02ad551bd1af49e25f5fc35cddd59f65afed9e6c1899a14000cdedf0c4227edfa8b1038ec90f783f28090594164016f9c9ebbd1158dee048d24e81b1e8a9a446
-DIST texlive-module-kpathsea.doc-2012.tar.xz 1092220 SHA256 df92d722d168a527669e4b093217c6595b1cb30eb65f55bbf80d29745ad9ca3b SHA512 ef455d4cf755bb7aa06f475cfc50dd00343331fb4d985334866121306eda697aed0131b0591efb94bc87710b7eb9bdd9eb0ea4d567779e2684ca33e21e8bf645 WHIRLPOOL 66e76ac53a62e120b3dc39c8e76bac29126d799ba9dc8b5963e6722f6c3c908b2fa04071416d6218f5e4e99ed4852103dc61de7e413d8502f876fecaf7f3ec8d
-DIST texlive-module-kpathsea.doc-2013.tar.xz 1086956 SHA256 2697dd13f35e0c51254c0857fecc4cf480d7ab1799325e4996e7a39380b77b38 SHA512 8bab0f70815b0298c62be560974d213c2e29b95bf06181598d976c962e1ecb66da5a3d6facd711adfd70dc1bdb64228b2916cdac568c1165324e348b0adda678 WHIRLPOOL b6ca6dd58b8b4216f4bb256aef4f206b8413afec911d42365ddfc59f10a62b4ef342eeea56ede962236fc90cd4e2a08e27f4705e892b32f8b4b427ecc8d03a4a
-DIST texlive-module-kpathsea.doc-2014.tar.xz 998516 SHA256 d3a1829dfaa17955988fe018c84849a2ff9530a313f9394535d97ddd9602a0ae SHA512 12ae3d32930e42f80ff3fa354b3bbce3716cc2cbd682be6d4a72153bff29d28006f1bf1c3d6e945778cd2caf8380fb35cad169da6a0bf1c59f45752d4dcc61cf WHIRLPOOL 159dae0fa66337e22066498ccc3bb79bebaae9b281131921b953a68e728afaa75e13ea999a74db2c6ed981f6eb6073494628c2fe9343bf8e9e96d49eeff06dab
-DIST texlive-module-kpathsea.doc-2015.tar.xz 1004596 SHA256 17d99c5a106ac6340a49c633932f9dedec5b34dcdc71f89a5e9da6bca185ed75 SHA512 1413d6c8a0e1dbf1c50446fcf6b0e3c83e3dd2f35505268c8e7a38d4c8bd97e4c46ec345c4ff9c868a01fd7d5db630498b484224094f0ac96d8f1afaf14b60b7 WHIRLPOOL 826d8601ee677c2832865b8616ce2c4673ed27b821d3537d1ba81d0ec58d770a7ed3dab9dc78be791330baa7100eac033af556cc98b9ca0f795271c1e4ec14b8
DIST texlive-module-kpathsea.doc-2016.tar.xz 1128872 SHA256 f65ba5c972f2a1d837027dab288615344cbae70b961b110884b8de6008fa75be SHA512 1cfbb4b5a8647bf5da46b04c9bc911091aa3322b154d65544aa3a1163e24b6906d7e5420549ab0ba023250e6dfa90e75d3a20dffd2e7360fba068a5c3cece885 WHIRLPOOL f680b54f64b04b2722ec702c532678db894a6465261546fbbb3469adbf561413c1c34c08bbf96b62950ca733c3a52517d3a3007e3e1c157bc4cd7ebced08b5cb
diff --git a/dev-libs/kpathsea/files/texmf-update b/dev-libs/kpathsea/files/texmf-update
deleted file mode 100644
index a877823e7c1e..000000000000
--- a/dev-libs/kpathsea/files/texmf-update
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-#
-# Utility to update Gentoo TeXLive distribution configuration files
-#
-
-echo "Configuring TeXLive ..."
-
-PATH=/bin:/usr/bin
-
-# Fix for all those with altered umask for root
-umask 022
-
-# Make sure we have a correct environment, bug #30432
-# The list of env. vars is taken from the INSTALL file
-for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
- DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
- MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
- OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
- T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
- TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
- TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
- VFFONTS XDVIFONTS XDVIVFS ; do
-
- if [ "${!texvar}" ]; then
- if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
- export ${texvar}="${!texvar}:"
- fi
- fi
-done
-
-if [ "$TEXINPUTS" ]; then
- if $(echo ${TEXINPUTS} | grep '/usr/share/texmf' &>/dev/null) ; then
- export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/usr/share/texmf/*:\?||g')
- elif $(echo ${TEXINPUTS} | grep '/var/lib/texmf' &>/dev/null) ; then
- export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/var/lib/texmf/*:\?||g')
- fi
-fi
-
-MKTEMP_COMMAND="mktemp -t tmp.XXXXXXXXXX"
-DIFF_COMMAND="cmp -s"
-TEMP_FILE="`${MKTEMP_COMMAND}`"
-
-if [ -z "${TEMP_FILE}" ]; then
- exit
-fi
-
-# check whether config files for fmtutil and updmap have changed
-STATUS_FMTUTIL="0"
-STATUS_UPDMAP="0"
-
-if [ -d /etc/texmf/texmf.d ]; then
- echo "Generating /etc/texmf/web2c/texmf.cnf from /etc/texmf/texmf.d ..."
- cat /etc/texmf/texmf.d/*.cnf > "/etc/texmf/web2c/texmf.cnf"
-fi
-
-if [ -d /etc/texmf/fmtutil.d ]; then
- echo "Generating /etc/texmf/web2c/fmtutil.cnf from /etc/texmf/fmtutil.d ..."
- if [ -f /etc/texmf/web2c/fmtutil.cnf ]; then
- cp -f /etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
- else
- touch ${TEMP_FILE}
- fi
- cat /etc/texmf/fmtutil.d/*.cnf > "/etc/texmf/web2c/fmtutil.cnf"
- ${DIFF_COMMAND} /etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-else
-# if no regeneration took place:
-# always regenerate the formats to be on the safe side
- STATUS_FMTUTIL="${STATUS_FMTUTIL}3"
-fi
-
-if [ -d /etc/texmf/updmap.d ]; then
- if [ -f /etc/texmf/web2c/updmap.cfg ]; then
- cp -f /etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
- else
- touch ${TEMP_FILE}
- fi
- echo "Generating /etc/texmf/web2c/updmap.cfg from /etc/texmf/updmap.d ..."
- cat /etc/texmf/updmap.d/*.cfg > "/etc/texmf/web2c/updmap.cfg"
- ${DIFF_COMMAND} /etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
- STATUS_UPDMAP="${STATUS_UPDMAP}$?"
-else
-# if no regeneration could be done:
-# always regenerate the maps to be on the safe side
- STATUS_UPDMAP="${STATUS_UPDMAP}3"
-fi
-
-echo "Generating ls-R files"
-mktexlsr &>/dev/null
-
-# Generate language.dat file, from texlive install-pkg.sh
-X=`kpsewhich language.dat`
-Z=`dirname $X`
-if [ -n "$X" -a -f "$Z/language.dat" -a -f "$Z/language.us" ] ; then
- echo "Generating language.dat file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.dat" "${TEMP_FILE}"
-
- cat "$Z/language.us" > "$Z/language.dat"
- for i in /etc/texmf/language.dat.d/language.*.dat; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.dat"
- done
-
- ${DIFF_COMMAND} "$Z/language.dat" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-# Generate language.def file.
-if [ -n "$X" -a -f "$Z/language.def" -a -f "$Z/language.us.def" ] ; then
- echo "Generating language.def file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.def" "${TEMP_FILE}"
-
- cat "$Z/language.us.def" > "$Z/language.def"
- for i in /etc/texmf/language.def.d/language.*.def; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.def"
- done
- cat << EOF >> "$Z/language.def"
-%%% No changes may be made beyond this point.
-
-\uselanguage {USenglish} %%% This MUST be the last line of the file.
-EOF
-
- ${DIFF_COMMAND} "$Z/language.def" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-# Generate language.dat.lua file.
-if [ -n "$X" -a -f "$Z/language.dat.lua" -a -f "$Z/language.us.lua" ] ; then
- echo "Generating language.dat.lua file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.dat.lua" "${TEMP_FILE}"
-
- cat "$Z/language.us.lua" > "$Z/language.dat.lua"
- for i in /etc/texmf/language.dat.lua.d/language.*.dat.lua; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.dat.lua"
- done
- printf "}\n" >> "$Z/language.dat.lua"
-
- ${DIFF_COMMAND} "$Z/language.dat.lua" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-if [ "${STATUS_FMTUTIL}" -ne 0 ] ; then
- echo "Generating format files ..."
- fmtutil-sys --all &>/dev/null
-else
- echo "Skipping format files, since they are unchanged"
-fi
-
-if [ "${STATUS_UPDMAP}" -ne 0 ] ; then
- echo "Generating font maps..."
- updmap-sys &>/dev/null
-else
- echo "Skipping font maps, since they are unchanged"
-fi
-
-rm -f ${TEMP_FILE}
-
-echo
-echo "Use 'texconfig font ro'(rw) to disable (enable) font generation for users"
-echo
diff --git a/dev-libs/kpathsea/files/texmf-update-r1 b/dev-libs/kpathsea/files/texmf-update-r1
deleted file mode 100644
index f97d527c720f..000000000000
--- a/dev-libs/kpathsea/files/texmf-update-r1
+++ /dev/null
@@ -1,165 +0,0 @@
-#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-#
-# Utility to update Gentoo TeXLive distribution configuration files
-#
-
-echo "Configuring TeXLive ..."
-
-PATH="@GENTOO_PORTAGE_EPREFIX@"/bin:"@GENTOO_PORTAGE_EPREFIX@"/usr/bin
-
-# Fix for all those with altered umask for root
-umask 022
-
-# Make sure we have a correct environment, bug #30432
-# The list of env. vars is taken from the INSTALL file
-for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
- DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
- MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
- OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
- T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
- TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
- TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
- VFFONTS XDVIFONTS XDVIVFS ; do
-
- if [ "${!texvar}" ]; then
- if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
- export ${texvar}="${!texvar}:"
- fi
- fi
-done
-
-if [ "$TEXINPUTS" ]; then
- if $(echo ${TEXINPUTS} | grep '@GENTOO_PORTAGE_EPREFIX@/usr/share/texmf' &>/dev/null) ; then
- export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|@GENTOO_PORTAGE_EPREFIX@/usr/share/texmf/*:\?||g')
- elif $(echo ${TEXINPUTS} | grep '@GENTOO_PORTAGE_EPREFIX@/var/lib/texmf' &>/dev/null) ; then
- export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|@GENTOO_PORTAGE_EPREFIX@/var/lib/texmf/*:\?||g')
- fi
-fi
-
-MKTEMP_COMMAND="mktemp -t tmp.XXXXXXXXXX"
-DIFF_COMMAND="cmp -s"
-TEMP_FILE="`${MKTEMP_COMMAND}`"
-
-if [ -z "${TEMP_FILE}" ]; then
- exit
-fi
-
-# check whether config files for fmtutil and updmap have changed
-STATUS_FMTUTIL="0"
-STATUS_UPDMAP="0"
-
-if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/texmf.d ]; then
- echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/texmf.cnf from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/texmf.d ..."
- cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/texmf.d/*.cnf > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/texmf.cnf"
-fi
-
-if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/fmtutil.d ]; then
- echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/fmtutil.cnf from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/fmtutil.d ..."
- if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ]; then
- cp -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
- else
- touch ${TEMP_FILE}
- fi
- cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/fmtutil.d/*.cnf > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/fmtutil.cnf"
- ${DIFF_COMMAND} "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-else
-# if no regeneration took place:
-# always regenerate the formats to be on the safe side
- STATUS_FMTUTIL="${STATUS_FMTUTIL}3"
-fi
-
-if [ -d "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/updmap.d ]; then
- if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ]; then
- cp -f "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
- else
- touch ${TEMP_FILE}
- fi
- echo "Generating @GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/updmap.cfg from @GENTOO_PORTAGE_EPREFIX@/etc/texmf/updmap.d ..."
- cat "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/updmap.d/*.cfg > "@GENTOO_PORTAGE_EPREFIX@/etc/texmf/web2c/updmap.cfg"
- ${DIFF_COMMAND} "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
- STATUS_UPDMAP="${STATUS_UPDMAP}$?"
-else
-# if no regeneration could be done:
-# always regenerate the maps to be on the safe side
- STATUS_UPDMAP="${STATUS_UPDMAP}3"
-fi
-
-echo "Generating ls-R files"
-mktexlsr &>/dev/null
-
-# Generate language.dat file, from texlive install-pkg.sh
-X=`kpsewhich language.dat`
-Z=`dirname $X`
-if [ -n "$X" -a -f "$Z/language.dat" -a -f "$Z/language.us" ] ; then
- echo "Generating language.dat file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.dat" "${TEMP_FILE}"
-
- cat "$Z/language.us" > "$Z/language.dat"
- for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.dat.d/language.*.dat; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.dat"
- done
-
- ${DIFF_COMMAND} "$Z/language.dat" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-# Generate language.def file.
-if [ -n "$X" -a -f "$Z/language.def" -a -f "$Z/language.us.def" ] ; then
- echo "Generating language.def file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.def" "${TEMP_FILE}"
-
- cat "$Z/language.us.def" > "$Z/language.def"
- for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.def.d/language.*.def; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.def"
- done
- cat << EOF >> "$Z/language.def"
-%%% No changes may be made beyond this point.
-
-\uselanguage {USenglish} %%% This MUST be the last line of the file.
-EOF
-
- ${DIFF_COMMAND} "$Z/language.def" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-# Generate language.dat.lua file.
-if [ -n "$X" -a -f "$Z/language.dat.lua" -a -f "$Z/language.us.lua" ] ; then
- echo "Generating language.dat.lua file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.dat.lua" "${TEMP_FILE}"
-
- cat "$Z/language.us.lua" > "$Z/language.dat.lua"
- for i in "@GENTOO_PORTAGE_EPREFIX@"/etc/texmf/language.dat.lua.d/language.*.dat.lua; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.dat.lua"
- done
- printf "}\n" >> "$Z/language.dat.lua"
-
- ${DIFF_COMMAND} "$Z/language.dat.lua" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-if [ "${STATUS_FMTUTIL}" -ne 0 ] ; then
- echo "Generating format files ..."
- fmtutil-sys --all &>/dev/null
-else
- echo "Skipping format files, since they are unchanged"
-fi
-
-if [ "${STATUS_UPDMAP}" -ne 0 ] ; then
- echo "Generating font maps..."
- updmap-sys &>/dev/null
-else
- echo "Skipping font maps, since they are unchanged"
-fi
-
-rm -f ${TEMP_FILE}
-
-echo
-echo "Use 'texconfig font ro'(rw) to disable (enable) font generation for users"
-echo
diff --git a/dev-libs/kpathsea/kpathsea-6.1.0_p20120701.ebuild b/dev-libs/kpathsea/kpathsea-6.1.0_p20120701.ebuild
deleted file mode 100644
index 9212a84d2769..000000000000
--- a/dev-libs/kpathsea/kpathsea-6.1.0_p20120701.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit texlive-common eutils libtool
-
-TEXMFD_VERSION="4"
-
-DESCRIPTION="Library implementing generic path searching, configuration, and TeX-specific file searching"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
- mirror://gentoo/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source static-libs"
-
-DEPEND="!=dev-libs/glib-2.32:2
+ >=dev-libs/json-glib-0.15
+ >=dev-libs/libxml2-2:2
+ >=net-libs/liboauth-0.9.4
+ >=net-libs/libsoup-2.42.0:2.4[introspection?]
+ >=x11-libs/gdk-pixbuf-2.14:2
+ crypt? ( app-crypt/gcr:= )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.25
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ test? ( >=net-libs/uhttpmock-0.5 )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable crypt gnome) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ $(use_enable static-libs static) \
+ $(use_enable test always-build-tests)
+}
+
+src_test() {
+ unset ORBIT_SOCKETDIR
+ export GSETTINGS_BACKEND="memory" #486412
+ dbus-launch emake check
+}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
deleted file mode 100644
index e813854a442d..000000000000
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="libmcrypt is a library that provides uniform interface to access several encryption algorithms"
-HOMEPAGE="http://mcrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-rotate-mask.patch
- mv configure.in configure.ac
- mv libltdl/configure.in libltdl/configure.ac
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
- eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
-}
-
-src_install() {
- default
- dodoc AUTHORS NEWS README THANKS TODO ChangeLog
- dodoc doc/README.* doc/example.c
-}
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index 685199008bf1..d5b5c9ea7415 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=""
diff --git a/dev-libs/libslz/libslz-1.1.0.ebuild b/dev-libs/libslz/libslz-1.1.0.ebuild
index 4dae6a973f2d..0071dd4eadda 100644
--- a/dev-libs/libslz/libslz-1.1.0.ebuild
+++ b/dev-libs/libslz/libslz-1.1.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
@@ -10,7 +10,7 @@ SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.t
LICENSE="MIT"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 arm ppc ~x86"
IUSE="static-libs tools"
DEPEND=""
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 7b5917ed419d..af6b3047dd62 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,2 +1 @@
DIST libtasn1-4.10.tar.gz 1887057 SHA256 681a4d9a0d259f2125713f2e5766c5809f151b3a1392fd91390f780b4b8f5a02 SHA512 614e93128e6be8f46a2ad46e2a515e2edfb1f5a2e90c9e5da02d3afc0a882dc956632dd2b1eddd6b0e258e7b58a82d5d745d8ccd23120d94bb0af48132ed1a18 WHIRLPOOL 3f7bf6ba72006b22d126546e5f683d5bb8e758e4a919deac5d319d520175f7805a0c922561967bc7708ac1838ae1ccfa0da829b818705434eb46406e8a0ff1f1
-DIST libtasn1-4.9.tar.gz 1864709 SHA256 4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920 SHA512 1fb2c5eb89f3e9abd8f7433342619e3d89576ed15a783b8152ed9da0383342f80e750c570733ac266bc8a3c4b23e5e2a57e3735b2341d507e7d88ac366a8d6e7 WHIRLPOOL 509afea66788b5f0d2aa944cbf07b48f122c1f2f1e6bd9278fce2a0e195397453e5203b2b4ab519520ea0e3614664f2af0cc2f046f2b91252d156e8058e1952c
diff --git a/dev-libs/libtasn1/files/libtasn1-4.9-build.patch b/dev-libs/libtasn1/files/libtasn1-4.9-build.patch
deleted file mode 100644
index d096955bb9f5..000000000000
--- a/dev-libs/libtasn1/files/libtasn1-4.9-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dd091c8af163213e12aa92f61bc4916e0f102633 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos
-Date: Tue, 26 Jul 2016 08:45:33 +0200
-Subject: [PATCH] configure: don't add -Werror to build flags
-
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7a14e04..066f5fe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings],
- )
-
- if test "$gl_gcc_warnings" = yes; then
-- gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
--
- nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
- nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers
- nw="$nw -Wtraditional" # Warns on #elif which we use often
---
-2.7.3
-
diff --git a/dev-libs/libtasn1/libtasn1-4.10.ebuild b/dev-libs/libtasn1/libtasn1-4.10.ebuild
index 88ceb403d9eb..445205723ea2 100644
--- a/dev-libs/libtasn1/libtasn1-4.10.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs valgrind"
DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
deleted file mode 100644
index ffbb0f91f765..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.9-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="ASN.1 library"
-HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DEPEND=">=dev-lang/perl-5.6
- sys-apps/help2man
- virtual/yacc"
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r16
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-pkg_setup() {
- if use doc; then
- DOCS+=( doc/libtasn1.pdf )
- HTML_DOCS=( doc/reference/html/. )
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs
- [[ "${VALGRIND_TESTS}" == "0" ]] && myeconfargs+=( --disable-valgrind-tests )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index a1601c2cc3f1..c55f52e15fd8 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,2 +1 @@
-DIST opensc-0.12.2.tar.gz 1738553 SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675 SHA512 544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334 WHIRLPOOL 4969811d68d72e82c3a2b0297d5ff9aaca083b6ef8e66223d4385dce35cd9560cdda7cca8ccd38b52eb55465dbd6f8704485778b21d2a88bb548a5bbd87071e2
DIST opensc-0.16.0.tar.gz 1760418 SHA256 3ac8c29542bb48179e7086d35a1b8907a4e86aca3de3323c2f48bd74eaaf5729 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139 WHIRLPOOL 8207606e4994d7744fc93cc6aef1b0cde8a2073e791aebf71e82669013d261f82abc6e41ddf971fb136d4580c21ea475bb2e36bbdec600b354f5e1decec4b02a
diff --git a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
deleted file mode 100644
index 008fd3c35700..000000000000
--- a/dev-libs/opensc/files/opensc-0.12.1-crossbuild.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/pkcs11/Makefile.am 2011-05-17 13:07:00.000000000 -0400
-+++ Makefile.am.new 2011-07-07 10:03:28.399185928 -0400
-@@ -14,9 +14,10 @@
- mechanism.c openssl.c framework-pkcs15.c \
- framework-pkcs15init.c debug.c opensc-pkcs11.exports \
- pkcs11-display.c pkcs11-display.h
--OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS) \
-+OPENSC_PKCS11_LIBS = \
- $(top_builddir)/src/common/libcompat.la \
-- $(top_builddir)/src/libopensc/libopensc.la
-+ $(top_builddir)/src/libopensc/libopensc.la \
-+ $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) $(LTLIB_LIBS)
-
- opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-disabled.c
- opensc_pkcs11_la_LIBADD = $(OPENSC_PKCS11_LIBS)
-@@ -31,7 +32,7 @@
- -module -shared -avoid-version -no-undefined
-
- pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports
--pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) $(top_builddir)/src/common/libpkcs11.la
-+pkcs11_spy_la_LIBADD = $(top_builddir)/src/common/libpkcs11.la $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
- pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
- -export-symbols "$(srcdir)/pkcs11-spy.exports" \
- -module -shared -avoid-version -no-undefined
---- src/tools/Makefile.am 2011-05-17 13:07:00.000000000 -0400
-+++ Makefile.am.new 2011-07-07 10:06:08.710185925 -0400
-@@ -24,8 +24,9 @@
- pkcs15_tool_SOURCES = pkcs15-tool.c util.c
- pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
- pkcs11_tool_SOURCES = pkcs11-tool.c util.c
--pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
-- $(top_builddir)/src/common/libpkcs11.la
-+pkcs11_tool_LDADD = \
-+ $(top_builddir)/src/common/libpkcs11.la \
-+ $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
- pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c
- pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS)
- cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c
diff --git a/dev-libs/opensc/files/opensc-0.12.2-dl.patch b/dev-libs/opensc/files/opensc-0.12.2-dl.patch
deleted file mode 100644
index 526ef8161a89..000000000000
--- a/dev-libs/opensc/files/opensc-0.12.2-dl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1b896582a0cd74854f99e08854554807a8f1f764 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Tue, 22 May 2012 14:12:23 -0400
-Subject: [PATCH] link against -ldl when -lltdl is not available
-
-If ltdl isn't found, the code will use dlopen if it's available.
-But it won't link to -ldl which can cause link errors like so:
-
- CCLD opensc-tool
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlopen'
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlsym'
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlerror'
-../../src/libopensc/.libs/libopensc.so: error: undefined reference to 'dlclose'
-collect2: ld returned 1 exit status
-make[3]: *** [opensc-tool] Error 1
-
-Signed-off-by: Mike Frysinger
----
- configure.ac | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2751f0f..123aeb1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -277,6 +277,13 @@ if test -z "${LTLIB_LIBS}"; then
- [LTLIB_LIBS="-lltdl"]
- )
- fi
-+if test -z "${LTLIB_LIBS}"; then
-+ AC_CHECK_LIB(
-+ [dl],
-+ [dlopen],
-+ [LTLIB_LIBS="-ldl"]
-+ )
-+fi
-
- saved_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${LTLIB_CFLAGS}"
---
-1.7.8.6
-
diff --git a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
deleted file mode 100644
index 3ef24ec3d254..000000000000
--- a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 4ede74dd803ddbc4d0686bec0749459f54854495 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?=
-Date: Sun, 13 May 2012 14:55:35 -0700
-Subject: [PATCH] build: fix parallel install by creating directory in the
- rule
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Relying on the rule that creates the directory is a bad idea to be
-parallel safe.
-
-(Patch modified to use autoconf's MKDIR_P instead of automake's
-deprecated mkdir_p, allowing use of automake 1.12).
-
-Signed-off-by: Diego Elio Pettenò
----
- etc/Makefile.am | 4 ++--
- src/pkcs11/Makefile.am | 7 ++++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 0ef546f..3b75995 100644
---- a/etc/Makefile.am
-+++ b/etc/Makefile.am
-@@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force
- -e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
- < $< > $@
-
--sysconf_DATA=#required in order to create dir
--install-exec-hook: install-sysconfDATA opensc.conf
-+install-exec-hook: opensc.conf
-+ $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
- if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
- $(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
- else \
-diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
-index 8ff9abc..211055b 100644
---- a/src/pkcs11/Makefile.am
-+++ b/src/pkcs11/Makefile.am
-@@ -53,19 +53,20 @@ pkcs11-jar: jar-dir
- -k"testcert" jar-dir
-
- if WIN32
--install-exec-hook: install-pkcs11DATA
-+install-exec-hook:
-+ $(MKDIR_P) "$(DESTDIR)$(libdir)"
- for l in opensc-pkcs11.dll onepin-opensc-pkcs11.dll pkcs11-spy.dll; do \
- mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \
- done
- else
- # see http://wiki.cacert.org/wiki/Pkcs11TaskForce
--pkcs11_DATA = #This will create the directory
- if CYGWIN
- PKCS11_SUFFIX=.dll
- else
- PKCS11_SUFFIX=.so
- endif
--install-exec-hook: install-pkcs11DATA
-+install-exec-hook:
-+ $(MKDIR_P) "$(DESTDIR)$(pkcs11dir)"
- for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
- rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
- $(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
---
-1.7.8.6
-
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index ddf27490bc2f..709cad6d774d 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -16,10 +16,6 @@
card.