gentoo resync : 17.02.2021

5 files changed, 7 insertions, 211 deletions

diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 4f462c8483e6..f73071dcf032 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,9 +1,3 @@
-DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe
-DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46
-DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1
 DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729f4be3e1fd7421c6fbdbbacde70f42f3052547dca8421b8343d4b41fbf2ea52b07aa4471974f9f0cc6eea7a7 SHA512 a9bb0b55536e09f70b1d14a5748635f5c5ec1b7b22517453a963b240ab593aae43c56e5cbc7b79d5f19103f0e13200faceb2d25afd66c3d941580424ae6d9d31
-EBUILD tint2-16.2.ebuild 1273 BLAKE2B ef37602f6f90f16fe0b6fef490bed60e55b326437d925cac0187df093c16b0038eb2e7460db16bb8f02881a797064510076ac7f8f99e26a43e6b85fbf4ea8f4c SHA512 329bf5a8f20b644e6fcc5e382cc72a8d1fa3766f66e302c3648d59c7f9495efb3babe31848772116320dc0df23f687d86233859fafd54f762a46aa26e2db132c
-EBUILD tint2-16.6.1.ebuild 1275 BLAKE2B f8cacb894d6955a00e3432a2ebc3de37faefd9e1c07a6da5da3cf288d7382a63252bf5b88ab87c085b3eb2616da7b133e15c04212407df5133b36ca33f92f472 SHA512 82db6f40551561c1ffa5fd315380f929f3747de63cedecf7e2ea66845db444aba2dc350b4dfd32f90172af750917e3a5a28044d5a7fceb08414e944218ac0893
-EBUILD tint2-16.6.ebuild 1278 BLAKE2B 0f8fff73d71aa594f162e951c8258a70902b303c7db43ae3d9a238f4a2d92e04cf160791f90e8648473012862cd86351a16256ac4aacc57ebd4e8a9afdb60288 SHA512 f80543332fd3602c29423d8420b85afa8b1d2f3e55550acf54151dedab7405e587b7e5cfab6874fb5fca1eb9c7eb0dd3343e21fc11461fac65c12d3865902419
-EBUILD tint2-16.7.ebuild 1300 BLAKE2B 02e58401a6a39173ce5ebcecb7209db422f1e2f2b76c9474351452dc0a8341251614e6f5b09ae54fe764b27679194a2f17150475509f69cd92a7c5a88f8ee0ea SHA512 7c2b6de1c0933ef0c75394908ce39cd4f1ad8d3e955d07b842f9284623ac77f156963e468a1b0dd579ed2e98699247b7b7060d31d963db8c5e1938a5d33057ba
+EBUILD tint2-16.7.ebuild 1100 BLAKE2B 0a447a106c7164a4ce916ddfa372385b00fdf2ce16f1c67d5ce1e4ecc56771fbbee3adaafae01612296c4b84d19c7eea9088744d1648070995fc0b83c3f07ae8 SHA512 5aa6c300572869f3bbb1232a89a3e14c17cfcae5ea604d3d9fe4165eecc0061dbd37d22459a045bdec22d86bf97f4de9d5bf1b6e605972b9ad4927f689e47f36
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.2.ebuild b/x11-misc/tint2/tint2-16.2.ebuild
deleted file mode 100644
index 97820dabd24e..000000000000
--- a/x11-misc/tint2/tint2-16.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.6.1.ebuild b/x11-misc/tint2/tint2-16.6.1.ebuild
deleted file mode 100644
index 5a5f9d056fd8..000000000000
--- a/x11-misc/tint2/tint2-16.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.6.ebuild b/x11-misc/tint2/tint2-16.6.ebuild
deleted file mode 100644
index e901507e5acb..000000000000
--- a/x11-misc/tint2/tint2-16.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot
-
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="battery svg startup-notification tint2conf"
-
-DEPEND="
-	dev-libs/glib:2
-	svg? ( gnome-base/librsvg:2 )
-	>=media-libs/imlib2-1.4.2[X,png]
-	x11-libs/cairo[X]
-	x11-libs/pango
-	tint2conf? ( x11-libs/gtk+:2 )
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXinerama
-	>=x11-libs/libXrandr-1.3
-	x11-libs/libXrender
-	startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_BATTERY="$(usex battery)"
-		-DENABLE_TINT2CONF="$(usex tint2conf)"
-		-DENABLE_SN="$(usex startup-notification)"
-		-DENABLE_RSVG="$(usex svg)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-16.7.ebuild
index f71adacd17f3..41eb579f0bee 100644
--- a/x11-misc/tint2/tint2-16.7.ebuild
+++ b/x11-misc/tint2/tint2-16.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
-DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+DESCRIPTION="Lightweight panel/taskbar for Linux"
 HOMEPAGE="https://gitlab.com/o9000/tint2"
 SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
 S=${WORKDIR}/${PN}-v${PV}
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-v${PV}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="battery svg startup-notification tint2conf"
+IUSE="battery startup-notification svg tint2conf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -33,8 +33,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -45,22 +44,5 @@ src_configure() {
 		-DENABLE_SN="$(usex startup-notification)"
 		-DENABLE_RSVG="$(usex svg)"
 	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
+	cmake_src_configure
 }