gentoo resync : 13.10.2019

5 files changed, 3 insertions, 73 deletions

diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 47c06b2eafc6..761fb82aa8e9 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,10 +1,6 @@
-AUX xosd-2.2.14-m4.patch 242 BLAKE2B b10c0b6178ba3ecae2b82e4408fd5742e6c211146b3172f8a3eb9a10873b15eabe5fbf0c3deca59c97deb1a795432064cf6c25f1826d745b91929ec7cf4ea361 SHA512 022be1d08f8798b98f647023f7c90774bd6a12959de0c2a621ff730e8470af109e9dce06bcdbaae64145ade4a277bf301dff3129597cda7baf6059a35873eecc
-AUX xosd-2.2.14-makefile.patch 480 BLAKE2B 2ddb462b8d7945e069e30338ee6a084cc5f46c56e0431c7f72b90343750a3d2c86332064a6423befe4006ba4d5bd7a7b968ac9079a93066af39a592c255aa1fd SHA512 3a51c49358d432e4fe8a28aabfcfa5a457b8334815298fa8b9b313ca6c2caacbb261e65fcf92df71f4e5fd0042a43ac02d06bc842cf299ba59c182d6de21c249
 AUX xosd-config-incorrect-dup-filter-fix.patch 520 BLAKE2B fe345fcb77c8fd5788ec55d2baac5bc0d2efa0242939c6d0dd2bbc63b65ea62eb9929af84d6645a5ae493313691670d3f9a46728c73d1b1809269d8647e25a6d SHA512 cd7726a0c616d11d20eabefca3ff4a63c76e49b1e725ddc5f3ab3452e64a46e94e5584e0779cdc4b23705fb1b17a8d2535bdbb22fd1b0ee88782bca1d4d5c248
 DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8df2c22a400a895d63ad5c4a32ad393330b47ee75fb7d8943a230df6d750094457e2021025035e91e5b1cf470e6b SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483
-DIST xosd_2.2.14-1.diff.gz 8616 BLAKE2B b9eb96eee0bd561923507fb2bddf87e8f9ad986aae1cb8c820d1bf3de00685934b3813dd0e697406855afe1c0aa5111e214260cb2e425725b479a23617fe5c75 SHA512 257ada9e0261c45c4c182acceeb24b95bbce08ec2ccae7ef49f9c5ee7a1e9995bd9527df725e0a871d48fa444899669320dc536674d0de71b766e9106097f86e
 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee
 DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473
-EBUILD xosd-2.2.14-r1.ebuild 1099 BLAKE2B a9efbbb9e7b743c9d04f1ebc6c803c427a312ea3e792c1fa5903136a3cf32fee16c1e53358dbd6e9d890c59d7b8665557c247ab8014a30b6bd6b18a372e512ae SHA512 b0b66039f6275381f403a9be4f5354cd4bfbee8b8ac006aff95fe20b0876dbdb866ea01be8ea3b5eceb374cdb21f5ed988edd8d021a44988b0679ee060ba954a
-EBUILD xosd-2.2.14_p2_p1.ebuild 1299 BLAKE2B 17b626b5b5fe3a3575c1c5e920a3540ee3dad816090f4144fb2d020734043d19b1756af3b13aad2be880de7ce06eb672bbad6f2133dd862b4df818fb0b3be995 SHA512 b4c294dec4978c8bb2ba6b16d1505f678877b814c1fc0d9231cd085f829177017441b0a0e5fe80215729d069e4702a5d4931b4df97fb26bdb8f110bff15f5b55
+EBUILD xosd-2.2.14_p2_p1.ebuild 1277 BLAKE2B ac6a515c7169e6661b79ef9664055a28d0969bb6ee4c70aaaf3bf961c3912768dbf6b5fa7fd6956a842b72d10f68ee74531271de670e3cb7ceba09dd1125e8f6 SHA512 e165611cdbed7b6941ef08c2962dd2356c25cdd466014b3f605b6229ad6067d6a57a8dbb5b406a97ced2645d9d5ca71e3b4fb67a13208422907fd76072ff0e03
 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519
diff --git a/x11-libs/xosd/files/xosd-2.2.14-m4.patch b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
deleted file mode 100644
index 3e529728f8b3..000000000000
--- a/x11-libs/xosd/files/xosd-2.2.14-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
---- xosd-2.2.14/libxosd.m4
-+++ xosd-2.2.14/libxosd.m4
-@@ -8,3 +8,3 @@
- dnl
--AC_DEFUN(AM_PATH_LIBXOSD,
-+AC_DEFUN([AM_PATH_LIBXOSD],
- [dnl
diff --git a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
deleted file mode 100644
index ed6da80fbb61..000000000000
--- a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xosd-2.2.14/man/Makefile.am
-+++ xosd-2.2.14/man/Makefile.am
-@@ -3,7 +3,7 @@
-   xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \
-   xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \
-   xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \
--  xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \
-+  xosd_set_horizontal_offset.3 xosd_destroy.3 \
-   xosd_set_bar_length.3
- 
- EXTRA_DIST = ${man_MANS}
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
deleted file mode 100644
index 1279eb3dc264..000000000000
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display"
-HOMEPAGE="https://sourceforge.net/projects/libxosd/"
-SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~jer/${PN}_${PV}-1.diff.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-IUSE="xinerama"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	media-fonts/font-misc-misc"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
-
-	AT_M4DIR="${WORKDIR}/m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable xinerama)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index 98ff80fc919a..83b588e0744d 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs xinerama"
 
 RDEPEND="x11-libs/libX11