Use getopt-long on non-linux systems (bug #409811, thanks to Stuart Shelton, Fabian Groffen, Naohiro Aota).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 61 insertions, 2 deletions

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index 0ab0ce26842a..9c17c4f08581 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/rarian
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.54 2012/04/30 19:04:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.55 2012/08/08 18:32:12 tetromino Exp $
+
+*rarian-0.8.1-r2 (08 Aug 2012)
+
+  08 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +rarian-0.8.1-r2.ebuild:
+  Use getopt-long on non-linux systems (bug #409811, thanks to Stuart Shelton,
+  Fabian Groffen, Naohiro Aota).
 
   30 Apr 2012; Fabian Groffen <grobian@gentoo.org> rarian-0.8.1-r1.ebuild:
   Fix for Prefix, add Prefix keywords
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index e143a960a8c6..3d57811f631b 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,5 +1,6 @@
 AUX rarian-0.8.1-fix-old-doc.patch 629 SHA256 2ac6f3d6df8f221fa36fbe4a86ee9a9c6d4d8a829d58d1d85afff1c9b959ad65 SHA512 7847e99bafccef02f2a153dea2c504ed69a2c2a19fd68496003f5ddb19c5316da03ea61711605b25fee07a04d522a99bc84c128a5a69e6c5e66a468d03b689d5 WHIRLPOOL bd62c4e33a0d1ca27dba1e440f55d205ac34cd75891bf9e2e8f15fcb73e155b56a2c44b57375885e8d0a1294cfb8f5b15e13bde918f8a0cb6bf71671683a4293
 DIST rarian-0.8.1.tar.gz 459461 SHA256 b410d9581dddfabe93e29f9e235a9f9d04d33d8eb12afd0f5ad3bd238c55adef SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb WHIRLPOOL bd11206a4701e1771ebd5d82123d299c1c3cbb7ecfa6e00654372494d07b8f47cdfc6e88dc8ea6a405acdae0f57b12ae8c927a952f42d55cdab8f1214f0ac237
 EBUILD rarian-0.8.1-r1.ebuild 1216 SHA256 31d22302bac65fd044480705cd1fb20878a18d2c3252f78622c00ad5691eae52 SHA512 38ed92222e23ab2475828421e8a44afacbf378258440f1b868e0a7e3fdeb91885cb8e4b9176f0cf363448e5dfc96c83b81f4ea2915ab3d134621029f8d1a168d WHIRLPOOL ed45a329a29e08915f2792a2581e3548342b9f14a72957c6ff177f77d145599247e8aa706992a207cf814aa1ac1a9eeb0d33bb4e51de2155471bd2b7904e641d
-MISC ChangeLog 6976 SHA256 40e2049bef2f0b3ecad06cc837137db138ef38759ecace283bf3b998df6e995f SHA512 223bbd64f16f8fb985bba32c9747c4d56b05fa7273649c215d26788dbc6155af8a24b4ec484562f10cd3fa31afb224b36de927774a95a3f00b4b0c58be61e6ad WHIRLPOOL af29defa2676ba6db464a41fa5a39dd1a96cab7d1305862a4a1789ff1d6db33a033f4e30f5e7a464d8ffe9752326ecca38d1e9b0f59b25002add709ea1e1d444
+EBUILD rarian-0.8.1-r2.ebuild 1507 SHA256 9427895e525cc6bcb4028cadce87ab0043d70353de6a0c41e772f5c683214e26 SHA512 889aeff1846e3ee7ab135ee0c40a73d9f450cc65c152665ebabf783eca9aa47b9d23bd52674c884a542f46b1d298d1d64986ec748d45ae5bd8d4854f131c64de WHIRLPOOL afdb551873bb47739edd8f6e5346e25850856fe2b3de6295dd6684a98ae1d81431ccf1dfc112d4e3909dfd1daf15e5c8afd699ac2fd661cf4a89b99edcbe0375
+MISC ChangeLog 7209 SHA256 195cc157d6a70744d78c9e03614189edfa861ed7cdde2eb5d9dea4eae137e8a3 SHA512 f59438a107faa7807bd9aa255507500904da7bf95eab49170f9ed09d3d27f602227693e79c63da54df1090fcdd900d0516ba26d57cda0ec6a69070901f707af4 WHIRLPOOL 6f76e3e1026072712d2840e89a7ca25a8a8b1f8bc1c6e27b3be39c39ce325ac97d65cd09e044aa159560528aa5707367a79fde483bc9c31ac1f92179252921ea
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
diff --git a/app-text/rarian/rarian-0.8.1-r2.ebuild b/app-text/rarian/rarian-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..756742ad3d06
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.8.1-r2.ebuild,v 1.1 2012/08/08 18:32:12 tetromino Exp $
+
+EAPI=4
+
+inherit eutils libtool
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="http://rarian.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/Releases/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libxslt
+	|| ( sys-apps/util-linux app-misc/getopt )"
+DEPEND="${RDEPEND}
+	!<app-text/scrollkeeper-9999"
+
+DOCS=( ChangeLog NEWS README )
+
+src_prepare() {
+	# Fix uri of omf files produced by rarian-sk-preinstall, see bug #302900
+	epatch "${FILESDIR}/${P}-fix-old-doc.patch"
+
+	# remove unneeded line, bug #240564
+	sed "s/ (foreign dist-bzip2 dist-gzip)//" -i configure || die "sed failed"
+
+	# bug #409811, https://bugs.freedesktop.org/show_bug.cgi?id=53264
+	# sed to avoid autoreconf
+	if ! has_version sys-apps/util-linux; then
+		sed -e 's/getopt -/getopt-long -/' \
+			-i util/rarian-sk-update.in || die "sed 2 failed"
+	fi
+
+	elibtoolize ${ELTCONF}
+}
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}