gentoo resync : 20.10.2021

5 files changed, 104 insertions, 22 deletions

diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 559236522a9f..ffc6010cfed4 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -2,6 +2,8 @@ AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a3
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 AUX rofi-1.6.1-autoconf-2.70.patch 916 BLAKE2B 21aba99a26a32e5b563e46d9d2ce6b2dafc2d107cfc78ed2702b7ec03e5928557f4c5bae12c8dd5ffd5b2b0a076858e201cf547ea7695842efc9bbc5446a0d97 SHA512 7f7cacd287137524f356e649e80fbfa077deef8cd864991d5d4631cfb8c9b883b33a9cc09ce50709a83a33dd7744d41a11f0f2ca3c48d188463b310425f17e88
 DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60
-EBUILD rofi-1.6.1.ebuild 1220 BLAKE2B 19ef083739612c9b4ad1e018c447f6e21131a74a278473d584523d9f2fdafa612b2e8b033126f2385d9d4166ad68b895b784919f10df49094cad83350d2f6437 SHA512 43401b44db501d72e76a5ae39bab30996dc5b4703d8286a3151e8e1781efd78b0a33785973b4e159d7f2e433dfadf68e099a6875da0adc22cb888186372e32c6
-EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
-MISC metadata.xml 373 BLAKE2B b7c92350ddd79f73e25f619f77ddcaf93b18e65cf129f95804c8560afefcfd0edf379fba697ea18a41bb159d656e330d84605454522f27e910fb3af0765a3bdc SHA512 3e5b29269fb95b948f0401f5bef699b4dcafcc3d43312e5ecdcf57d977292ffa9c804159a6ad7f46e69ffadc21d2d51d7723fd5e5ed2dbdcb15cb2c7391728ed
+DIST rofi-1.7.0.tar.gz 902294 BLAKE2B 281f48702650f65e4b037fdbbe6861e173dd3465cf6a80a1d2038271511a9f85ebdb19d8e7a1854f82d52172bbfea6eb1b1685228fc4ff874773033406c9267b SHA512 84a42ecf519c7eed8093c4af3b66731b890939a2bf2a63290e599103705f6bacaba59ade1b8a1bc854f6b767e8d44ee42c20e44f63886bcacbfdbe0468d350b4
+EBUILD rofi-1.6.1-r1.ebuild 1247 BLAKE2B d92fbb93dad604d5dbe58a90c1c63825952246d5581478578c056f82372d84ab5cd26fe4954601383193714cacafbed45371f913f4a311676e12069e68349324 SHA512 3b1bb1ac88c01a84841a3266fe86aa7c22101c85ef022356768eb04c49740b63b1469c83080dee49cda61260b18e16e24acbdb51f8c37dafbab1d020bc60bbe0
+EBUILD rofi-1.7.0-r1.ebuild 1590 BLAKE2B 9f8fce1d0fedea2eb2b2c3880a01a6bf655d6c2b33d60a2d63cbdf07cc635a09526e92d0cfbc3d18abdf2993b4cc7569c8c94ced76f9b51ae6a1577306cd2945 SHA512 48fece0953f6d794b032d619b12fc0b6d134b236023d8b1699e4399a67e11cfba156bc86c5fbea4a2b94ec154a9a91d86f68f9ecfc812e0b293ac729f029e86d
+EBUILD rofi-99999.ebuild 1055 BLAKE2B 1ce7aba0e86b1087bc207613e258bf8e9191312a51c097b4b473f10f2d1f1fc0789c6a847e28dbe750c390c4a9e01e24da0b91a34eba0107e76b2965aa57a566 SHA512 2091ea3513e3f0c601964dc1b5ecb7e5151735bc1771dd2fb2d2caee9c186f21e94ece539e2431efd631a215ace11ab63bae38fd34bf9da04d6fd60be9a29705
+MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 87511edddce1..040d877273ac 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-<use>
-<flag name="drun">Enable desktop file run dialog</flag>
-<flag name="windowmode">Enable normal window mode</flag>
-</use>
-<upstream>
-<remote-id type="github">DaveDavenport/rofi</remote-id>
-</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>petrus.zy.07@gmail.com</email>
+		<name>Petrus Zhao</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="drun">Enable desktop file run dialog</flag>
+		<flag name="windowmode">Enable normal window mode</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">DaveDavenport/rofi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
index c919a190ff0f..e654777a5b58 100644
--- a/x11-misc/rofi/rofi-1.6.1.ebuild
+++ b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 "
 DEPEND="
 	${RDEPEND}
diff --git a/x11-misc/rofi/rofi-1.7.0-r1.ebuild b/x11-misc/rofi/rofi-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..813b6e07de00
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.7.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
+		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 1.7.0; then
+			elog "Rofi 1.7.0 removed the (deprecated) xresources based configuration setup."
+			elog "If you are still using old configuration setup, please convert it to new format manually."
+			elog "The new format configuration can be generated by 'rofi -dump-config > ~/.config/rofi/config.rasi'."
+			elog "For more information, please see https://github.com/davatorium/rofi/releases/tag/1.7.0"
+		fi
+	done
+}
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 81f8f9cf847d..080d70670508 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
@@ -11,13 +12,15 @@ EGIT_REPO_URI="https://github.com/davatorium/rofi"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="test windowmode"
+IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	dev-libs/glib:2
 	gnome-base/librsvg:2
 	media-libs/freetype
+	virtual/jpeg
 	x11-libs/cairo[X,xcb(+)]
 	x11-libs/libXft
 	x11-libs/libXinerama
@@ -28,28 +31,26 @@ RDEPEND="
 	x11-libs/xcb-util
 	x11-libs/xcb-util-wm
 	x11-libs/xcb-util-xrm
+	x11-misc/xkeyboard-config
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	test? ( >=dev-libs/check-0.11 )
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	tc-export CC
 
-	econf \
-		$(use_enable test check) \
+	local myeconfargs=(
+		$(use_enable drun)
+		$(use_enable test check)
 		$(use_enable windowmode)
+	)
+	econf "${myeconfargs[@]}"
 }