public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/sgml-common/, app-text/sgml-common/files/
@ 2017-12-12 20:55 Patrice Clement
  0 siblings, 0 replies; only message in thread
From: Patrice Clement @ 2017-12-12 20:55 UTC (permalink / raw
  To: gentoo-commits

commit:     bd5296940eed95cd467548099e3496968098fde2
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Nov 25 17:01:39 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 20:54:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd529694

app-text/sgml-common: EAPI 6 bump and update HOMPAGE.

Closes: https://bugs.gentoo.org/638804
Closes: https://github.com/gentoo/gentoo/pull/6297
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../files/sgml-common-0.6.3-prefix.patch           |  8 +--
 app-text/sgml-common/sgml-common-0.6.3-r6.ebuild   | 79 ++++++++++++++++++++++
 2 files changed, 83 insertions(+), 4 deletions(-)

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 bfca708799d..a116039a8d6 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 00000000000..15b98120808
--- /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
+}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-12-12 20:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-12 20:55 [gentoo-commits] repo/gentoo:master commit in: app-text/sgml-common/, app-text/sgml-common/files/ Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox