gentoo auto-resync : 16:02:2023 - 14:04:41

4 files changed, 38 insertions, 97 deletions

diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index a7054fdb2e2c..a2305a40fd4f 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,6 +1,4 @@
-DIST rofi-1.7.3.tar.xz 755776 BLAKE2B af746e72ce5d09f3815960eb533bf58160c56141a116d1d950db498445e07696d0af2abe36a661ce67178f2040bfba7a39ac6c8eacdfc4db9f75e5f74daf47f5 SHA512 bba9ee25c7ff2168370ad1fd21a2286706f9db1efccdab84c55abd3bfa822ed10d23128388c69c964e81b2c51e1a95b3a3c7ca503a4564d0bdb3a993d8a9553d
 DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0
-EBUILD rofi-1.7.3-r1.ebuild 1623 BLAKE2B f8c36a58d93ffaa76ccd38af0e7afb3664a02a8227e9b29416909d8f4f5534ad311100d525e7154d8093e77949bb89b542a5eff7a63e06e83bf7b0ae9e70d8be SHA512 ba7577a12e86a948b430419adfe0ae157e891a2c4e982a52ad9c6a45da5f8dfa50532cea39daf827a9c1598f4d45b5560326fcb4c0a50945fe7d0004240ce47a
-EBUILD rofi-1.7.5.ebuild 1698 BLAKE2B 006f730cbb8fde58cf17de6bbed486a986e7d92d4beb2fd09015bbe684b0c9e3ac11fde86140f4fd2d79b460986427ce2cf93a3079330297b8cc775af0512b8e SHA512 aedceac46dd6b3f62f5812a82f15e3e33523c1a3d85d9e83609f5e94e2a9e0fdfd10dcb6a35fd98da6c4d62189f4b723eaaead6b973e1c79570a004557d07c10
-EBUILD rofi-99999.ebuild 1159 BLAKE2B 26f639222f748e9f95b2df58dd7f3bc115da9175499c90ce5c91b96b471e2cb230c30064d4eafbb50f0ab7fbef65d73e427dd03b789849d06216cc35e8a77c64 SHA512 27a2adfa7c43f601d5222f660bdcfe9ebeb6d64b7dbd1fe034a566ddcd67f08b6977f3562c7792539b65da3f21ed40c317d769a507f7ac7eec0b74ef5f7f0ea6
+EBUILD rofi-1.7.5.ebuild 1403 BLAKE2B 0aa11055c6cc48b4437c0cc370bff6debc8a41946eeb8315152ed168d0ca5b8bb2ab2e262b07bb873db5427495e9eb08a64c9dab9b6c40085e74ad19e93e3a1a SHA512 783f6bf018b7b064c1696a15bf98554370aac11a4efbcf00ee5558aece803291009d4650ca0363ba2a54faae3a9d02058a2923d081c300bb8ee5eb4ef4a70dda
+EBUILD rofi-9999.ebuild 1403 BLAKE2B 0aa11055c6cc48b4437c0cc370bff6debc8a41946eeb8315152ed168d0ca5b8bb2ab2e262b07bb873db5427495e9eb08a64c9dab9b6c40085e74ad19e93e3a1a SHA512 783f6bf018b7b064c1696a15bf98554370aac11a4efbcf00ee5558aece803291009d4650ca0363ba2a54faae3a9d02058a2923d081c300bb8ee5eb4ef4a70dda
 MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/rofi-1.7.3-r1.ebuild b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
deleted file mode 100644
index 803fb05e4226..000000000000
--- a/x11-misc/rofi/rofi-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 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.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+drun test +windowmode"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	sys-devel/bison
-	>=sys-devel/flex-2.5.39
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxcb:=
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-wm
-	x11-misc/xkeyboard-config
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.11 )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Doesn't work with reflex, bug #887049
-	export LEX=flex
-
-	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-1.7.5.ebuild b/x11-misc/rofi/rofi-1.7.5.ebuild
index c51049b5e10e..8e9a841cca71 100644
--- a/x11-misc/rofi/rofi-1.7.5.ebuild
+++ b/x11-misc/rofi/rofi-1.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,17 @@ inherit autotools toolchain-funcs xdg-utils
 
 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.xz"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/davatorium/rofi"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 arm64 x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
 IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +54,9 @@ src_configure() {
 	# Doesn't work with reflex, bug #887049
 	export LEX=flex
 
+	# Requires bison, see https://bugs.gentoo.org/894634.
+	unset YACC
+
 	tc-export CC
 
 	local myeconfargs=(
@@ -59,15 +68,6 @@ src_configure() {
 }
 
 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
-
 	xdg_icon_cache_update
 }
 
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-9999.ebuild
index 88dba687d9d8..8e9a841cca71 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-9999.ebuild
@@ -1,17 +1,23 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools git-r3 toolchain-funcs
+inherit autotools toolchain-funcs xdg-utils
 
 DESCRIPTION="A window switcher, run dialog and dmenu replacement"
 HOMEPAGE="https://github.com/davatorium/rofi"
-EGIT_REPO_URI="https://github.com/davatorium/rofi"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/davatorium/rofi"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 arm64 x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="+drun test +windowmode"
 RESTRICT="!test? ( test )"
 
@@ -22,19 +28,15 @@ BDEPEND="
 "
 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/gdk-pixbuf:2
+	x11-libs/libxcb:=
 	x11-libs/libxkbcommon[X]
 	x11-libs/pango[X]
 	x11-libs/startup-notification
 	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
 	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
 	x11-misc/xkeyboard-config
 "
 DEPEND="
@@ -52,6 +54,9 @@ src_configure() {
 	# Doesn't work with reflex, bug #887049
 	export LEX=flex
 
+	# Requires bison, see https://bugs.gentoo.org/894634.
+	unset YACC
+
 	tc-export CC
 
 	local myeconfargs=(
@@ -61,3 +66,11 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}