gentoo resync : 28.04.2021

4 files changed, 11 insertions, 42 deletions

diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index bd9070abedc7..866bc569a4d6 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1,5 +1,3 @@
-DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
 DIST ucspi-proxy-1.1.tar.gz 38351 BLAKE2B 395dc3d154665c8c65c2d35f6e666543f5f919497fed441aca7223dee4983fe165911e8bf1571aa11fa10ba6adb480b4da853773b5a2be556ae59ad6d1708328 SHA512 c9e6f98a73bf6868341b0d5c1653d0b9107aa92c21e8fe96c47a9ca0ae41b247aa10bccd819d84bdcf4e8d5902c1955bfbe9e4e3256d5303578cd3337220139c
-EBUILD ucspi-proxy-0.99.ebuild 795 BLAKE2B 1fe311503f626e092ca81fd2a0d9e76bf460df87181112d3ef5c15804a85627d7ea974bdafa2c487b5611bcbc998fd82bdb456f303876426686bc96b055b2d94 SHA512 390de9c8aa461015cd08f9354aebee5bb7579ed17f33ea5b6b4d35cea4d9fd377c897bd4f0e142542a2047f610144e240a33da3ab05b935634f4d43474522eff
-EBUILD ucspi-proxy-1.1.ebuild 656 BLAKE2B b6cd7cc455d37c2064a1870c116c8ccf12ecd291a052a376d8624550fb8109fa2965ce18d81feb76d98f9a2b8c5a7e878032d3d4480336aad080bec6a18e6533 SHA512 e1d5b236a95c1eb8f3a2f0a3c7a8c253cc18a5031412cc3315b51c1cdc8104d40b70861c2aaeadd5a7685a4eea9a2b4faba4005c389329b2ed2b7d225507df41
-MISC metadata.xml 439 BLAKE2B 0765793e54cdc093b3d94ffb0c3f938bb12d53e99a21f091ad05e1f23ee599c77d0b6af04e1f33a92ea5916131718e97e7ad7a48921e3622682ead4eb35992b7 SHA512 86623b17b403875797df6844dd2fe579cd1eddfd0c859e785a9140ebee91c9e35ad3ee9de001ee5b9887f46d4a08e6bf459fdbe1984c4666993c9c4ccbbb3a40
+EBUILD ucspi-proxy-1.1.ebuild 726 BLAKE2B 6b6504ec29272ce53e53fcf012615d4937064b04c9fcc5bb51e0f1cd3dca001a980c28766f8d12bdea89f47e4381b50d6fa1190e8a7f75de8276076f0b7a52b1 SHA512 f510845a3a27c62dca7886687592ac7632f1cd87131f0dd4fd8a2af887f793e7ca63838379d582cd3e00bad58094ae8ec190aef56d88b4fb225a2b4184359c89
+MISC metadata.xml 352 BLAKE2B b6c8303ce6c72145e17ef26029c18d1774538cfb7bab0029a10cc45db08faa6ec142e8d33f07162ce6c3e2b9ba6aad1c1b67d03d993b49c449355ab577163f14 SHA512 fcbbeee2708fcb372f0ab0b58d6854f9f60ecd226e597b93d0651c28d991ab65ccf3cc439484ca931d22ecb99ef203353550a15d764b07fa75a626cf915c27b8
diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
index 118cf69936e1..4d3c5494713f 100644
--- a/sys-apps/ucspi-proxy/metadata.xml
+++ b/sys-apps/ucspi-proxy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 This package contains a proxy program that passes data back and forth
 between two connections set up by a UCSPI server and a UCSPI client.
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
deleted file mode 100644
index 28b9fea119e4..000000000000
--- a/sys-apps/ucspi-proxy/ucspi-proxy-0.99.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="amd64 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
-}
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
index efbc87c02090..05bc1325eda0 100644
--- a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,11 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
 	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-	echo "${ED}/usr/bin" > conf-bin || die
-	echo "${ED}/usr/share/man" > conf-man || die
+	echo "${EPREFIX}/usr/bin" > conf-bin || die
+	echo "${EPREFIX}/usr/share/man" > conf-man || die
+}
+
+src_install() {
+	local -x install_prefix="${D}"
+	default
 }