gentoo resync : 15.12.2017

3 files changed, 85 insertions, 5 deletions

diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index d4a7fdc0db89..7c61c5cb42f2 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,6 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
-AUX sgml-common-0.6.3-prefix.patch 658 BLAKE2B 1a3312b85fdb5e841e64f94d3f8f3a237d15600d5118ab351063651882c4e2a8c4e1907723c8ca65d14c8562d1a71e34be6fa6c6306c89a081b5ca51986ddd48 SHA512 25e02afb59be7c056577169a5c644a2fa6800bf07c5876fac3f9ad6b3094ee186b1864f59ae2fcbb99acb7f0d6e0d32f8daeb2aeec16f8f2f98d43b3e890ef7d
+AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
 EBUILD sgml-common-0.6.3-r5.ebuild 2477 BLAKE2B 3e47604d7ce2b484b275d91660761767ba35308981cd9bbdb5c9ab3cd7daa07a5ade3610d1b46d170ca2d650290bff622debd01ab02e3360096f096893448913 SHA512 0ea375e2fd3a481f59656f488aa9e5702d6755019a909cbe7f091e836cb9d99f3f19fda10e9ec03bc66033b234891aca1b71a81ddb15b74cd271da816358ee78
+EBUILD sgml-common-0.6.3-r6.ebuild 2505 BLAKE2B 2eef658940467bdba05148f74b48e804401fa2e17780048c12a6bc8dfba303bd910feb27fa203c351fa1a0c0ac25fe77e1572d48ea9e2a743c0930f08c239846 SHA512 f48aadbd88101c24d40ed78ff9abb7fe65df52101f5aaaec966d8be36c2aacfc8c6e8749718d4de41c0ecf64d52a2f8296f834b70f9e0d2bb63310928b604058
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch b/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch
index bfca708799d3..a116039a8d62 100644
--- a/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch
+++ b/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch
@@ -1,5 +1,5 @@
---- bin/sgmlwhich~	2007-10-08 04:21:25 +0200
-+++ bin/sgmlwhich	2007-10-08 04:21:36 +0200
+--- a/bin/sgmlwhich	2007-10-08 04:21:25 +0200
++++ b/bin/sgmlwhich	2007-10-08 04:21:36 +0200
 @@ -3,5 +3,5 @@
  # Send any comments to Eric Bischoff <eric@caldera.de>
  # This program is under GPL license. See LICENSE file for details.
@@ -7,8 +7,8 @@
 -echo "/etc/sgml/sgml.conf"
 +echo "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/sgml.conf"
  # Simple, isn't it? ;-)
---- config/sgml.conf~	2000-11-17 09:36:11 +0100
-+++ config/sgml.conf	2007-10-08 04:42:52 +0200
+--- a/config/sgml.conf	2000-11-17 09:36:11 +0100
++++ b/config/sgml.conf	2007-10-08 04:42:52 +0200
 @@ -1,3 +1,3 @@
  # /etc/sgml/sgml.conf conformant with LSB
 -SGML_BASE_DIR=/usr/share/sgml
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
new file mode 100644
index 000000000000..15b981208087
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="http://www.iso.org/standard/16387.html"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
+
+src_prepare() {
+	# We use a hacked version of install-catalog that supports the ROOT
+	# variable, puts quotes around the CATALOG files, and can be prefixed.
+	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
+		|| die "Copy of install-catalog.in failed"
+
+	default
+	eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
+}
+
+pkg_postinst() {
+	local installer="${EROOT%/}/usr/bin/install-catalog"
+	if [[ ! -x ${installer} ]]; then
+		eerror "install-catalog not found! Something went wrong!"
+		die "install-catalog not found! Something went wrong!"
+	fi
+
+	einfo "Installing Catalogs..."
+	"$installer" --add \
+		"${EROOT%/}"/etc/sgml/sgml-ent.cat \
+		"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+	"$installer" --add \
+		"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
+		"${EROOT%/}"/etc/sgml/sgml-ent.cat
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		einfo "Fixing ${file}"
+		awk '/"$/ { print $1 " " $2 }
+			! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new || die "awk failed"
+		mv ${file}.new ${file} || die "mv failed"
+	done < <(find "${EROOT%/}/etc/sgml/" -name "*.cat" -o -name "catalog" -print0)
+}
+
+pkg_prerm() {
+	cp "${EROOT%/}/usr/bin/install-catalog" "${T}" || die "cp failed"
+}
+
+pkg_postrm() {
+	if [[ ! -x ${T}/install-catalog ]]; then
+		return
+	fi
+
+	einfo "Removing Catalogs..."
+	if [[ -e ${EROOT%/}/etc/sgml/sgml-ent.cat ]]; then
+		"${T}"/install-catalog --remove \
+			"${EROOT%/}"/etc/sgml/sgml-ent.cat \
+			"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog \
+		|| die "install-catalog failed"
+	fi
+
+	if [[ -e ${EROOT%/}/etc/sgml/sgml-docbook.cat ]]; then
+		"${T}"/install-catalog --remove \
+			"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
+			"${EROOT%/}"/etc/sgml/sgml-ent.cat \
+		|| die "install-catalog failed"
+	fi
+}