Only GNU getopt (userland call) supports long options

Package-Manager: portage-2.1.3.14

4 files changed, 83 insertions, 11 deletions

diff --git a/app-text/rarian/ChangeLog b/app-text/rarian/ChangeLog
index 303b428571c8..975367e63361 100644
--- a/app-text/rarian/ChangeLog
+++ b/app-text/rarian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/rarian
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.3 2007/10/18 13:47:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/ChangeLog,v 1.4 2007/10/18 14:32:41 uberlord Exp $
+
+  18 Oct 2007; Roy Marples <uberlord@gentoo.org>
+  +files/rarian-0.6.0-posix-getopt.patch, rarian-0.6.0.ebuild:
+  Only GNU getopt (userland call) supports long options
 
   18 Oct 2007; Roy Marples <uberlord@gentoo.org> rarian-0.6.0.ebuild:
   Keyworded ~x86-fbsd
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 67f5ecbb1e60..3112b43d25d4 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,12 +1,16 @@
+AUX rarian-0.6.0-posix-getopt.patch 1284 RMD160 6443e95fcdca98b2673cdcb4bfaed0dc3c9b5ea2 SHA1 56286711d1e8a5c074132837bd208b9a5e7085f2 SHA256 374d0340c4241d9759fe538e857e685b1ee85d0a6de6c493da42ce34eb5f4c11
+MD5 9d77f2e6b41cb93522dc9677a029bd58 files/rarian-0.6.0-posix-getopt.patch 1284
+RMD160 6443e95fcdca98b2673cdcb4bfaed0dc3c9b5ea2 files/rarian-0.6.0-posix-getopt.patch 1284
+SHA256 374d0340c4241d9759fe538e857e685b1ee85d0a6de6c493da42ce34eb5f4c11 files/rarian-0.6.0-posix-getopt.patch 1284
 DIST rarian-0.6.0.tar.bz2 312258 RMD160 167c02f58e493c624d0eedb1137928c7a7cc452a SHA1 7bf1fce5cc2bfd4584fb776d20d3a379e888b81a SHA256 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029
-EBUILD rarian-0.6.0.ebuild 665 RMD160 e9c0aa17df37549b27ab387f62c7075b1076af5f SHA1 938fb7ab60a6cf8d970967718b2b15d3340e97bc SHA256 2c7afc44d359e4483d25e54cc928b1228ccccc1cc80079b020234829ff5a1010
-MD5 c8d0de3c0415d2780a1faecd8ea473fc rarian-0.6.0.ebuild 665
-RMD160 e9c0aa17df37549b27ab387f62c7075b1076af5f rarian-0.6.0.ebuild 665
-SHA256 2c7afc44d359e4483d25e54cc928b1228ccccc1cc80079b020234829ff5a1010 rarian-0.6.0.ebuild 665
-MISC ChangeLog 597 RMD160 073dcd2010fdc4d1d0ddc1e45779c4deba5ae101 SHA1 81a344f3df8956cc47f6972c80b794ce42c67d8c SHA256 f659b91499b6cb882be25660181e80e7bf16451c76c8f8837ce982d8785ffe21
-MD5 69d10233a3918c04c3c0aed7b6f14624 ChangeLog 597
-RMD160 073dcd2010fdc4d1d0ddc1e45779c4deba5ae101 ChangeLog 597
-SHA256 f659b91499b6cb882be25660181e80e7bf16451c76c8f8837ce982d8785ffe21 ChangeLog 597
+EBUILD rarian-0.6.0.ebuild 825 RMD160 a5808c9eb88f1b25cb51907a4d6d09c9ece452e2 SHA1 6fa45b08d1e91683adc3d319502aaddf92f8832e SHA256 43db5fb7714ddad62f9038481b2f35f201336204c48ae7786f3b70e13324cc52
+MD5 e4836a5716cc79d84e293d59f03de214 rarian-0.6.0.ebuild 825
+RMD160 a5808c9eb88f1b25cb51907a4d6d09c9ece452e2 rarian-0.6.0.ebuild 825
+SHA256 43db5fb7714ddad62f9038481b2f35f201336204c48ae7786f3b70e13324cc52 rarian-0.6.0.ebuild 825
+MISC ChangeLog 766 RMD160 520fbc46e10a5da5f0ba42130407c09134d921b5 SHA1 48b9918e8f3a2400a9c2b89d056de6197a967550 SHA256 1f579d7d4ca6961f1f62b3c46d37e2384f8dcee6b5f5e8f27facc9b4c25c2b98
+MD5 0fbc4e02af5d052aa6df72971682cae9 ChangeLog 766
+RMD160 520fbc46e10a5da5f0ba42130407c09134d921b5 ChangeLog 766
+SHA256 1f579d7d4ca6961f1f62b3c46d37e2384f8dcee6b5f5e8f27facc9b4c25c2b98 ChangeLog 766
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/app-text/rarian/files/rarian-0.6.0-posix-getopt.patch b/app-text/rarian/files/rarian-0.6.0-posix-getopt.patch
new file mode 100644
index 000000000000..edb55f23fcef
--- /dev/null
+++ b/app-text/rarian/files/rarian-0.6.0-posix-getopt.patch
@@ -0,0 +1,59 @@
+diff -ur a/util/rarian-sk-update.in b/util/rarian-sk-update.in
+--- a/util/rarian-sk-update.in	2007-09-01 18:22:35 +0100
++++ b/util/rarian-sk-update.in	2007-10-18 15:27:42 +0100
+@@ -258,10 +258,7 @@
+ # They are inherited from scrollkeeper :(
+ 
+ # We use TEMP as set -- seems to nuke the return value of getopt
+-TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
+-    --longoptions="clean-index,omf-dir:,resulting-dir:,help,version" -- "$@"` \
+-    || print_usage
+-
++TEMP=`getopt "o:r:p:cvqnhV" "$@"`
+ if [ $? != 0 ] ; then
+ 	print_usage
+ 	exit 0
+@@ -271,12 +268,12 @@
+ 
+ while true; do
+     case "$1" in
+-		-o | --omf-dir )
++		-o )
+ 			convert_dir=$2
+ 			update_output_dir=1
+ 			shift 2
+ 			;;
+-		-r | --result-dir )
++		-r )
+ 			output_dir=$2
+ 			overload_update=1
+ 			shift 2
+@@ -288,7 +285,7 @@
+ 		-q )
+ 			shift
+ 			;;
+-        --clean-index )
++        -c )
+         	clean_index=1
+ 			shift
+             ;;	      
+@@ -299,9 +296,9 @@
+ 			# Scrollkeeper compat.  Actually do nothing
+ 			shift
+ 			;;
+-	        -p )
+-	                statedir=$2
+-	                shift 2
++	    -p )
++	        statedir=$2
++	        shift 2
+ 			;;
+ 		-V | --version )
+ 			print_version
+@@ -416,4 +413,4 @@
+ fi
+ rm -rf $tmpdir
+ 
+-fi # ENABLE_OMF_READ
+\ No newline at end of file
++fi # ENABLE_OMF_READ
diff --git a/app-text/rarian/rarian-0.6.0.ebuild b/app-text/rarian/rarian-0.6.0.ebuild
index 4cbdbc6a6b14..0094cc38fcce 100644
--- a/app-text/rarian/rarian-0.6.0.ebuild
+++ b/app-text/rarian/rarian-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.6.0.ebuild,v 1.3 2007/10/18 13:47:21 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/rarian/rarian-0.6.0.ebuild,v 1.4 2007/10/18 14:32:41 uberlord Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A documentation metadata library"
 HOMEPAGE="www.freedesktop.org"
@@ -25,5 +25,10 @@ src_unpack() {
 	# calling gnome2_omf_fix
 	unpack ${A}
 	cd "${S}"
+
+	# Only GNU getopt supports long options
+	# Scrollkeeper didn't support them, so we'll punt them for now
+	epatch "${FILESDIR}/${P}"-posix-getopt.patch
+
 	elibtoolize ${ELTCONF}
 }