From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- app-text/xmlto/Manifest | 4 +- .../files/xmlto-0.0.28-dont-hardcode-paths.patch | 4 +- app-text/xmlto/xmlto-0.0.28-r7.ebuild | 53 ---------------------- app-text/xmlto/xmlto-0.0.28-r8.ebuild | 53 ++++++++++++++++++++++ 4 files changed, 58 insertions(+), 56 deletions(-) delete mode 100644 app-text/xmlto/xmlto-0.0.28-r7.ebuild create mode 100644 app-text/xmlto/xmlto-0.0.28-r8.ebuild (limited to 'app-text/xmlto') diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest index 99c402265a41..aedbd89297a8 100644 --- a/app-text/xmlto/Manifest +++ b/app-text/xmlto/Manifest @@ -1,8 +1,8 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4 AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22 -AUX xmlto-0.0.28-dont-hardcode-paths.patch 782 BLAKE2B 400e85b97d2683943279b2f88f87cd3074f575376a69ca068d29b35cce266351847f267b4039a640bf8c2aafca39b48dc0cfd997db6e1ed64b847524d117e25a SHA512 f621d70836db82e300473679d7a5f88e13886273de48d87a8e77b790641d0142e7cde02fd5fd3e5f37d363fe93000025ac3d7df6991b9c151f5700769ccd9da6 +AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6 EBUILD xmlto-0.0.28-r6.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5 -EBUILD xmlto-0.0.28-r7.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8 +EBUILD xmlto-0.0.28-r8.ebuild 1496 BLAKE2B 1169a22eb7e73831633e5cf73817a95c05b214cbfc846570392ce98e089fbacbe1c87f9383a39bb8f5e1981b08df7627ddac43095d6157e5f423fb5482721f9e SHA512 4cf19496ccf9ff462da5547d2df92edd80dde84c409ac594dc2187068c150cf7d074ebe84ba88b823e71f5c10e1208632a21061a7a9d545e9a9a62b3f135d0b8 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed diff --git a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch index 5823b7350749..7137966b27d2 100644 --- a/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch +++ b/app-text/xmlto/files/xmlto-0.0.28-dont-hardcode-paths.patch @@ -1,3 +1,5 @@ +(See https://bugs.gentoo.org/828520 too) + From: Sam James Date: Wed, 10 Nov 2021 04:53:33 +0000 Subject: [PATCH] Don't hardcode paths to utilities @@ -20,7 +22,7 @@ this package is fragile enough. Leaving it for now. -SED_PATH=@SED@ -GREP_PATH=@GREP@ -ZIP_PATH=@ZIP@ -+LINKS_PATH=$(command -v links) ++LINKS_PATH=$(command -v elinks || command -v links) +W3M_PATH=$(command -v w3m) +LYNX_PATH=$(command -v lynx) +GCP_PATH=$(command -v cp) diff --git a/app-text/xmlto/xmlto-0.0.28-r7.ebuild b/app-text/xmlto/xmlto-0.0.28-r7.ebuild deleted file mode 100644 index c54987d45d2f..000000000000 --- a/app-text/xmlto/xmlto-0.0.28-r7.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats" -HOMEPAGE="https://pagure.io/xmlto" -SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="latex text" - -RDEPEND=" - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt - || ( sys-apps/util-linux app-misc/getopt ) - text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) - latex? ( dev-texlive/texlive-formatsextra ) -" -# We only depend on flex when we patch the input lexer. -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch - "${FILESDIR}"/${PN}-0.0.28-allow-links.patch - "${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch -) - -src_prepare() { - default - - # fix symbol clash on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die - fi - - eautoreconf -} - -src_configure() { - # We don't want the script to detect /bin/sh if it is bash. - export ac_cv_path_BASH="${BASH}" - has_version sys-apps/util-linux || export GETOPT=getopt-long - - econf -} diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild new file mode 100644 index 000000000000..c54987d45d2f --- /dev/null +++ b/app-text/xmlto/xmlto-0.0.28-r8.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats" +HOMEPAGE="https://pagure.io/xmlto" +SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="latex text" + +RDEPEND=" + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + || ( sys-apps/util-linux app-misc/getopt ) + text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) + latex? ( dev-texlive/texlive-formatsextra ) +" +# We only depend on flex when we patch the input lexer. +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch + "${FILESDIR}"/${PN}-0.0.28-allow-links.patch + "${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch +) + +src_prepare() { + default + + # fix symbol clash on Solaris + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die + fi + + eautoreconf +} + +src_configure() { + # We don't want the script to detect /bin/sh if it is bash. + export ac_cv_path_BASH="${BASH}" + has_version sys-apps/util-linux || export GETOPT=getopt-long + + econf +} -- cgit v1.2.3