gentoo resync : 20.03.2021

4 files changed, 4 insertions, 67 deletions

diff --git a/x11-misc/xcave/Manifest b/x11-misc/xcave/Manifest
index 5e0df57a26b1..ec231ae38821 100644
--- a/x11-misc/xcave/Manifest
+++ b/x11-misc/xcave/Manifest
@@ -1,6 +1,3 @@
-AUX xcave-2.4.0-pkg-config.patch 201 BLAKE2B 0546786150f51852ecc3618a6f384de44b099837ece50393697273c374525deaf3c26aadfe5076aa4e91aa989756d1a3131aa68c5b3ac8e6f5f5411ad0cc19ed SHA512 c326bc4ac74ff764b7c77d17abc37ef03afe0fc2e20f7018cda242e49e767c2ccb1e05250f57a567c6b14a2069df6e57bc2bc87d0f4e8e031dfe8c14e3782f5f
-DIST xcave-2.4.0.tar.gz 817356 BLAKE2B 2a80eb20d484fe37ee5871e4bbf443fb87170adf8a02d4ebc059bcc4f907b2b4442a0b9858719e1c656d0293e55c470aba1bcf83c899ba079a2f201d93b84cb2 SHA512 cdba5ad8b7634004a9439fd87a8eb8ed45137e78cb119310c6b7df9352aa979682edaae6440200804e23953c822d377c95cf459cc37ce227d1a41885a91afba4
 DIST xcave-2.5.1.tar.gz 786853 BLAKE2B e3b2290b01c16bff4dbe8d5167b4bed75fbe4225555e3ee3856115302329878550cbb4c35286c717eb46c3fd12b4d66323895cdbb292cc6f054360b53c3f9c1a SHA512 6095c06d75f7c5d87a6d0f1c4c3a52071ffc1912d60ba07c95d9b8d84f0027ba24476f941828c4eecf801d7ca7f0bc168ddd2d162b3e863fc31ee6b4c9144cd4
-EBUILD xcave-2.4.0.ebuild 752 BLAKE2B 4c0ac0c3cef59e0a98df06d099b50c06bf05cb7403414ea9ba048c860fbea072e87bd3ef5d5d35f8ad745cc30359a85c1fd6eeed66fe0cbd8fd30079bee9ae78 SHA512 f828e14ef719f72a52be2de76607b8c5abcb87b2a85e7775bb71b5e6597cf6c3a299e54421f487491d0119a146b2f82ea5ad517e1370e679eb85911d9d160537
-EBUILD xcave-2.5.1.ebuild 627 BLAKE2B fa3f56245fa802e538f64a800a88b0029f86a6d31c13ebf5fa5663fe7319e2b90621b3090f23e00e8781b250f2dd27255c43e100d1f00897d6f0277f11bae571 SHA512 0cb4191bb0718310974cbd6d4fcf6efdfde84c17985131a5bae1d63d8c9cc0ebddeb19020f280239a8a4c894b2e509d9c25254700a37f69f1fa1cc518abf7bda
+EBUILD xcave-2.5.1.ebuild 625 BLAKE2B e99083cb5640ddd915a526eed257464e0c7a274e88a61ffb5d644c50d9f04c7ba7d0062ae8cada885bebda9d8e1755ce2c108494e609f14c422a78a1b9eb8a14 SHA512 a65d3c8d43c1a766cba40517d4ce7265f51cba26be360ea12537902fde9ec7c40c65451e6690bd73e2aa8210e463080978bf0c55fcd05c90840096fcae5dc73a
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch b/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
deleted file mode 100644
index f0e331dccfe2..000000000000
--- a/x11-misc/xcave/files/xcave-2.4.0-pkg-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -49,10 +49,6 @@
- 
- 
- 
--PKG_CHECK_MODULES(libxml-2.0, libxml-2.0)
--AC_SUBST(libxml-2.0_CFLAGS)
--AC_SUBST(libxml-2.0_LIBS)
--
- AC_OUTPUT([
- Makefile
- src/Makefile
diff --git a/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
deleted file mode 100644
index 96c74893f67f..000000000000
--- a/x11-misc/xcave/xcave-2.4.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="View and manage contents of your wine cellar"
-HOMEPAGE="http://xcave.free.fr/index-en.php"
-SRC_URI="http://${PN}.free.fr/backbone.php?what=download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/libxml2:2
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.0-pkg-config.patch
-)
-
-src_prepare() {
-	mkdir m4 || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fcommon
-	default
-}
-src_install() {
-	default
-
-	rm -rv "${ED}"/usr/doc || die
-}
diff --git a/x11-misc/xcave/xcave-2.5.1.ebuild b/x11-misc/xcave/xcave-2.5.1.ebuild
index 21223817b379..bb21e3da7208 100644
--- a/x11-misc/xcave/xcave-2.5.1.ebuild
+++ b/x11-misc/xcave/xcave-2.5.1.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
+
 inherit flag-o-matic
 
 DESCRIPTION="View and manage contents of your wine cellar"
@@ -18,9 +19,7 @@ RDEPEND="
 	gnome-base/libglade
 	x11-libs/gtk+:2
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/intltool
 	sys-devel/gettext