gentoo resync : 18.03.2018

4 files changed, 2 insertions, 71 deletions

diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index 5b44d06c3c47..aec031642a7e 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,7 +1,3 @@
-DIST ucspi-proxy-0.97.tar.gz 26717 BLAKE2B 5c3b677cb5dbc97f70f4b70a8b9b3ea20fad228f5ee6fa801435202a6d98835dae4ddbf2f2dd815732ce9c906171f90e7eb3d87eda32080d2454faca36cb5c25 SHA512 92adb00ee6af43c12a89cfb22b00f140fd222bc42b3faa8e6d660278344a9dacd9e24280a3e2769bd7e15787e1be028ee33dd670e627e46ed92065f5c37e08e0
-DIST ucspi-proxy-0.98.tar.gz 35278 BLAKE2B c8153c30926d9d4b6f00a41de3000f4c7814af5d1eda8193e208ea81ec4d2aa04af6831d4bd5e1fa5ae73113a3ebd7b112e718a9b206888ac47b81276daa6233 SHA512 db767fd19825753107965a3f8a7e8c588e053fb911b3cbe1060684e6100244f9ce720f73e97bdfb26a3af00f6dda2a011866f7e5008ff7edca71b0fe3319da1b
 DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
-EBUILD ucspi-proxy-0.97.ebuild 755 BLAKE2B 9ff1c929b49b7ad0c72a5106d6e6014910e94ecd4ce661759c7b7818018618c247ebbc780b06ec84ab95d5c61d60370224f3d6d10856c729beebef64b12d9db2 SHA512 6089b38d3c801fedfb3d287a75b8410954210381711168c752853f86c696ebf0274c29b757bda50f134fd2225bec155d8fc9036620e4390dfadcaf28dd0b009c
-EBUILD ucspi-proxy-0.98.ebuild 865 BLAKE2B 49ca75579d46ecf6f9bb0650a892f3b01c284d5f9eeb36e345ec770c970b1b46af6b19bc2abc5a4c36770b9a89d019aa05e8a1c40a9a1ed306a3334f97cb14db SHA512 31e67ceb2cedc179f475e8a4178fec3d103b0143cd6f48769f5e5443cd98239f78dfe70849655acaa39fd24ea446c6d281c4253bd292b8467879b3d203179b30
-EBUILD ucspi-proxy-0.99.ebuild 796 BLAKE2B afcebb1a736a72dee5e5880485f22fa733595139c53c9612ef164f6fab3289963a13b17a11e4f0e969a244f287d7c786bc527c6ffcac1c331d6d9ce52f465b18 SHA512 2c5cdcbdc2609035fd34cc42e0d5ebbe5941ec3acd112f4f179e0401fb4d2b5278691a0c0bac0e1b0e67cc07b56f5a2d111223779a25444751f30d91ffc18268
+EBUILD ucspi-proxy-0.99.ebuild 795 BLAKE2B 1fe311503f626e092ca81fd2a0d9e76bf460df87181112d3ef5c15804a85627d7ea974bdafa2c487b5611bcbc998fd82bdb456f303876426686bc96b055b2d94 SHA512 390de9c8aa461015cd08f9354aebee5bb7579ed17f33ea5b6b4d35cea4d9fd377c897bd4f0e142542a2047f610144e240a33da3ab05b935634f4d43474522eff
 MISC metadata.xml 439 BLAKE2B 0765793e54cdc093b3d94ffb0c3f938bb12d53e99a21f091ad05e1f23ee599c77d0b6af04e1f33a92ea5916131718e97e7ad7a48921e3622682ead4eb35992b7 SHA512 86623b17b403875797df6844dd2fe579cd1eddfd0c859e785a9140ebee91c9e35ad3ee9de001ee5b9887f46d4a08e6bf459fdbe1984c4666993c9c4ccbbb3a40
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild
deleted file mode 100644
index 5eeb9dcf1f2c..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.97.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND=">=dev-libs/bglibs-1.025"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man/" > conf-man
-	echo "/usr/include/bglibs/" > conf-bgincs
-	echo "/usr/lib/bglibs/" > conf-bglibs
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild
deleted file mode 100644
index 7a54182bf1ba..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.98.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="proxy program for two connections set up by a UCSPI server and a UCSPI client"
-HOMEPAGE="http://untroubled.org/ucspi-proxy/"
-SRC_URI="http://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/bglibs-1.106"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e '/^>bin$/ac:::755::ucspi-proxy' INSTHIER
-}
-
-src_configure() {
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man" > conf-man
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-}
-
-src_install() {
-	einstall || die
-	dodoc ANNOUNCEMENT NEWS README TODO
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
index 78e0543f0e25..28b9fea119e4 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/bglibs-1.106"