[gentoo-commits] proj/hardened-dev:musl commit in: app-text/build-docbook-catalog/files/, app-text/build-docbook-catalog/

[Anthony G. Basile]

commit:     27ea6a6e72afbcf7dbc5238281e313337e91c735
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  3 00:45:01 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 00:45:01 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=27ea6a6e

app-text/build-docbook-catalog: remove getopt long

Package-Manager: portage-2.2.8-r2
Manifest-Sign-Key: 0xF52D4BBA

---
 .../build-docbook-catalog-1.20-r99.ebuild          | 39 ++++++++++++++++++++++
 .../build-docbook-catalog-remove-getopt-long.patch | 12 +++++++
 app-text/build-docbook-catalog/metadata.xml        |  5 +++
 3 files changed, 56 insertions(+)

diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.20-r99.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.20-r99.ebuild
new file mode 100644
index 0000000..2f152dc
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.20-r99.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 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.20.ebuild,v 1.5 2014/02/11 20:25:32 grobian 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="~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
+	!<app-text/docbook-xsl-stylesheets-1.73.1
+	dev-libs/libxml2"
+DEPEND=""
+
+pkg_setup() {
+	# export for bug #490754
+	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+}
+
+src_prepare() {
+	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+	use elibc_musl && epatch "${FILESDIR}"/${PN}-remove-getopt-long.patch
+}
+
+pkg_postinst() {
+	# New version -> regen files
+	build-docbook-catalog
+}

diff --git a/app-text/build-docbook-catalog/files/build-docbook-catalog-remove-getopt-long.patch b/app-text/build-docbook-catalog/files/build-docbook-catalog-remove-getopt-long.patch
new file mode 100644
index 0000000..e2a9cf2
--- /dev/null
+++ b/app-text/build-docbook-catalog/files/build-docbook-catalog-remove-getopt-long.patch
@@ -0,0 +1,12 @@
+diff -Naur build-docbook-catalog-1.20.orig/build-docbook-catalog build-docbook-catalog-1.20/build-docbook-catalog
+--- build-docbook-catalog-1.20.orig/build-docbook-catalog	2014-10-02 20:34:17.215360013 -0400
++++ build-docbook-catalog-1.20/build-docbook-catalog	2014-10-02 20:34:51.161361558 -0400
+@@ -43,7 +43,7 @@
+ main() {
+ 	local d v opts
+ 
+-	opts=$(${GETOPT} -o hr:v --long help,root:,verbose -n "${ZERO}" -- "$@") || exit 1
++	opts=$(${GETOPT} -o hr:v -n "${ZERO}" -- "$@") || exit 1
+ 	eval set -- "${opts}"
+ 	while true; do
+ 		case $1 in

diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
new file mode 100644
index 0000000..4538a68
--- /dev/null
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@g.o</email></maintainer>
+</pkgmetadata>