public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/sgml-common/
Date: Wed, 11 Sep 2019 17:58:06 +0000 (UTC)	[thread overview]
Message-ID: <1568224637.ee43e4381d4f125f90e678ab339117c16ecda3db.mgorny@gentoo> (raw)

commit:     ee43e4381d4f125f90e678ab339117c16ecda3db
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 19:15:45 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 17:57:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee43e438

app-text/sgml-common: EAPI 7, major cleanup

Bump to EAPI 7.  Remove old catalog cleanup code, and switch
to sgml-catalog-r1 for regen.  Correct LICENSE.  Own /etc/sgml/catalog.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-text/sgml-common/sgml-common-0.6.3-r7.ebuild | 94 ++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
new file mode 100644
index 00000000000..a9d675c8206
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix sgml-catalog-r1
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="https://www.iso.org/standard/16387.html"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
+
+# install-catalog is GPL
+LICENSE="FDL-1.1+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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
+}
+
+src_install() {
+	default
+
+	# own /etc/sgml/catalog
+	insinto /etc/sgml
+	newins - catalog <<<''
+	newins - sgml-ent.cat <<-EOF
+		CATALOG "${EPREFIX}/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
+	EOF
+	newins - sgml-docbook.cat <<-EOF
+		CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+	EOF
+}
+
+pkg_preinst() {
+	# preserve old files
+	local f
+	for f in /etc/sgml/{catalog,sgml-docbook.cat}; do
+		if [[ -s ${EROOT}${f} ]]; then
+			cp "${EROOT}${f}" "${ED}${f}" || die
+		fi
+	done
+
+	# and back them up in case postrm killed them
+	for f in sgml-ent.cat sgml-docbook.cat; do
+		cp "${ED}/etc/sgml/${f}" "${T}" || die
+	done
+}
+
+pkg_postinst() {
+	# restore backed up files if necessary
+	for f in sgml-ent.cat sgml-docbook.cat; do
+		if [[ ! -s ${EROOT}/etc/sgml/${f} ]]; then
+			cp "${T}/${f}" "${EROOT}"/etc/sgml/ || die
+		fi
+	done
+
+	# re-append sgml-ent.cat if necessary
+	if ! grep -q -s sgml-ent.cat "${EROOT}/etc/sgml/sgml-docbook.cat"; then
+		ebegin "Adding sgml-ent.cat to /etc/sgml/sgml-docbook.cat"
+		cat >> "${EROOT}/etc/sgml/sgml-docbook.cat" <<-EOF
+			CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
+		EOF
+		eend
+	fi
+
+	sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		ebegin "Removing sgml-ent.cat from /etc/sgml/sgml-docbook.cat"
+		sed -i -e '/sgml-ent\.cat/d' \
+			"${EROOT}"/etc/sgml/sgml-docbook.cat
+		eend
+		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
+			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
+		fi
+	fi
+
+	sgml-catalog-r1_pkg_postrm
+}


             reply	other threads:[~2019-09-11 17:58 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-11 17:58 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-08  9:09 [gentoo-commits] repo/gentoo:master commit in: app-text/sgml-common/ Ulrich Müller
2021-01-06 13:46 Fabian Groffen
2020-12-27 14:01 Fabian Groffen
2019-12-22  8:28 Michał Górny
2019-11-08 21:13 Michał Górny
2019-11-08 21:13 Michał Górny
2019-10-16 20:46 Sergei Trofimovich
2019-10-16 12:42 Aaron Bauman
2019-10-14 11:31 Agostino Sarubbo
2019-10-14 11:25 Agostino Sarubbo
2019-10-14 11:07 Agostino Sarubbo
2019-10-12  8:55 Mikle Kolyada
2019-10-12  8:55 Mikle Kolyada
2019-10-12  8:55 Mikle Kolyada
2019-09-17  7:12 Michał Górny
2019-09-11 17:58 Michał Górny
2019-05-04 14:43 Andreas K. Hüttel
2018-01-02 23:06 Mikle Kolyada
2018-01-02 23:05 Mikle Kolyada
2017-01-29 15:24 Fabian Groffen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1568224637.ee43e4381d4f125f90e678ab339117c16ecda3db.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox