added prefix support

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 92 insertions, 5 deletions

diff --git a/app-text/build-docbook-catalog/ChangeLog b/app-text/build-docbook-catalog/ChangeLog
index c7aef2809c23..14f0a09616d5 100644
--- a/app-text/build-docbook-catalog/ChangeLog
+++ b/app-text/build-docbook-catalog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/build-docbook-catalog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/ChangeLog,v 1.40 2013/07/21 09:57:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/ChangeLog,v 1.41 2013/09/11 20:02:23 ottxor Exp $
+
+*build-docbook-catalog-1.19.1-r1 (11 Sep 2013)
+
+  11 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
+  +build-docbook-catalog-1.19.1-r1.ebuild,
+  +files/build-docbook-catalog-1.19.1-no-flock.patch:
+  added prefix support
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due http://gentoo.2317880.n4.nabble.com/sgml-herd-has-no-maintainers-
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 083810d7aba6..9ab7bcab6ca6 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,14 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX build-docbook-catalog-1.19.1-no-flock.patch 889 SHA256 e2f8b79bbfe03e310508d6f300382530bab95adcfdef8fe1a88593868c3265a0 SHA512 5909e416520e74509001e2ee592699c2163646246cdcefb592be831381c25b3dda3dc0cc0605fee5633bb225a7e17419896601ba33628c8856eecf73e450c812 WHIRLPOOL 8bc2eb13e4051e02e7701e802483139341cf6dec65d080df68f6870e926edd9d156c75ac19fcf08215d3f1448bfdd6d1ffba34cfb661a5e015a7f6dc62d15a4d
 DIST build-docbook-catalog-1.19.1.tar.xz 4552 SHA256 78c3c6f2e4703d5fd7f24bc737777fadfd52a0d2f7bf4bbdc217cb927721a149 SHA512 9c4b1a30d8b2f820046cf987296035a1418fa55f47c2adc6702cdaa3a01efc8584bdc6804889cf13a85bb1f30b129af5c62ecf8a7376d56d0738f717619ddcc3 WHIRLPOOL c219b126a570ba42e6ed78ccfe8fa581f929bd6562332d2722c33f167831841ffc32e3a919342af6f38c1babeeb6e42172da7c580046a692eae5777f630c2e57
+EBUILD build-docbook-catalog-1.19.1-r1.ebuild 1562 SHA256 8088de5df99190c94c98a873c1dc914766e6567904b0472e955125e937eec9c6 SHA512 d20b76343b936e0660afec3391daca237159c3a6fc92c7b838ae7855833ca7f0aed37546cba699299df6285d6ab808fb80e2e870f889f4cf396f244b53639cb9 WHIRLPOOL d247fb433e11456212cd5fd1947b4fd9bc74707162951a3a372094849dd7b4145f48c0b6f16fac4b86aefcc9078a9d0af8ddccee26900d2447b5dc37957bd48c
 EBUILD build-docbook-catalog-1.19.1.ebuild 907 SHA256 8bf98f77254c6e50b2b9a9928ae528719ab5862c9dab7152821d4c424b9c2da2 SHA512 e7e686ad48d61b98f8cf2332a2cf696747f7cd345c71aabb239f3db7f08b9c572193c9cfe8f229f0892e2760497c47c0f737aabef9ed7829f08ff12ddbab616e WHIRLPOOL c4869d8222183c5f8f6c9b18d28a0c4e0d2dff726f083b59f7da0f195aa2a9be372b0ef98514df86cf72b79ef49ba13509798bf45934f12ec8431ba3c1f0dd85
-MISC ChangeLog 5956 SHA256 436e644e215bdfe176449c84c562e19cae00978caa36a61ab138d2aa2c7fa78d SHA512 dffd4be4c23186b7fbdfc067d74a69e7f23c942b9b9c7b32044a093ef5f0d5a0ab7a89e8e3a8f027936319f40ac53def282c9eafc87a239a832cd5c615675bf2 WHIRLPOOL 209c097f351da32592e9208a52eb9db0dd8e6d8139677e8493eb9ca5911748fb2ab78a41c9fc0e52a1384f7065baf6350fbd142a2776b065e5422fc1e2a9da4f
+MISC ChangeLog 6180 SHA256 5f93d60d0af81e792c484469977b35429740e0b0ca650bff492ca9eee1222a52 SHA512 f18b676ece32bbf4fcbe32e8b0cf390ec546e782e31019c5fca3bd82261d530479ff3a2994a5826164ed0f3bc0cb9e71654685abf43fe278b967159cbc986e76 WHIRLPOOL 8d94b30da827e02fd34ca23f32273d7630b5f9a1493dcd5a7b661dec41b20835ea173bc98cf3428f86e98dd0fe027103725753b1379ff68a988546d679456d1a
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHrsJEACgkQCaWpQKGI+9RoFgCfeIdrb7YMkGU0/gLtNeUxqclE
-AOcAn15xuCxCsGBehfkmPtXA8e7hszjX
-=+xwG
+iQEcBAEBCAAGBQJSMMxQAAoJEOeBhlrCAAWG5xIH/Rj3HEyKOwcHdtMGu25g2eqL
+/EkJY7fdNc1lC7wYA7xQU4WnAF3y8qdEUSjZmkBv+8XaZtTFOxVI1kBK2IGf5NEw
+qrzWfKB0k4XUQdD5jnkkKZDOm23pEpQeA4Zv96hlvfI244C+kGrDORxEHc14l3Pk
+FNcjeBJcpLMTmObKihdjUIuunHIVbGOEx6Sw5utNARaHKMiithGifOnFptMKOEfa
+KqDi7MR0+Wql/FCVvYDuV+6oav3YEzafp9t1cHvlWpWAUlmkDaZVvKOOsDi2DgCE
+XG89beX6a/YfhnzxU6kjQpmuw+frDD1TFhAvJOIFta+9ZcyIuQDle8BX9O5kYxg=
+=eOZa
 -----END PGP SIGNATURE-----
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1-r1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1-r1.ebuild
new file mode 100644
index 000000000000..4e0958e3a46a
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1-r1.ebuild,v 1.1 2013/09/11 20:02:23 ottxor Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="http://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	http://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="userland_BSD kernel_linux"
+
+RDEPEND="kernel_linux? ( sys-apps/util-linux )
+	!kernel_linux? ( app-misc/getopt )
+	!<app-text/docbook-xsl-stylesheets-1.73.1
+	userland_BSD? ( sys-apps/flock )
+	dev-libs/libxml2"
+DEPEND=""
+
+src_prepare() {
+	if use prefix ; then
+		sed -i -e "/^\(ROOTCONFDIR\|DOCBOOKDIR\)=/s:=/:=${EPREFIX}/:" build-docbook-catalog || die
+		sed -i -e "/^\(SYSCONFDIR\|PREFIX\) = /s:= /:= ${EPREFIX}/:" Makefile || die
+		if use !kernel_linux ; then
+			sed -i -e '/opts=/s/getopt/getopt-long/' build-docbook-catalog || die
+		fi
+		epatch "${FILESDIR}"/${P}-no-flock.patch  # obsoletes flock requirement
+	fi
+}
+
+pkg_postinst() {
+	# New version -> regen files
+	build-docbook-catalog
+}
diff --git a/app-text/build-docbook-catalog/files/build-docbook-catalog-1.19.1-no-flock.patch b/app-text/build-docbook-catalog/files/build-docbook-catalog-1.19.1-no-flock.patch
new file mode 100644
index 000000000000..48f054e57a07
--- /dev/null
+++ b/app-text/build-docbook-catalog/files/build-docbook-catalog-1.19.1-no-flock.patch
@@ -0,0 +1,33 @@
+build-docbook-catalog: avoid usage of non-portable flock
+
+Solaris has no flock(1), hence use shell-provided until instead to
+simulate lock.
+
+--- build-docbook-catalog
++++ build-docbook-catalog
+@@ -65,10 +65,14 @@
+ 		mkdir -p "${ROOT}${ROOTCONFDIR}" || error "could not create ${ROOTCONFDIR}"
+ 	fi
+ 
++	local lock="${ROOT}${ROOTCONFDIR}"/build-docbook-catalog-lock
+ 	(
+ 	# Lock the dir to avoid trashing other runs that might
+ 	# be running parallel.
+-	flock 123 || error "unable to lock ${ROOTCONFDIR}"
++	touch "${lock}".$$ && \
++		until ln "${lock}".$$ "${lock}" 2>/dev/null; do sleep 1; done && \
++		rm "${lock}".$$
++	[[ -f ${lock}.$$ ]] && error "unable to lock ${ROOTCONFDIR}"
+ 
+ 	create_catalogs			# will exit on error
+ 	for type in xsl xsl-ns xsl-saxon xsl-xalan; do
+@@ -90,7 +94,8 @@
+ 		populate_entities
+ 	fi
+ 
+-	) 123>"${ROOT}${ROOTCONFDIR}/.keep"
++	)
++	rm "${lock}"
+ 
+ 	exit 0
+ }