From e431dcc461b9eb1d324319af9272ab84e4c88f3d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 17 Jul 2013 22:07:42 -0400 Subject: [PATCH] bump(app-text/sgml-common): sync with upstream --- .../app-text/sgml-common/ChangeLog | 248 ++++++++++++++++++ .../app-text/sgml-common/Manifest | 17 +- .../sgml-common-0.6.3-configure.in.patch | 13 - .../sgml-common-0.6.3-install-catalog.in | 42 +-- .../files/sgml-common-0.6.3-man_MANS.patch | 7 - .../files/sgml-common-0.6.3-prefix.patch | 17 ++ .../app-text/sgml-common/metadata.xml | 5 + .../sgml-common/sgml-common-0.6.3-r5.ebuild | 64 ++--- 8 files changed, 341 insertions(+), 72 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/app-text/sgml-common/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-text/sgml-common/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/ChangeLog b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/ChangeLog new file mode 100644 index 0000000000..af805be8c7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/ChangeLog @@ -0,0 +1,248 @@ +# ChangeLog for app-text/sgml-common +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/ChangeLog,v 1.60 2013/02/17 20:39:27 zmedico Exp $ + + 17 Feb 2013; Zac Medico sgml-common-0.6.3-r5.ebuild: + Add ~arm-linux keyword. + + 03 Jan 2013; Mike Gilbert + -files/sgml-common-0.6.3-configure.in.patch, + -files/sgml-common-0.6.3-htmldir.patch, + -files/sgml-common-0.6.3-man_MANS.patch, sgml-common-0.6.3-r5.ebuild: + Repackage build system and eliminate eautoreconf to work around bug 443074. + + 26 Apr 2012; Alexis Ballier + sgml-common-0.6.3-r5.ebuild: + keyword ~amd64-fbsd + + 27 Mar 2012; Mike Gilbert + +files/sgml-common-0.6.3-htmldir.patch, sgml-common-0.6.3-r5.ebuild: + Install html in the right place. Bug 295115. + + 03 May 2011; Fabian Groffen sgml-common-0.6.3-r5.ebuild: + Marked ~x64-freebsd + + 13 Feb 2011; Fabian Groffen sgml-common-0.6.3-r5.ebuild: + Marked ~sparc64-solaris + + 18 Aug 2010; Fabian Groffen + sgml-common-0.6.3-r5.ebuild: + Marked ~m68k-mint, bug #333209 + + 06 Apr 2010; Jonathan Callen + sgml-common-0.6.3-r5.ebuild, files/sgml-common-0.6.3-install-catalog.in, + +files/sgml-common-0.6.3-prefix.patch: + Bump to EAPI=3, add prefix keywords, more quoting + + 19 Jul 2009; Samuli Suominen + sgml-common-0.6.3-r5.ebuild, +files/sgml-common-0.6.3-man_MANS.patch: + Remove WANT_AUTOCONF and WANT_AUTOMAKE vars; patch Makefile.am to support + latest automake. + + 08 Sep 2007; Christoph Mende + sgml-common-0.6.3-r5.ebuild: + Stable on amd64 wrt bug #182385 + + 27 Aug 2007; Raúl Porcel + sgml-common-0.6.3-r5.ebuild: + alpha/ia64 stable wrt #182385 + + 24 Aug 2007; Markus Rothe + sgml-common-0.6.3-r5.ebuild: + Stable on ppc64; bug #182385 + + 21 Aug 2007; Markus Ullmann + sgml-common-0.6.3-r5.ebuild: + Stable on x86 wrt bug #182385 + + 20 Aug 2007; Jeroen Roovers sgml-common-0.6.3-r5.ebuild: + Stable for HPPA (bug #182385). + + 18 Aug 2007; nixnut sgml-common-0.6.3-r5.ebuild: + Stable on ppc wrt bug 182385 + + 16 Aug 2007; Gustavo Zacarias + sgml-common-0.6.3-r5.ebuild: + Stable on sparc wrt #182385 + + 12 Mar 2007; Leonardo Boshell metadata.xml: + Replacing text-markup herd with the new sgml herd. + + 14 Nov 2006; Leonardo Boshell + sgml-common-0.6.3-r4.ebuild, sgml-common-0.6.3-r5.ebuild: + Add WANT_AUTOCONF declaration to -r4 as well (bug #153846). + + 03 Nov 2006; Leonardo Boshell + sgml-common-0.6.3-r5.ebuild: + Make sure autoconf 2.1* is required (bug #153846). + + 30 Oct 2006; Peter Volkov sgml-common-0.6.3-r4.ebuild, + sgml-common-0.6.3-r5.ebuild: + Depend on autoools eclass in stable version. Raised automake depend version + to 1.5. Removed automake from DEPEND as autotools eclass takes care about + this. Fixed bug #148273. Thank Ross and many others for report. + + 24 Oct 2006; Roy Marples + sgml-common-0.6.3-r5.ebuild: + Added ~sparc-fbsd keyword. + + 07 Oct 2006; Alexandre Buisse + sgml-common-0.6.3-r5.ebuild: + Force automake-1.4 (bug #148273) by setting WANT_AUTOMAKE at the right + place. + + 09 May 2006; Leonardo Boshell + sgml-common-0.6.3-r5.ebuild: + Set WANT_AUTOMAKE. + + 27 Apr 2006; Marien Zwart Manifest: + Fixing SHA256 digest, pass four + + 25 Apr 2006; Fabian Groffen + sgml-common-0.6.3-r5.ebuild: + Removed ~ppc-macos as it doesn't eautoreconf (bug #131248) + + 05 Apr 2006; Diego Pettenò + files/sgml-common-0.6.3-install-catalog.in, sgml-common-0.6.3-r5.ebuild: + Change the installer script to use /bin/bash instead of /bin/sh as it uses + bash-specific syntax, and mark ~x86-fbsd. + + 26 Mar 2006; Alexandre Buisse + sgml-common-0.6.3-r5.ebuild: + Suppress a \n in KEYWORDS :/ + +*sgml-common-0.6.3-r5 (26 Mar 2006) + + 26 Mar 2006; Alexandre Buisse + +files/sgml-common-0.6.3-configure.in.patch, + +files/sgml-common-0.6.3-install-catalog.in, + -files/sgml-common-0.6.3-r4-install-catalog.in, + sgml-common-0.6.3-r4.ebuild, +sgml-common-0.6.3-r5.ebuild: + Install doc in /usr/share/doc instead of /usr/doc. Thanks to Andrew + Kirilenko for the report and Christan Heim for the patch. + + 14 Jan 2006; Leonardo Boshell + files/sgml-common-0.6.3-r4-install-catalog.in, + sgml-common-0.6.3-r4.ebuild: + Modified ebuild and install-catalog script to handle $ROOT values different + than "/". See bug #114946. + + 02 Jan 2005; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 18 Sep 2004; Michael Sterrett + sgml-common-0.6.3-r4.ebuild: + cleaned up src_unpack (bug #63838); cleaned up src_install + + 10 Sep 2004; Hasan Khalil sgml-common=0.6.3-r4.ebuild: + stable on macos + + 28 Jun 2004; Tom Gall sgml-common-0.6.3-r4.ebuild: + stable on ppc64 bug #54792 + + 13 May 2004; Bryan Østergaard + sgml-common-0.6.3-r4.ebuild: + Stable on alpha. + + 28 Apr 2004; Jon Portnoy sgml-common-0.6.3-r4.ebuild : + Stable on AMD64. + + 28 Apr 2004; Guy Martin sgml-common-0.6.3-r4.ebuild: + Marked stable on hppa. + + 27 Apr 2004; Gustavo Zacarias + sgml-common-0.6.3-r4.ebuild: + Stable on sparc + + 26 Apr 2004; Mike Gardiner sgml-common-0.6.3-r3.ebuild, + sgml-common-0.6.3-r4.ebuild: + This has been ~x86 for way too long, for no reason. Marked -r4 x86 now. Fixed + S= in -r3 for fun + + 15 Apr 2004; Michael McCabe + sgml-common-0.6.3-r4.ebuild: + adding s390 keywords + + 21 Mar 2004; Joshua Kinard sgml-common-0.6.3-r4.ebuild: + Marked Stable on mips. + + 04 Mar 2004; Joshua Kinard sgml-common-0.6.3-r4.ebuild: + Added ~mips to KEYWORDS to satisfy repoman deps. + + 23 Sep 2003; Bartosch Pixa + sgml-common-0.6.3-r4.ebuild: + set ppc in keywords + + 13 Sep 2003; Mike Gardiner sgml-common-0.6.3-r1.ebuild, + sgml-common-0.6.3.ebuild: + Removed older versions + + 13 Sep 2003; Mike Gardiner metadata.xml, + sgml-common-0.6.3-r3.ebuild, sgml-common-0.6.3-r4.ebuild: + Added automake to depends, see bug #23080 + + 10 Feb 2003; Guy Martin : + Added hppa to keywords. + +*sgml-common-0.6.3-r4 (05 Feb 2003) + + 05 Feb 2003; Matthew Turk : + Revision bump. Now the install-catalog program puts quotations around the + catalog files, thus fixing sgmltools-lite. Masking in package.mask and + ~arch. Also included a script to convert the catalogs into the proper + format, with quotation marks. In response to bug 12792. + +*sgml-common-0.6.3-r3 (30 Dec 2002) + + 30 Dec 2002; Matthew Turk : + Changed the echo's around a bit, other misc bits. Warrants a revision bump + just to make sure it gets caught with all the other SGML changes. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*sgml-common-0.6.3-r2 (12 Sep 2002) + 12 Sep 2002; satai sgml-common-0.6.3-r2.ebuild : + Added more robust file checking. + +*sgml-common-0.6.3-r2 (12 Jul 2002) + + 2 Aug 2002; phoen][x sgml-common-0.6.3.ebuild : + Added LICENSE, SLOT. + + 2 Aug 2002; phoen][x sgml-common-0.6.3-r2.ebuild : + Added LICENSE, SLOT. + + 15 Jul 2002; Owen Stampflee : + + Added KEYWORDS. + + 12 Jul 2002; Seemant Kulleen : + + bumped revision so as to force a remerge. + +*sgml-common-0.6.3-r1 (30 Jun 2002) + + 2 Aug 2002; phoen][x sgml-common-0.6.3-r1.ebuild : + Added LICENSE, SLOT. + 30 Jun 2002; Martin Schlemmer : + Fix pkg_postrm() and pkg_prerm() to actually work. + +*sgml-common-0.6.3 (08 May 2002) + 08 May 2002; Spider sgml-common-0.6.3.ebuild: + the old version was removed from the server, responding to bug on irc. + +*sgml-common-0.6.1-r1 (31 Mar 2002) + + 31 Mar 2002; Seemant Kulleen sgml-common-0.6.1-r1.ebuild: + + Cleaned up ebuild. + +*sgml-common-0.6.1 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/Manifest b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/Manifest index 68c0e19b51..0bbff50c71 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/Manifest @@ -1 +1,16 @@ -DIST sgml-common-0.6.3.tgz 76783 RMD160 246d01272f70cd8382a7d596392e61d7dc0eec78 SHA1 b7d211c19b83accb92dcb51719de65227fb4c27c SHA256 7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX sgml-common-0.6.3-install-catalog.in 5064 SHA256 dffad899948ae7177b33e1c3132f9b7c6ea9e3f5a6d1e34b9334b91e54cc5fa6 SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9 WHIRLPOOL a25ad29a334b38d794e52ac5a04232d319ffa109d3130e2d9a89868548090a1001c512c75bd67f9335fd6d0a898bae673692106238e7ebe1a876d3dd45717e2f +AUX sgml-common-0.6.3-prefix.patch 658 SHA256 6926c44655ddd713276cc26d777d39b56b3cc740e55bbc2c543daad21359bee3 SHA512 25e02afb59be7c056577169a5c644a2fa6800bf07c5876fac3f9ad6b3094ee186b1864f59ae2fcbb99acb7f0d6e0d32f8daeb2aeec16f8f2f98d43b3e890ef7d WHIRLPOOL f7b7ee85138b5e7f89f7fb88653d416dcf534530535aec3fb3fe84fd51e49d84b0745f529f412faf29bc7d2b000331d214a6952ad71833c4d0b08be7119052da +DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772 +EBUILD sgml-common-0.6.3-r5.ebuild 2613 SHA256 a5bd50beda3f73c4f70a61143807310d900a33b4b3b80b0696a86726f7032453 SHA512 33218e9c6ea4025df70ea361aa01ebf9e319912b4cf92aa766e5be3f3fee3ca230242ae69566cec0521405ebe36ed7d4c0f960f74b5f7a08cd0f99ec8a93f1fe WHIRLPOOL e985a3bbef1dd88feb1f25e9c1f32424c700dec21a56304d971fcae3d899a91f0993d52b8a62a2cbd47f3d36109efacac97af4ce5219a0e9ee978100234abe8e +MISC ChangeLog 8988 SHA256 76ac00cf65c114524a06b1e74c0cbb796cac0b17315cfc69c42aed546e3b6fdc SHA512 61c400e116d421f580d9775ae77461a6617e7fafbe78b07f3fa1566f2cc3d9c2e627f404dfe7e2c8e4d85c5ec69d793205c4314e666bf5d87110157bced75d1b WHIRLPOOL 20df62f1283fe98b22ab1d0d43c89e7703df8fb82ca8de33af26a723d934bb860cd81109710603765984132fb2cd40e760b7abeee24938d03437c9e53d335cc9 +MISC metadata.xml 159 SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3 SHA512 119d9e98ba4d956ad7811e557e8013b976337b14029b994bfa4eb08ba24cfe6ae7757a814a02c0526246b3c77ce1eb55b81681731863a10b72436dbe47e693d2 WHIRLPOOL a6d40a902f676b47e088ee88d7149fa3c2d6e8ac1117a265e083196abdb95483f506974afbdcfdcb3e6a14a85d4726ba2876d7cfb90efa8586a3d1581f30274b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREIAAYFAlEhQAEACgkQ/ejvha5XGaNUJACfYKAzUhHB+O0k2FGMa4DU4bTk +YzYAoOWryfjSbPkuJ9Z5UZGuYhGhOcBH +=cAVH +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch deleted file mode 100644 index 85e25031b5..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-configure.in.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: sgml-common-0.6.3/configure.in -=================================================================== ---- sgml-common-0.6.3.orig/configure.in -+++ sgml-common-0.6.3/configure.in -@@ -3,7 +3,7 @@ AC_INIT(Makefile.am) - - AM_INIT_AUTOMAKE(sgml-common, 0.6.3) - --docdir='$(prefix)/doc' -+docdir='$(prefix)/share/doc' - AC_SUBST(docdir) - - dnl Checks for programs. diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in index 3102ae8a7e..bd26166906 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@GENTOO_PORTAGE_EPREFIX@/bin/bash # Script to install a catalog in the centralized SGML catalog # Send any comments to Eric Bischoff # This program is under GPL license. See LICENSE file for details. @@ -32,6 +32,8 @@ SGML_ORDINARY="" # Default ROOT value (usually defined by portage) [ -z "$ROOT" ] && ROOT="/" [[ $ROOT == */ ]] || ROOT="${ROOT}/" +EPREFIX="@GENTOO_PORTAGE_EPREFIX@" +EROOT=${ROOT%/}${EPREFIX}/ # Process options @@ -79,23 +81,23 @@ SGML_ROOT_ORDINARY="${ROOT%/}${SGML_ORDINARY}" # Check that the super catalog can be created and changed and deleted -if [ ! -w ${ROOT}etc/sgml ] +if [ ! -w "${EROOT}etc/sgml" ] then - echo "`basename $0`: unable to write in ${ROOT}etc/sgml." >&2 + echo "`basename $0`: unable to write in ${EROOT}etc/sgml." >&2 exit 2 fi case $SGML_ACTION in addition) - if [ -e ${ROOT}etc/sgml/catalog -a ! -w ${ROOT}etc/sgml/catalog ] + if [ -e "${EROOT}etc/sgml/catalog" -a ! -w "${EROOT}etc/sgml/catalog" ] then - echo "`basename $0`: can not modify \"${ROOT}etc/sgml/catalog\"." >&2 + echo "`basename $0`: can not modify \"${EROOT}etc/sgml/catalog\"." >&2 exit 2 fi ;; removal) - if [ ! -w ${ROOT}etc/sgml/catalog ] + if [ ! -w "${EROOT}etc/sgml/catalog" ] then - echo "`basename $0`: can not modify \"${ROOT}etc/sgml/catalog\"." >&2 + echo "`basename $0`: can not modify \"${EROOT}etc/sgml/catalog\"." >&2 exit 2 fi ;; @@ -132,7 +134,7 @@ then fi case $SGML_ACTION in addition) - if [ ! -s $SGML_ROOT_ORDINARY ] + if [ ! -s "$SGML_ROOT_ORDINARY" ] then echo "`basename $0`: \"$SGML_ROOT_ORDINARY\" does not exist or is empty." >&2 exit 2 @@ -144,35 +146,35 @@ esac case $SGML_ACTION in addition) echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED" - if grep -q $SGML_ORDINARY $SGML_ROOT_CENTRALIZED 2>/dev/null + if grep -q "$SGML_ORDINARY" "$SGML_ROOT_CENTRALIZED" 2>/dev/null then echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2 else - echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> $SGML_ROOT_CENTRALIZED + echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_ROOT_CENTRALIZED" fi - grep -q $SGML_CENTRALIZED ${ROOT}etc/sgml/catalog 2>/dev/null + grep -q "$SGML_CENTRALIZED" "${EROOT}etc/sgml/catalog" 2>/dev/null if [ $? -ne 0 ] then - echo "`basename $0`: addition of $SGML_CENTRALIZED in ${ROOT}etc/sgml/catalog" - echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> ${ROOT}etc/sgml/catalog + echo "`basename $0`: addition of $SGML_CENTRALIZED in ${EROOT}etc/sgml/catalog" + echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> "${EROOT}etc/sgml/catalog" fi ;; removal) echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED" - if grep -q $SGML_ORDINARY $SGML_ROOT_CENTRALIZED 2>/dev/null + if grep -q "$SGML_ORDINARY" "$SGML_ROOT_CENTRALIZED" 2>/dev/null then sed -e "\:$SGML_POINTER \"$SGML_ORDINARY\":d" < \ - $SGML_ROOT_CENTRALIZED > ${SGML_ROOT_CENTRALIZED}.new - mv ${SGML_ROOT_CENTRALIZED}.new $SGML_ROOT_CENTRALIZED + "$SGML_ROOT_CENTRALIZED" > "${SGML_ROOT_CENTRALIZED}.new" + mv "${SGML_ROOT_CENTRALIZED}.new" "$SGML_ROOT_CENTRALIZED" else echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2 fi if [ ! -s "$SGML_ROOT_CENTRALIZED" ] then - rm $SGML_ROOT_CENTRALIZED - echo "`basename $0`: removal of $SGML_CENTRALIZED from ${ROOT}etc/sgml/catalog" - sed -e "\:$SGML_POINTER \"$SGML_CENTRALIZED\":d" < ${ROOT}etc/sgml/catalog > ${ROOT}etc/sgml/catalog.new - mv ${ROOT}etc/sgml/catalog.new ${ROOT}etc/sgml/catalog + rm "$SGML_ROOT_CENTRALIZED" + echo "`basename $0`: removal of $SGML_CENTRALIZED from ${EROOT}etc/sgml/catalog" + sed -e "\:$SGML_POINTER \"$SGML_CENTRALIZED\":d" < "${EROOT}etc/sgml/catalog" > "${EROOT}etc/sgml/catalog.new" + mv "${EROOT}etc/sgml/catalog.new" "${EROOT}etc/sgml/catalog" fi ;; esac diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch deleted file mode 100644 index 21efb02552..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-man_MANS.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff -ur sgml-common-0.6.3.orig/doc/man/Makefile.am sgml-common-0.6.3/doc/man/Makefile.am ---- sgml-common-0.6.3.orig/doc/man/Makefile.am 2001-01-30 16:42:22.000000000 +0200 -+++ sgml-common-0.6.3/doc/man/Makefile.am 2009-07-19 14:09:48.000000000 +0300 -@@ -1,2 +1 @@ --man8dir = $(mandir)/man8 --man8_DATA = *.8 -+man_MANS = *.8 diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch new file mode 100644 index 0000000000..bfca708799 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch @@ -0,0 +1,17 @@ +--- bin/sgmlwhich~ 2007-10-08 04:21:25 +0200 ++++ bin/sgmlwhich 2007-10-08 04:21:36 +0200 +@@ -3,5 +3,5 @@ + # Send any comments to Eric Bischoff + # This program is under GPL license. See LICENSE file for details. + +-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 +@@ -1,3 +1,3 @@ + # /etc/sgml/sgml.conf conformant with LSB +-SGML_BASE_DIR=/usr/share/sgml +-SGML_CATALOGS_DIR=/etc/sgml ++SGML_BASE_DIR=@GENTOO_PORTAGE_EPREFIX@/usr/share/sgml ++SGML_CATALOGS_DIR=@GENTOO_PORTAGE_EPREFIX@/etc/sgml diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/metadata.xml b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/metadata.xml new file mode 100644 index 0000000000..e960864773 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/metadata.xml @@ -0,0 +1,5 @@ + + + + sgml + diff --git a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild index 538b959d92..409eb14094 100644 --- a/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild @@ -1,33 +1,35 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.19 2009/07/19 11:18:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild,v 1.27 2013/02/17 20:39:27 zmedico Exp $ -inherit autotools eutils +EAPI="3" + +inherit eutils prefix DESCRIPTION="Base ISO character entities and utilities for SGML" HOMEPAGE="http://www.iso.ch/cate/3524030.html" -SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz" +#SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz" +SRC_URI="http://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" -RDEPEND="" DEPEND="" +RDEPEND="" -src_unpack() { - unpack ${A} - +src_prepare() { # We use a hacked version of install-catalog that supports the ROOT - # variable, and puts quotes around the CATALOG files. + # variable, puts quotes around the CATALOG files, and can be prefixed. cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" - cd "${S}" - epatch "${FILESDIR}"/${P}-configure.in.patch - epatch "${FILESDIR}"/${P}-man_MANS.patch + epatch "${FILESDIR}"/${P}-prefix.patch + eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf +} - eautoreconf +src_configure() { + econf --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" } src_install() { @@ -35,22 +37,22 @@ src_install() { } pkg_postinst() { - local installer="${ROOT}usr/bin/install-catalog" - if [ ! -x "${installer}" ]; then + local installer="${EROOT}usr/bin/install-catalog" + if [[ ! -x ${installer} ]]; then eerror "install-catalog not found! Something went wrong!" - die + die "install-catalog not found! Something went wrong!" fi einfo "Installing Catalogs..." - $installer --add \ - /etc/sgml/sgml-ent.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog - $installer --add \ - /etc/sgml/sgml-docbook.cat \ - /etc/sgml/sgml-ent.cat + "$installer" --add \ + "${EPREFIX}"/etc/sgml/sgml-ent.cat \ + "${EPREFIX}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog + "$installer" --add \ + "${EPREFIX}"/etc/sgml/sgml-docbook.cat \ + "${EPREFIX}"/etc/sgml/sgml-ent.cat local file - for file in `find "${ROOT}etc/sgml/" -name "*.cat"` "${ROOT}etc/sgml/catalog" + for file in `find "${EROOT}etc/sgml/" -name "*.cat"` "${EROOT}etc/sgml/catalog" do einfo "Fixing ${file}" awk '/"$/ { print $1 " " $2 } @@ -60,7 +62,7 @@ pkg_postinst() { } pkg_prerm() { - cp "${ROOT}usr/bin/install-catalog" "${T}" + cp "${EROOT}usr/bin/install-catalog" "${T}" } pkg_postrm() { @@ -69,15 +71,15 @@ pkg_postrm() { fi einfo "Removing Catalogs..." - if [ -e "${ROOT}etc/sgml/sgml-ent.cat" ]; then + if [ -e "${EROOT}etc/sgml/sgml-ent.cat" ]; then "${T}"/install-catalog --remove \ - /etc/sgml/sgml-ent.cat \ - /usr/share/sgml/sgml-iso-entities-8879.1986/catalog + "${EPREFIX}"/etc/sgml/sgml-ent.cat \ + "${EPREFIX}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog fi - if [ -e "${ROOT}etc/sgml/sgml-docbook.cat" ]; then + if [ -e "${EROOT}etc/sgml/sgml-docbook.cat" ]; then "${T}"/install-catalog --remove \ - /etc/sgml/sgml-docbook.cat \ - /etc/sgml/sgml-ent.cat + "${EPREFIX}"/etc/sgml/sgml-docbook.cat \ + "${EPREFIX}"/etc/sgml/sgml-ent.cat fi }