added prefix support

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 82 insertions, 1 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/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
+ }