From a658aa90dffe45cd63dc55c2eebc5b964973e96a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 25 May 2019 00:01:20 +0200
Subject: [PATCH] xfce-base/xfconf: Drop old
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 profiles/package.mask                 |  5 --
 xfce-base/xfconf/Manifest             |  2 -
 xfce-base/xfconf/xfconf-4.13.5.ebuild | 75 ---------------------------
 xfce-base/xfconf/xfconf-4.13.6.ebuild | 75 ---------------------------
 4 files changed, 157 deletions(-)
 delete mode 100644 xfce-base/xfconf/xfconf-4.13.5.ebuild
 delete mode 100644 xfce-base/xfconf/xfconf-4.13.6.ebuild

diff --git a/profiles/package.mask b/profiles/package.mask
index e9e097f18afb..c620fef3125b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -545,11 +545,6 @@ dev-libs/gost-engine
 # Masked for removal on 2018-11-24, bug #669650.
 dev-db/pgadmin3
 
-# Lars Wendler <polynomial-c@gentoo.org> (22 Oct 2018)
-# Breaks dev-libs/gobject-introspection and its consumers
-# See #669278
-=xfce-base/xfconf-4.13.6
-
 # Thomas Deutschmann <whissi@gentoo.org> (12 Oct 2018)
 # EOL and has known vulnerabilities. Please move to
 # Firefox 60 or newer if you can.
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 2e3c4adf9895..a662f1d2896f 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,4 +1,2 @@
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
-DIST xfconf-4.13.5.tar.bz2 609549 BLAKE2B ccd5e907752d8fa5b5c4a7468c9eeec4083709bbe11b14ae79b20938e3b7c6ff097805be56b3f8cee146e2d0c0ffb272b856e559d1699c4e40d7c140fe7515fe SHA512 34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b
-DIST xfconf-4.13.6.tar.bz2 578107 BLAKE2B 6348b536978d1d3f611783e530be7b694c46ad3030ed02e04a6e38122028068ec8392f34667e5d54a09d9115db191d6366619707e117f2b37f3ad8f14a3de2c2 SHA512 0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755
 DIST xfconf-4.13.7.tar.bz2 618676 BLAKE2B 8f7dd97530d4781e2d46d8139800f54991d932db5de0050e66d711bafef1daa0355383fd139789037a92b462042563a9aa2269295785b2f8217a0e9ff6a00c80 SHA512 113fb22b449a318b0cca6521914eda6cfeb6b2056a1aad4d49a5e83c28661c843c9912bbf7eddb7d6cd1f172b532c73dd02259bf6fabe60a377024f9f8d5825d
diff --git a/xfce-base/xfconf/xfconf-4.13.5.ebuild b/xfce-base/xfconf/xfconf-4.13.5.ebuild
deleted file mode 100644
index 244033bffc4a..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=xfce-base/libxfce4util-4.10:=
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)"
-
-src_configure() {
-	local myconf=(
-		$(use_enable perl perl-bindings)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-	)
-
-	xdg_environment_reset
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-}
-
-my_test() {
-	local out=$(./xfconfd/xfconfd --daemon) || return 1
-	eval "${out}"
-
-	local ret=0
-	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
-	nonfatal emake -j1 check || ret=1
-
-	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
-	return "${ret}"
-}
-
-src_test() {
-	virtx my_test
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-	fi
-}
diff --git a/xfce-base/xfconf/xfconf-4.13.6.ebuild b/xfce-base/xfconf/xfconf-4.13.6.ebuild
deleted file mode 100644
index 2cd890f3d36b..000000000000
--- a/xfce-base/xfconf/xfconf-4.13.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx xdg-utils
-
-DESCRIPTION="A configuration management system for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug perl"
-
-RDEPEND=">=dev-libs/glib-2.30:=
-	>=xfce-base/libxfce4util-4.10:=
-	perl? (
-		dev-lang/perl:=[-build(-)]
-		dev-perl/glib-perl
-	)
-	!<xfce-base/xfce4-panel-4.13.1
-	!<xfce-base/xfce4-settings-4.13.1"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-	perl? (
-		dev-perl/ExtUtils-Depends
-		dev-perl/ExtUtils-PkgConfig
-	)"
-
-src_configure() {
-	local myconf=(
-		$(use_enable perl perl-bindings)
-		$(use_enable debug checks)
-		--with-perl-options=INSTALLDIRS=vendor
-	)
-
-	xdg_environment_reset
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake OTHERLDFLAGS="${LDFLAGS}"
-}
-
-my_test() {
-	local out=$(./xfconfd/xfconfd --daemon) || return 1
-	eval "${out}"
-
-	local ret=0
-	# https://bugzilla.xfce.org/show_bug.cgi?id=13840
-	nonfatal emake -j1 check || ret=1
-
-	kill "${XFCONFD_PID}" || ewarn "Unable to kill xfconfd"
-	return "${ret}"
-}
-
-src_test() {
-	virtx my_test
-}
-
-src_install() {
-	default
-	find "${D}" -type f -name '*.la' -delete || die
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete || die
-	fi
-}
-- 
2.26.2