gentoo auto-resync : 27:12:2022 - 14:10:05

5 files changed, 16 insertions, 71 deletions

diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 71eadefdc70d..f81b51af8022 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,11 +1,9 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 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.xz 404372 BLAKE2B b338382104b84f068024eff3a04bed1bbc895d6977204a9abdc55e3b382e6e6a9e5646f6155011b17d43943d9a7a9fb92aa7dca24789b260e73b5e3b134001de SHA512 c9794a7e4921e58ecc5fc7096218203f548efe2a49ffa6971accc12e9172248bda856ad06f8c11ada9abb62b9a43c7fffce1c1be9a3fe1365c94561b170a8b73
 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.6.1-r1.ebuild 1247 BLAKE2B fe2b0bed6b30aed3d2e2924a01932320f8e00e0761bcefca23cec22117a50572fe9999ab595e2e63991814465856dbdfcd23e9ce92ffda1e2bdda776a75aa72c SHA512 f7fa1d6acf3680ef97d07a218555ddcab934d9e977524c3fbed527690e92a3d0fc7317652307f9ded947e143d2ea19b8a2b3b5953254e6d3a64ad4c31c630e8a
-EBUILD rofi-1.7.3-r1.ebuild 1555 BLAKE2B 89033b7d8661043876a68111ac16c6fcbdc27cf08e1bb758267e108066b07892404f9dd39316035bb9c1bb4aba757f8f0f859c0594e122091428e2526bd7eaba SHA512 0b2bd010f829cf30e5032922087946a427fec631f2784c2158dc48c9a52a7871193c50be16f5538bd97e95c96e3802fea63fb04a4322b55530b914e697e2b190
-EBUILD rofi-1.7.5.ebuild 1630 BLAKE2B 4affaef82cdc0f9a8e3d3242a987f85456483f30023598d9ebfd06f5f0a8714f2cff7194519cc147dcf40af9d71350af189def57fd06ef9e61ee49550babd778 SHA512 ee078bd1b00517347aeb1bd65f5744a5c94ef029dbdbe2dabfb9286fc7948b927ee2c7d1da18beb6d9c0a89507a4defaa454078b3072e115e30438b12cba6f98
-EBUILD rofi-99999.ebuild 1091 BLAKE2B e9a2cb5c5699f6c7e16644354209293797ed90a12166768e9174aa7d8ec8273a3dabb972e6d88e639aeec8bc7e3feb7573c6cd53ff15212a2c9d6923cef4c8ef SHA512 7dcbe7996939338dc8a3db8cb415caa574fa0a3eaae0b5b678912564c6263d814fc2e6fbd2a3b790e66fb33e54e2e940ad34a545c545b3c0306a831b7b967a63
+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
 MISC metadata.xml 719 BLAKE2B da98cdb710b9c17250168d4875247f27c030011d1197ceeb762530ff89ff6a5f269e4a2f24d8299530bff9b827da9d4c8566f5e97f3d16256d598bdcf460ce35 SHA512 af7a2aa04205a39bf77fe19995fbfd414d50aff50d015d2a3674cf9a4ec9e2ef48994b5a521404af90af9dc95a4c8a64a24be95b9fd5a9d1d2fea3b94cb5fad1
diff --git a/x11-misc/rofi/rofi-1.6.1-r1.ebuild b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
deleted file mode 100644
index 664fa0b6b465..000000000000
--- a/x11-misc/rofi/rofi-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
-	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-	"${FILESDIR}"/${PN}-1.6.1-autoconf-2.70.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-
-	local myeconfargs=(
-		$(use_enable drun)
-		$(use_enable test check)
-		$(use_enable windowmode)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/x11-misc/rofi/rofi-1.7.3-r1.ebuild b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
index f3c69c98bc62..803fb05e4226 100644
--- a/x11-misc/rofi/rofi-1.7.3-r1.ebuild
+++ b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
+	>=sys-devel/flex-2.5.39
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -45,6 +45,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Doesn't work with reflex, bug #887049
+	export LEX=flex
+
 	tc-export CC
 
 	local myeconfargs=(
diff --git a/x11-misc/rofi/rofi-1.7.5.ebuild b/x11-misc/rofi/rofi-1.7.5.ebuild
index 83071b30f34a..c51049b5e10e 100644
--- a/x11-misc/rofi/rofi-1.7.5.ebuild
+++ b/x11-misc/rofi/rofi-1.7.5.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
+	>=sys-devel/flex-2.5.39
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -45,6 +45,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Doesn't work with reflex, bug #887049
+	export LEX=flex
+
 	tc-export CC
 
 	local myeconfargs=(
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 66b4e07790bd..88dba687d9d8 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	sys-devel/bison
-	sys-devel/flex
+	>=sys-devel/flex-2.5.39
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -49,6 +49,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Doesn't work with reflex, bug #887049
+	export LEX=flex
+
 	tc-export CC
 
 	local myeconfargs=(