gentoo resync : 15.12.2019

4 files changed, 41 insertions, 50 deletions

diff --git a/x11-misc/xtrace/Manifest b/x11-misc/xtrace/Manifest
index ce8dc2917c86..c5d745293f80 100644
--- a/x11-misc/xtrace/Manifest
+++ b/x11-misc/xtrace/Manifest
@@ -1,3 +1,3 @@
-DIST xtrace_1.3.0.orig.tar.gz 183803 BLAKE2B 286c9ed04cd13dea72aeeb1b81643278fbfc4f64ae8c032287ad36ff560e469b8a9c3d338ac8803e45d13cb83e02d1229e5ea64a6611d509eb08ebaf1abab7df SHA512 8078f976652b18503f68020e8ae716fceea506c62582ae23b00cca67b6d6c76a9d0955567a5bb011f1ead6d99996cdcb80f93c5f4c3f9e65c4443599caec3399
-EBUILD xtrace-1.3.0.ebuild 759 BLAKE2B de7db44f74d255d3b59bc8e0fcb388d036d1b27a858f37d8560ecb5dd985c4e207aedca2623539ae294d145737bb8e4b36c1b47f2304dfd4c52c7cdb3c096402 SHA512 659ee76594b62c83983bc9ab467986b8afd882a4c84fc0c0668771d198acee88d789410b6f4ad5df4707706b458d3ede735785523e871aade1ef883436d1b62a
-MISC metadata.xml 462 BLAKE2B 829bbed0c4f9dbbeab92198c75d05feb41f1e75e59e7b4514878b3b055f9b7c0016d71fbf3ee87a5d6035e6897760e6726c577b29ea4bbc59191b07269a0f067 SHA512 c0c3fdac4ac2b920d347e265918bd2a4ed61637157502028aa8e02111c1cfafef6249c15639b1d02e01e6394faa2ebca0ab2e282e4e4a86bd2975ebca265ca78
+DIST xtrace-1.4.0.tar.gz 109032 BLAKE2B 61e1360923eb6b83e47e8d6eb8882b362ef4f257b699d6de9c43556a0e9fe767edab90dfe2d5d792297be244d976a7a0ff7b2df37c87f5e63c7b4731fd2d089d SHA512 97363c5518eccdde15f2f0567d2bc46e8e54638e0b2ef33b207526d660a9f607d5176651dc95aa48267808701406f74de55bed972a931c84462446e3b74c6a7a
+EBUILD xtrace-1.4.0.ebuild 760 BLAKE2B 1aac1f9232fb1a2b83f17df7ec85c2ff66f4ddd3460f25761841eb01847a5f6dba6bd88cf5673b8bd2ba04ccaaf0300e9c69608cd043fb8532b1597e802a3fa6 SHA512 5f9889adfb3c2e4eef2a3fc137e1cee87212643aa08187cc3d970db1a05f67dd99dde320837ae72816094cb97ed5efc6dedad0db9fd9e0948186691595088709
+MISC metadata.xml 255 BLAKE2B a2162fdaa6e5e8ad6a0310f1e03075023f8548ab4f689c43652ccfe84418ec1ee31bc7c9351cbc8bbc08db8e1b5cb3fe700b6d0ae3bf0c751933b883704ee59a SHA512 a406e5b0292decc477b110f62832679ec16a81044082ef04854421aa6fbac93bda9ca2205a6a39347610ce2564db2cd0fdc314a4924258b00fc15231ca73df95
diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml
index 91b9837c7dda..867145a2f0fb 100644
--- a/x11-misc/xtrace/metadata.xml
+++ b/x11-misc/xtrace/metadata.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>nightnord@gmail.com</email>
-	<name>Andrian Nord</name>
-</maintainer>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xtrace/xtrace-1.3.0.ebuild b/x11-misc/xtrace/xtrace-1.3.0.ebuild
deleted file mode 100644
index 178f5231a886..000000000000
--- a/x11-misc/xtrace/xtrace-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-MY_CODE="3694"
-
-DESCRIPTION="X11 protocol trace utility"
-HOMEPAGE="http://xtrace.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/${MY_CODE}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog README NEWS)
-
-src_configure() {
-	local myeconfargs=(
-		--program-transform-name="s/^x/x11/"
-	)
-
-	autotools-utils_src_configure
-}
-
-pkg_postinst () {
-	einfo "To avoid collision with glibc (/usr/bin/xtrace)"
-	einfo "binary was renamed to x11trace, as suggested by author"
-}
diff --git a/x11-misc/xtrace/xtrace-1.4.0.ebuild b/x11-misc/xtrace/xtrace-1.4.0.ebuild
new file mode 100644
index 000000000000..1585b28744fa
--- /dev/null
+++ b/x11-misc/xtrace/xtrace-1.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="X11 protocol trace utility"
+HOMEPAGE="https://salsa.debian.org/debian/xtrace"
+SRC_URI="https://salsa.debian.org/debian/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/libXext
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --program-transform-name="s/^x/x11/"
+}
+
+pkg_postinst () {
+	einfo "To avoid collision with glibc (/usr/bin/xtrace)"
+	einfo "binary was renamed to x11trace, as suggested by author"
+}