gentoo resync : 28.04.2019

4 files changed, 58 insertions, 14 deletions

diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index ba6cf7fdca78..fd0c0f7f87a8 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,6 +1,8 @@
 DIST ufed-0.91.tar.bz2 61466 BLAKE2B 63671c875f7dae13a6e76995204a278703691ed3c081a95853a6cbd9a57d1f88cf1c7625f1d524bfc1a816f1344282577126865160e0433cf6692d8067596f59 SHA512 34fc57b4d3fd1e8c4226401aec409ce4303294ec9044673ec62053b8dc6ade9d54419a5d208ba6767b75507bc9f8983a401dc258b0bae5b733e7a0c791554c35
 DIST ufed-0.92.tar.bz2 61606 BLAKE2B b01c409d5852d59a3237748bff49348a2eab386d06c55389d5eee54ad1002575d67ab5138334e99ed2da434a8af05862d769fdf7e692bee2e77bd9c41b793762 SHA512 b1a608d026945144653f43ad322e54f0f1192d39fea3da2a4919e07de65445c75aa5e2d1e8cf9b24849c45f891a0de5952c92b3227f6c1200965f3c280611408
+DIST ufed-0.94.tar.bz2 48566 BLAKE2B db58624005c637c7133a298c17b60cae3cf54c1b1d2ba3337693e1f6c330a5305986e92b6c1b25a5ebc94b1f8934cb5a35db94eccb596f2eb15619dfb2ce4977 SHA512 a40e55db8afc99b5e16b080d93867ef8c832a7318af7a50edb582bfea99bcc6a467b4bf12b75a9d3943e8a008a0222ed73daa52a8e7dae57d73bece4ac084d24
 EBUILD ufed-0.91.ebuild 1020 BLAKE2B 5d4b06638b51bcdf2f08821fda1aaf2be8cd63e7193089860235be67e3a2d987369b055465fa6e7db0429cb58d850026de553a9dffb68dbcb80930195d553380 SHA512 a009ee56787d3c800bceb2f292ab2971f560ea60ece2d08da8a285589ddb4b3782a1790241d8c99b839d4fbfd303458753d6989580e40f5d465df7820f459d11
-EBUILD ufed-0.92.ebuild 1023 BLAKE2B 76a992c76f7b596bef0daa187a04a90aed8d9d2545453a55ed52b4ac933ecad5cc62af38507dc9f16e3706b68a7eb3f753687077b51c7ab83c04df4eb9ed4729 SHA512 d5404f6348a9baeab928961743c4ef32795c95235044432ba1bacd9eb0f37598eac0568e6b87d43911f775b12fc05a5ab0a5199ec623359d78f15818dd0dfd78
-EBUILD ufed-9999.ebuild 714 BLAKE2B 8f61d1cbf96e6cc33808eba3517f92a28f64cfa5369a6392ebbbb70fb157b483915a07a03631203a5222d8c7f942a4be0124e5e378d95885b6f297c844103694 SHA512 ff9611854a518be33df2b340235d33ae3ecc7675e08c97debeb87ac8d699e2346aa1c6911d1400343f17dfe297f29993c6001401f5ea3fe61016abfedc720c60
+EBUILD ufed-0.92.ebuild 1030 BLAKE2B 301ceb1fb8ae9154f43539a706da5fe74e87a95a1e33b05f18cbe17acd6cd94f469096c3e1d0ba1bd2d75815e7b4c2ca667e28b7cffe749cc24acb4d80829f6f SHA512 36c7e2761dd307b783349aafb9204ee3d6db654fcb75f928b09dadcdb1659e028b068486d4eefc229a15ffe58d89c47da2679fae84a92262d891ddcabe6f81cc
+EBUILD ufed-0.94.ebuild 986 BLAKE2B 631f4d1c8afbb0d51a2c088e0214c67a1e9959dd8a8515222ace63511ca5a2281f41df35c024c96a0990cdb326768852050997352dd01c13a138a8d5ac55a6a8 SHA512 ae6dc0289d5c272b3ef5be06d7721f54f43c5ac8c012eaa9457f39f16477581ee4b2340dfca4c38951552c91b27be3d550c5844f4171febc9d921dd525cbcf16
+EBUILD ufed-9999.ebuild 992 BLAKE2B bc1ac52e5b2c959ed91049e890ed608f24f868a8cd7750eac10b3cc8916656522ded60abcf92b07982d11a5cb814301e8d8fc62c18418cb42f5380b6c23ca547 SHA512 d383c0e984ba29e17827fd51cf10985d251f5ccb8a066c8a1a150846d97a584c962e4dff7900a9ea9f50f4fd05f0959d3fbf9304c482fbc54696a6a1585af098
 MISC metadata.xml 361 BLAKE2B e72a5c7191ded0d83e12bf682664958d80b884b5217d2cec7e711be07c6a94d6b4dee2a451d7661d2c9f800e1fa4ece99d0a840d613266afd203f0428c27086f SHA512 f9731e429d091d02b83f3c60247150fabb267e74510c397978ee215c0a9eede6e74297ec3433b3e4ff1db858382136c74c5efbc43d2a8fcd6b848d19998bb6da
diff --git a/app-portage/ufed/ufed-0.92.ebuild b/app-portage/ufed/ufed-0.92.ebuild
index 439c65b2bb97..9922509db2fb 100644
--- a/app-portage/ufed/ufed-0.92.ebuild
+++ b/app-portage/ufed/ufed-0.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="sys-libs/ncurses:0="
diff --git a/app-portage/ufed/ufed-0.94.ebuild b/app-portage/ufed/ufed-0.94.ebuild
new file mode 100644
index 000000000000..6e20116621dc
--- /dev/null
+++ b/app-portage/ufed/ufed-0.94.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools out-of-source
+
+DESCRIPTION="Gentoo Linux USE flags editor"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMON_DEPEND="sys-libs/ncurses:0="
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# Change the version number to reflect the ebuild version
+	local REPLACEMENT_VERSION_STR="${PVR}"
+	[[ ${PV} == *9999 ]] && REPLACEMENT_VERSION_STR+="-${EGIT_VERSION}"
+	sed -i "s:,\[git\],:,\[${REPLACEMENT_VERSION_STR}\],:" configure.ac || die
+
+	eautoreconf
+}
diff --git a/app-portage/ufed/ufed-9999.ebuild b/app-portage/ufed/ufed-9999.ebuild
index 6ab99b399c04..3a357527b718 100644
--- a/app-portage/ufed/ufed-9999.ebuild
+++ b/app-portage/ufed/ufed-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib git-r3 autotools
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools out-of-source
 
 DESCRIPTION="Gentoo Linux USE flags editor"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Ufed"
-SRC_URI=""
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/ufed.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 COMMON_DEPEND="sys-libs/ncurses:0="
@@ -22,11 +27,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	default
 	# Change the version number to reflect the ebuild version
-	sed -i "s:,\[git\],:,\[9999-${EGIT_VERSION}\],:" configure.ac
-	eautoreconf
-}
+	local REPLACEMENT_VERSION_STR="${PVR}"
+	[[ ${PV} == *9999 ]] && REPLACEMENT_VERSION_STR+="-${EGIT_VERSION}"
+	sed -i "s:,\[git\],:,\[${REPLACEMENT_VERSION_STR}\],:" configure.ac || die
 
-src_configure() {
-	econf --libexecdir="${EPREFIX}"/usr/$(get_libdir)/ufed
+	eautoreconf
 }