build-docbook-catalog: upgraded package to upstream
Upgraded app-text/build-docbook-catalog to version 2.0 for race fixes.
BUG=b:198104067
TEST=CQ passes
Change-Id: I8588ba344bd689970eebb9d1a73553cf2640fe7c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3198594
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index c7cebff..b7b1929 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1 +1 @@
-DIST build-docbook-catalog-1.20.tar.xz 4620 SHA256 9475e60a7eda5d9a427315c0bd60a04b7e1f8a214596d470073aaf9db8ed47d2 SHA512 65656c78709a8da01cfedc786a31da2de125eeb65bdaa3d2e49ed3a0a7ff4429280d5d384f23dca0ab540b74f7c9b2ed4b80e970905a7d2838a841c81925b3f6 WHIRLPOOL 3f2b52f82ca08bfcd4fb81acf6d4a09f5e5a6e466fc1cf6bf1a16fb4f8f47dc60b3fee10e87db7027fcc22d4eff545c071185abf016a0c1e147cb5572c645e88
+DIST build-docbook-catalog-2.0.tar.bz2 4653 BLAKE2B 8a2753d68c352063bbf2f385cf321528fea556ecf78687557aceb4b2b84dccd2de2bade39660747254f0cbc5af52658002ba7d34a2798ee75941307395e35a4d SHA512 8a2507570c5785b646365e97dc3c659e5c799eda296716588dc4923c7512a21be1b396d4f79a356c04f10a825b1f4be8b7d7f42389a28b2b64daf75e3a174a4f
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
deleted file mode 100644
index cc774f7..0000000
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild,v 1.5 2014/02/11 20:25:32 grobian Exp $
-
-EAPI=5
-
-DESCRIPTION="DocBook XML catalog auto-updater"
-HOMEPAGE="http://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- http://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
- http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
- !<app-text/docbook-xsl-stylesheets-1.73.1
- dev-libs/libxml2"
-DEPEND=""
-
-pkg_setup() {
- # export for bug #490754
- export MAKEOPTS+=" EPREFIX=${EPREFIX}"
-}
-
-src_prepare() {
- sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
- has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
-}
-
-pkg_postinst() {
- # New version -> regen files
- build-docbook-catalog
-}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-2.0.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-2.0.ebuild
new file mode 100644
index 0000000..8233571
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/build-docbook-catalog.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="
+ dev-libs/libxml2
+ || ( sys-apps/util-linux app-misc/getopt )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+ has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+src_configure() {
+ # export for bug #490754
+ export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+
+ default
+}
+
+pkg_postinst() {
+ # New version -> regen files
+ build-docbook-catalog
+}
diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
index 4538a68..85e4ed8 100644
--- a/app-text/build-docbook-catalog/metadata.xml
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+<!-- maintainer-needed -->
</pkgmetadata>
