gentoo resync : 29.12.2022

3 files changed, 5 insertions, 59 deletions

diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index 8be714f7b6ca..edbbde1ee32d 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,5 +1,3 @@
-DIST page-1.9.8.tar.gz 162352 BLAKE2B acde0feb62d58f66708ec09545137978540fb8c5fab651961b6e87d7c9d7be3170b8e2171c80ec553a9059ae2c23869759f37953da783be3a8fb3ea471e8b15b SHA512 758b1efbecb6d0a3d6ea0f7261b1c55db0927aa46d871f1a30b77e5aa7b9819ae74ca6fb821692656f2150da758793ba5653bdd94ab92ba2b79b39e0d4a4882e
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-EBUILD page-1.9.8.ebuild 1348 BLAKE2B fd2f8a03df95bd652bb253568e7c0ca8348eeb834d06f223c0d6d601f67e6ada45c36ef20d33ae5b90b88494f469853d0cc9af7dd110143b29d8a207adf133c7 SHA512 cd7719566b074cf9f074ed4e94298a1ffdfc1f852a9494fd63c55077bfef9c2f41116e2209ed3b78620172a9238266c8f869ffdbf46a1755aabb8a68fa16a602
-EBUILD page-1.9.9-r3.ebuild 1341 BLAKE2B d6a18ab1c4ae879f3aac459160aa33fa09e79ecc05812b6593d9dec787f48ae47fd061ce2951b81b1daeefe642e20c0eee45d83865f04d6a138c2925fcfa6419 SHA512 e55c83ff9baec2bbe3b24aaeb553bd4f98eda6c24e92854b46af86f3dd2d585328cc7b00332492a7a392e9316436f2831090585aa2e340f8c1f2d491ae1d81d7
+EBUILD page-1.9.9-r4.ebuild 1346 BLAKE2B f2697c20c4907f72bc090e5097215ef62a2ba97f571bcaefcd8cf1177110c7a9547c3d8f624f7f67e0f438a309506d19958cea8c44e0803ac6f4c4035c3963c5 SHA512 eef1999b97739813baf743a06184f38e10318ccc6c71d65564334feeb4a8d1a321bd2b55d9481297e7cad42c35541be262cecf6421575b457cc2852de12797b6
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.8.ebuild b/x11-wm/page/page-1.9.8.ebuild
deleted file mode 100644
index 8fcd55186a3b..000000000000
--- a/x11-wm/page/page-1.9.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="https://github.com/gschwind/page"
-SRC_URI="https://github.com/gschwind/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11[xkb]
-	>=x11-libs/xcb-util-0.4.0
-	>=x11-libs/libXfixes-5.0.3
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXrandr-1.5.1
-	>=x11-libs/libXcomposite-0.4.4-r1
-	>=x11-libs/libXrender-0.9.10
-	>=x11-libs/libXext-1.3.3
-	>=x11-libs/cairo-1.14.6[X,xcb(+)]
-	>=x11-libs/pango-1.40.5
-	>=dev-libs/glib-2.50.3-r1:2"
-
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.12-r2
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# Solves file collision with dev-tcltk/tcllib, bug #574074
-	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
-	eend
-}
-
-pkg_postinst() {
-	elog "page can now be launched using \"pagewm\". To find out more about this functionality,"
-	elog "see the following bug report: https://bugs.gentoo.org/574074."
-}
diff --git a/x11-wm/page/page-1.9.9-r3.ebuild b/x11-wm/page/page-1.9.9-r4.ebuild
index a5c53381b117..f486626b160b 100644
--- a/x11-wm/page/page-1.9.9-r3.ebuild
+++ b/x11-wm/page/page-1.9.9-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -25,7 +25,6 @@ RDEPEND="
 	>=x11-libs/cairo-1.14.6[X,xcb(+)]
 	>=x11-libs/pango-1.40.5
 	>=dev-libs/glib-2.50.3-r1:2"
-
 DEPEND="${RDEPEND}
 	>=x11-base/xcb-proto-1.12-r2
 	x11-base/xorg-proto"
@@ -40,8 +39,8 @@ src_install() {
 
 	# Solves file collision with dev-tcltk/tcllib, bug #574074
 	ebegin "Changing references from 'page' to 'pagewm'"
-	mv "${D}"usr/bin/page "${D}"usr/bin/pagewm || die "Could not rename binary!"
-	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${D}"usr/share/applications/page.desktop || die "Could not change .desktop file!"
+	mv "${ED}"/usr/bin/page "${ED}"/usr/bin/pagewm || die "Could not rename binary!"
+	sed -i -e "s:/usr/bin/page:/usr/bin/pagewm:" "${ED}"/usr/share/applications/page.desktop || die "Could not change .desktop file!"
 	eend $?
 }