Add prefix herd to metadata; merge prefix support from overlay

Package-Manager: portage--svn/cvs/Linux i686

5 files changed, 54 insertions, 14 deletions

diff --git a/app-misc/getopt/ChangeLog b/app-misc/getopt/ChangeLog
index 2541f1928a5e..f7049e3f2072 100644
--- a/app-misc/getopt/ChangeLog
+++ b/app-misc/getopt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/getopt
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.2 2007/07/11 20:38:10 uberlord Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/ChangeLog,v 1.3 2010/02/20 05:29:40 abcd Exp $
+
+  20 Feb 2010; Jonathan Callen <abcd@gentoo.org> getopt-1.1.4.ebuild,
+  +files/getopt-1.1.4-irix.patch, metadata.xml:
+  Add prefix herd to metadata; merge prefix support from overlay
 
   11 Jul 2007; Roy Marples <uberlord@gentoo.org> getopt-1.1.4.ebuild:
   Keyworded ~sparc-fbsd.
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index af6c1f6c7d6f..977e6747339e 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX getopt-1.1.4-irix.patch 357 RMD160 1bdeb2af6d2b09a9612ac374fe19263b326a0d13 SHA1 6cf1cff8c37d7c703f1e8ca986b8b08620a43476 SHA256 2562a5585f5bc0b4dbe945cbecd94975839b135e4c1ec36069104394febd1061
 AUX getopt-1.1.4-libintl.patch 1119 RMD160 95e722e15e3a568a0731f769897cb4b494d84474 SHA1 f23a24a0e2a960114e248036127e49b5eb114ea8 SHA256 59566da700ae2dec970a5bc3c7e5112c63b55dba93a24138db5097204f462a8d
 AUX getopt-1.1.4-longrename.patch 4825 RMD160 3e2b2eba6696e759a7e5143de8db3c615f0542eb SHA1 7768c4499b90049c3494de27b9e69fe4e357bd35 SHA256 c6331d44293dc315251ab3014f039456bf99e32880084ddc792b9a2ac2b971d0
 DIST getopt-1.1.4.tar.gz 37163 RMD160 79fffccf1b48956bfc1fbb19c22c2d94adf10dff SHA1 8b9b329b3a8f5d52c91c0381616ecbd1ba291486 SHA256 41083d9993c26792851e79b81a0991996a3f61e14998fdd607615cc3bf933bab
-EBUILD getopt-1.1.4.ebuild 1205 RMD160 ec1fd5abaffbf664adced96961cbec9107eb0bea SHA1 ed606cbc0facdd3ab5a126352cb1d9fe15bb4e64 SHA256 baa284d6dd9d318f8b39115b6f750b65b0a0b4f7a1b8348027d566435dd0a1ad
-MISC ChangeLog 614 RMD160 7cd7bd6a8fdba0ee3d25ac711b125d81879eb46f SHA1 430fcc618a7a9083c207b0cc7e49d50e7360a7b6 SHA256 29a7bbe70d44639f87a37f030ac0a76613042089116e9e66a98560c20e20cc5f
-MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
+EBUILD getopt-1.1.4.ebuild 1507 RMD160 253f5e16978a4049ab2d1ff3e5fa8b49a03b59a1 SHA1 1d71990ea49f21f896305091fa18e1728bf67066 SHA256 37d3f3aabe8ba547823d1119a0d9126c7a3dba38681d6279670fd23178011924
+MISC ChangeLog 794 RMD160 938d15aa254fbe7cc2a2f9f0f1691b94bbe73745 SHA1 2ca46c4ad1c764ed66636b7349948010714059f7 SHA256 f448a9d14687d4773e3bad55ee769e7a9b1b3a3164b4916f4ba9bca3cd3fc42e
+MISC metadata.xml 176 RMD160 e3961eb1dad8b6e0727f616af2a8fb1c9742889c SHA1 77e666fdb67101116afe98b906b8ad3abdac1774 SHA256 8e6c74feaa809489155bb0291854a8754da6d7c277f1189330845c33afd71371
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt/c00ACgkQOypDUo0oQOp0ewCgzn4shx+sLIJRLVqQ6BU5NAdd
+rC8AoINXQvXbB2uP+CRCezqwTIcdRWHd
+=Pgy8
+-----END PGP SIGNATURE-----
diff --git a/app-misc/getopt/files/getopt-1.1.4-irix.patch b/app-misc/getopt/files/getopt-1.1.4-irix.patch
new file mode 100644
index 000000000000..0c344a80131a
--- /dev/null
+++ b/app-misc/getopt/files/getopt-1.1.4-irix.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/show_bug.cgi?id=211499
+
+--- gnu/getopt.c.dist
++++ gnu/getopt.c
+@@ -69,12 +69,7 @@
+ #include <unistd.h>
+ #endif	/* GNU C library.  */
+ 
+-#ifdef VMS
+-#include <unixlib.h>
+-#if HAVE_STRING_H - 0
+ #include <string.h>
+-#endif
+-#endif
+ 
+ #if defined (WIN32) && !defined (__CYGWIN32__)
+ /* It's not Unix, really.  See?  Capital letters.  */
diff --git a/app-misc/getopt/getopt-1.1.4.ebuild b/app-misc/getopt/getopt-1.1.4.ebuild
index b9f43d8117a0..0af71b6b96af 100644
--- a/app-misc/getopt/getopt-1.1.4.ebuild
+++ b/app-misc/getopt/getopt-1.1.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild,v 1.2 2007/07/11 20:38:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/getopt/getopt-1.1.4.ebuild,v 1.3 2010/02/20 05:29:40 abcd Exp $
+
+EAPI=3
 
 inherit toolchain-funcs eutils
 
@@ -10,37 +12,42 @@ SRC_URI="http://software.frodo.looijaard.name/getopt/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd ~x86-interix ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-libintl.patch"
 	epatch "${FILESDIR}/${P}-longrename.patch"
+
+	# hopefully this is portable enough
+	epatch "${FILESDIR}"/${P}-irix.patch
 }
 
 src_compile() {
 	local nogettext="1"
 	local libintl=""
+	local libcgetopt=1
 
 	if use nls; then
 		nogettext=0
 		has_version sys-libs/glibc || libintl="-lintl"
 	fi
 
-	emake CC="$(tc-getCC)" prefix="/usr" \
+	[[ ${CHOST} == *-irix* ]] && libcgetopt=0
+	[[ ${CHOST} == *-interix* ]] && libcgetopt=0
+
+	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" \
+		LIBCGETOPT=${libcgetopt} \
 		WITHOUT_GETTEXT=${nogettext} LIBINTL=${libintl} \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	use nls && make prefix="/usr" DESTDIR="${D}" install_po
+	use nls && make prefix="${EPREFIX}/usr" DESTDIR="${D}" install_po
 
 	into /usr
 	newbin getopt getopt-long
diff --git a/app-misc/getopt/metadata.xml b/app-misc/getopt/metadata.xml
index ecedda4aa2cc..f4618b6e7fe3 100644
--- a/app-misc/getopt/metadata.xml
+++ b/app-misc/getopt/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>bsd</herd>
+<herd>prefix</herd>
 </pkgmetadata>