~x64-solaris support

Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

5 files changed, 262 insertions, 21 deletions

diff --git a/sys-devel/heirloom-devtools/ChangeLog b/sys-devel/heirloom-devtools/ChangeLog
index 28cdfbdb14c6..95a9736f0f39 100644
--- a/sys-devel/heirloom-devtools/ChangeLog
+++ b/sys-devel/heirloom-devtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/heirloom-devtools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/ChangeLog,v 1.3 2013/06/10 05:12:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/ChangeLog,v 1.4 2013/06/25 12:33:01 ryao Exp $
+
+  25 Jun 2013; Richard Yao <ryao@gentoo.org>
+  +files/heirloom-devtools-070527-solaris.patch,
+  heirloom-devtools-070527-r1.ebuild, heirloom-devtools-999999.ebuild:
+  ~x64-solaris support
 
 *heirloom-devtools-070527-r1 (10 Jun 2013)
 
diff --git a/sys-devel/heirloom-devtools/Manifest b/sys-devel/heirloom-devtools/Manifest
index c4e59ac7b2eb..2f2ecf79f933 100644
--- a/sys-devel/heirloom-devtools/Manifest
+++ b/sys-devel/heirloom-devtools/Manifest
@@ -2,25 +2,26 @@
 Hash: SHA256
 
 AUX heirloom-devtools-070527-64-bit.patch 1175 SHA256 fdb878ff16e8a30b5042f6b447061fb8d9c6c93c3ce691c0715ee3afe121ff1f SHA512 5523e670c9c9d57f0415e30d1aab4dfcd7d8ad74e2535136afbbe4c6e407c713e7801cbcbf7ddbe798ab2790fc196a2fdbf9d5295fa8c475c73360f5e3a27066 WHIRLPOOL 9ee49da3af1e2c0965761e764bbd84f5ff7e2ae8c77f11d44242c7d9720635faa48b29c108aa8d8462bb2427a85a1ad481b55b3a699e2e25d98447ad19c9918e
+AUX heirloom-devtools-070527-solaris.patch 5636 SHA256 3c6c42ab6ccb0b03fd7dcf83b3d3ca066eeff250738bd7750d32d39cc18ad357 SHA512 335fdabef9b9a8b93ffa6eab2b66d2db11af29b24989c4b64ea64695cfadd4471c31a865c2fcb823c1f4c11eebc1babb53ab83c9c2bdf83c05f497faf16e3f1c WHIRLPOOL a9ebe3a455c70d828d93d4fd1d20609ea000ec1461b69358688901bac9697498acd5498722dc9d16b40278a2185e5534ca7d07bdd0a117bb34dd768255a238bc
 DIST heirloom-devtools-070527.tar.bz2 381054 SHA256 9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba SHA512 1f1f10a7b49402053172cc028bbd939a46fcf933994cb867fa40e8c5bbd7b1291575b3bac254cd79dc4fce3e3a2c88fe0f890449888fda16169c8e6a2540f055 WHIRLPOOL 145d36f42b180e480afe4bcefa0c59de44787ba9eef73782588834d8b15300b9ef12bde77b47eef992229fdfed8cef9da49b993f50023aa15262166bebe57104
-EBUILD heirloom-devtools-070527-r1.ebuild 1407 SHA256 058887dc54282f7698b3a6b9f03f3bed75feb091e62973276913bba4128a31aa SHA512 737e30408658e6f9465c00d7f65e72b00207dd07cb82a3373c4a0e05e794936de8de6b4351599547cdd43108f03fc947616b67dec9ffafd1964d59a1694babeb WHIRLPOOL c94cd1fc97c138a7dea053c5995173ad8e17231e1c39ae4b71f77b912f9214605292cd66fca913245dcc39f4857f359e978b7321e0684131ae7fea4527666493
-EBUILD heirloom-devtools-999999.ebuild 1474 SHA256 84097512221eb9f0a63b89153e9d11fc1580b944be395b220714ac300ddcc29b SHA512 0e101f69f55299c88158e16a015a44dd0ea6f29b4d21f56138d56c9281db48cdb1b21695bb9832181d627712621782acf519d27352cf33322003216ae94d093a WHIRLPOOL 3b47a1eeaa97e45b892c47a21611c3b9b0372f7d1545f911c8bb62924154e4e5948d0b0c5a901f45b22159b9427a40819d309de938b4fba8440349a5d62ce7c5
-MISC ChangeLog 1072 SHA256 153e1fc03f3f1b2f67296c6edf800702ca3b9b603855be9b0f2a4f5313937a2f SHA512 b8fbbcc787dafa963db1e843e5f661fcb774d977e0eb3bea1cb1a961eedda3a949fb2e9add9ab362d0f5c075112526f06774968db5fb92b4b4527d549809f5d1 WHIRLPOOL 012d88c5facd3f355e2a14fd502daae55eb18583bdaf75b5133fc793b0989a979e0fad21a2d185a06812f225109cb89f0282683592879615641d18f00112a02a
+EBUILD heirloom-devtools-070527-r1.ebuild 1526 SHA256 c4f4ad2fc6b09c92fe13399e557628d0b50a117f790ee6289f20553ffb226af5 SHA512 bcc9097f913a25df0cbfe43b3ebfb8ab0227b60ecdeb48fca58f05c3fd8a9474f733261011d66e639c11c08ef45025dc068fb0744933c50ff1ac905ab969219b WHIRLPOOL b12739584f0fbe78470b4ca3676078991a67a562af9296cc17e769b2b447a1317ead7c2d6e06f305233571d69755133ecc05190bea4617ab2af86e9f85a7072f
+EBUILD heirloom-devtools-999999.ebuild 1525 SHA256 8be1e7b38fd86e3db894e70b61e1de744261ed955ba48c16487b2ea10bfd3192 SHA512 a930111ae14758e309a5c0548f19066aaa14693f6479a5aa607a343daf19fe2f3697eb9f9e8cbbe6046dca4efdd073601ead98904a049078e694da4a91bd1519 WHIRLPOOL 584b13478cb4c14b4f1463d196b5c33ac128817578d93ba0ddf6c585966637b36fd46bc211bd274937697764a1806d5721a3e71e079e5b900279eff9be5eb36a
+MISC ChangeLog 1261 SHA256 2e8bf1070798c0252c722e2b3a3024d8091cd05b0d8b72948a47ad905fab4d1d SHA512 a65fa306be43932834bb9b82a9ae5347278b6aea6aa465f706fdd86a294b9edf2cb334088d5056d3cd4b3d02dfb78314cba3e3b4d7136d5d79bc67efded2ca2e WHIRLPOOL 6a9ee058fed7175162dd3bd759a2ac71c263739c9fd0039892e69d3e73c0459da3895942c6be2f9e9a62d9e007ce827b84a710e0bea04d7bee214c05f98ce350
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRtWAUAAoJECDuEZm+6ExkeSQP/Rrn7g53Fda70HSdpbRkpeYh
-k37UyG0a0tVXVmK1XzAg0aEE+X6JP8PKnG7mEnlvi/cbBIGaNnH0mwInr8IAtdjT
-VJHcz/JgOFbmc4/R2ofskI19cNvGd4rotBdN6kV8Qdn2ELb2rRNJBBysfHL72HQ/
-eMEiaCvNb5feV/C8fRmC7JLK0ioqP2SUxU8iAKdJOcTrZZiV1/NB1v1mDqDv+WWh
-jvn6i0pRBYf2jNr3ZURkgC5vupV4cJmV8vLHdRKTl8ThHX87J6hCpToxNONwpF6V
-o6Cy3m3ocJ2SvbV87z2RX4MVl2/DO8gG/bcJ4Y8d5mMGBclJugScEyzJ/Hx6D9FN
-zIRL8Yh9tu/H1jnvY5ZokQQFqGYC8IwccgZ6SzZZMDsknAnr5MxcmftN7grFeESB
-tr+e2z6l61OtrGRe3kgeUETtnXKYvoyMvTScFVVcnZLDszBfXsA1/KKW3/tsuVft
-sF9sraujsnLbkSCKanW/7GLPzYpfNSLPjORq+G7eKsoAMbJ5/B7LljaSxoIpF3fs
-XZTowPqaw0OqdoQqNDHLyKiXh7VOHF7EPmNsvHb0x0cT/mo+OtkQ61byRNbzwiyj
-0tJpxasbYRiPX4hAA/4zijzFw8iTasKG+wsslF+3fvyYRRAzfDIcyyHWmrTzmZiw
-/WTT9BT0iRogDcOXZoDh
-=T3l6
+iQIcBAEBCAAGBQJRyR0mAAoJECDuEZm+6ExkEfMP/AmpLMHodqHVto+0+BIJIxjl
+xywPdAo+caF5hLTg70cLjeyc69SBmubAtBuRz38lLfqWaTy6RiZQoHoKvJrq2F7b
+V/gLCf2WhjkhWEnnF6e7Et1OKQoIIJCNDHmOas1GwPSLIqHx1b1V8Q3vKYfTgz+r
++xrgcq51wiWVUjSHU7jd4G9PuHNHLzoXAHXSb8l6IMcbWpmIxhvEIwgRxTffuaMl
+C+auoGiYSQr/b44fDJpVsocwyF+xFnF9ObQXvPVAPSGMA61/lQxEFNKUYMZkdr7P
+CaWamLhskjk+/3TqP/ERkTm9G9YYbwbBFnhKSmzEt99vOH6LpOr5dSedMfpvQOeg
+OVmT+xCJl4qL82ECQoKsVRj3nBFM32+R+gVCWTE17a03eq4nCo6iKoGKSfGHo9kB
+rC3rrh7N5ael1DNOJie/gSpr1WzYfDeiiZnCtgi+zzcKDsBOj9iRtFT5tN0C1/MN
+UOYtTwkXo7huqjJ7rjSdTyOX0n2UJwBpgDPxinvj2BtV50dOK2p9ZXI2leFBKdOF
+hbdjDk5pZcSvO3OyxAPxsehBf1Ygm2LeXu5Ugp4lBV+91evP3oJ8aA7nrDC6HrWf
+DjeieYC3HUn9kWxKQRQJpJoEjARgzRXK57iryfpgtnGBxYvaF7e1VDGuWnXRex0Q
+SwvAAAdsxlCknpNK6Q8b
+=MR33
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/heirloom-devtools/files/heirloom-devtools-070527-solaris.patch b/sys-devel/heirloom-devtools/files/heirloom-devtools-070527-solaris.patch
new file mode 100644
index 000000000000..c6b394208762
--- /dev/null
+++ b/sys-devel/heirloom-devtools/files/heirloom-devtools-070527-solaris.patch
@@ -0,0 +1,230 @@
+diff --git a/make/include/mksh/defs.h b/make/include/mksh/defs.h
+index 1992205..8065a77 100644
+--- a/make/include/mksh/defs.h
++++ b/make/include/mksh/defs.h
+@@ -63,7 +63,6 @@
+ #include <widec.h>
+ #endif
+ 
+-#ifndef __sun
+ /*
+  * Definition of wchar functions.
+  */
+@@ -90,7 +89,6 @@
+ #	define wscmp(x,y) wcscmp(x,y)
+ #	undef wsncmp
+ #	define wsncmp(x,y,z) wcsncmp(x,y,z)
+-#endif
+ 
+ #if defined (__FreeBSD__) || defined (__APPLE__) || defined (__hpux)
+ extern "C" { wchar_t	*wcsdup(const wchar_t *s); }
+diff --git a/make/makestate/lock.c b/make/makestate/lock.c
+index cdf7562..aa6083e 100644
+--- a/make/makestate/lock.c
++++ b/make/makestate/lock.c
+@@ -42,18 +42,6 @@
+ #include <sys/errno.h>
+ #include <errno.h>		/* errno */
+ 
+-#if defined(_LP64)
+-/*
+- * The symbols _sys_errlist and _sys_nerr are not visible in the
+- * LP64 libc.  Use strerror(3C) instead.
+- */
+-#else  /* #_LP64 */
+-#if defined (__sun) || defined (__hpux)
+-extern	char *		sys_errlist[];
+-extern	int		sys_nerr;
+-#endif
+-#endif /* #_LP64 */
+-
+ static	void		file_lock_error(char *, char *, const char *, char *, char *);
+ 
+ /*
+@@ -167,16 +155,7 @@ file_lock_error(char * msg, char * file, const char * str, char * arg1,
+ 	len = strlen(msg);
+ 	sprintf(&msg[len], str, arg1, arg2);
+ 	strcat(msg, " failed - ");
+-#if defined(_LP64)
+ 	/* Needs to be changed to use strerror(3C) instead. */
+ 	len = strlen(msg);
+ 	sprintf(&msg[len], "errno %d", errno);
+-#else  /* #_LP64 */
+-	if (errno < sys_nerr) {
+-		strcat(msg, sys_errlist[errno]);
+-	} else {
+-		len = strlen(msg);
+-		sprintf(&msg[len], "errno %d", errno);
+-	}
+-#endif /* #_LP64 */
+ }
+diff --git a/make/mksh/macro.cc b/make/mksh/macro.cc
+index 6ddb624..23b0315 100644
+--- a/make/mksh/macro.cc
++++ b/make/mksh/macro.cc
+@@ -43,6 +43,7 @@
+ /*
+  * Included files
+  */
++#include <alloca.h>
+ #include <wordexp.h>
+ #include <mksh/dosys.h>		/* sh_command2string() */
+ #include <mksh/i18n.h>		/* get_char_semantics_value() */
+@@ -1403,13 +1404,6 @@ found_it:;
+ 			new_value = ALLOC_WC(length);
+ 			new_value_allocated = true;
+ 			WCSTOMBS(mbs_buffer, old_vr);
+-#ifdef __sun
+-			wsprintf(new_value,
+-				        NOCATGETS("/usr/arch/%s/%s:%s"),
+-				        ha->string_mb + 1,
+-				        ta->string_mb + 1,
+-				        mbs_buffer);
+-#else
+ 			char * mbs_new_value = (char *)getmem(length);
+ 			sprintf(mbs_new_value,
+ 				        NOCATGETS("/usr/arch/%s/%s:%s"),
+@@ -1418,7 +1412,6 @@ found_it:;
+ 				        mbs_buffer);
+ 			MBSTOWCS(new_value, mbs_new_value);
+ 			retmem_mb(mbs_new_value);
+-#endif
+ 		}
+ 		if (new_value[0] != 0) {
+ 			setvar_daemon(virtual_root,
+diff --git a/make/mksh/misc.cc b/make/mksh/misc.cc
+index 11122cf..d617591 100644
+--- a/make/mksh/misc.cc
++++ b/make/mksh/misc.cc
+@@ -382,30 +382,7 @@ setup_char_semantics(void)
+ char *
+ errmsg(int errnum)
+ {
+-#ifndef __sun
+ 	return strerror(errnum);
+-#else // __sun
+-
+-	extern int		sys_nerr;
+-#ifdef SUN4_x
+-	extern char		*sys_errlist[];
+-#endif
+-	char			*errbuf;
+-
+-	if ((errnum < 0) || (errnum > sys_nerr)) {
+-		errbuf = getmem(6+1+11+1);
+-		sprintf(errbuf, "Error %d", errnum);
+-		return errbuf;
+-	} else {
+-#ifdef SUN4_x
+-		return(sys_errlist[errnum]);
+-#endif
+-#ifdef SUN5_0
+-		return strerror(errnum);
+-#endif
+-
+-	}
+-#endif // !__sun
+ }
+ 
+ extern const char	*progname;
+diff --git a/make/src/implicit.cc b/make/src/implicit.cc
+index 2d388cc..a1cee7e 100644
+--- a/make/src/implicit.cc
++++ b/make/src/implicit.cc
+@@ -43,10 +43,13 @@
+ /*
+  * Included files
+  */
++#include <cstdio>
+ #include <mk/defs.h>
+ #include <mksh/macro.h>		/* expand_value() */
+ #include <mksh/misc.h>		/* retmem() */
+ 
++using std::printf;
++
+ /*
+  * Defined macros
+  */
+@@ -97,8 +100,6 @@ extern	void		add_target_to_chain(Name target, Chain * query);
+  *		recursion_level	Used for tracing
+  */
+ 
+-extern int printf (const char *, ...);
+-
+ static Boolean actual_doname = false;
+ 
+ /* /tolik/
+diff --git a/make/src/nse_printdep.cc b/make/src/nse_printdep.cc
+index 6201a18..38826d2 100644
+--- a/make/src/nse_printdep.cc
++++ b/make/src/nse_printdep.cc
+@@ -37,9 +37,12 @@
+ /*
+  * Included files
+  */
++#include <cstdio>
+ #include <mk/defs.h>
+ #include <mksh/misc.h>		/* get_prop() */
+ 
++using std::printf;
++
+ /*
+  * File table of contents
+  */
+@@ -59,7 +62,6 @@ static void	print_rule(register Name target);
+ static	void	print_rec_info(Name target);
+ static Boolean	is_out_of_date(Property line);
+ extern void depvar_print_results (void);
+-extern int printf (const char *, ...);
+ extern int _flsbuf (unsigned int, FILE *);
+ 
+ /*
+diff --git a/make/vroot/lock.cc b/make/vroot/lock.cc
+index 1d6239b..1a20bc0 100644
+--- a/make/vroot/lock.cc
++++ b/make/vroot/lock.cc
+@@ -48,11 +48,6 @@
+ #include <signal.h>
+ #include <errno.h>			/* errno */
+ 
+-#if defined(sun) || defined(HP_UX)
+-extern	char		*sys_errlist[];
+-extern	int		sys_nerr;
+-#endif
+-
+ static	void		file_lock_error(char *msg, char *file, char *str, int arg1, int arg2);
+ 
+ #define BLOCK_INTERUPTS sigfillset(&newset) ; \
+@@ -179,20 +174,6 @@ file_lock_error(char *msg, char *file, char *str, int arg1, int arg2)
+ 	len = strlen(msg);
+ 	sprintf(&msg[len], str, arg1, arg2);
+ 	strcat(msg, " failed - ");
+-#ifdef __sun
+-	if (errno < sys_nerr) {
+-#ifdef SUN4_x
+-		strcat(msg, sys_errlist[errno]);
+-#endif
+-#ifdef SUN5_0
+-		strcat(msg, strerror(errno));
+-#endif
+-	} else {
+-		len = strlen(msg);
+-		sprintf(&msg[len], NOCATGETS("errno %d"), errno);
+-	}
+-#else
+ 	strcat(msg, strerror(errno));
+-#endif
+ }
+ 
+diff --git a/sccs/src/vc.c b/sccs/src/vc.c
+index d7f7187..1c0ffb1 100644
+--- a/sccs/src/vc.c
++++ b/sccs/src/vc.c
+@@ -37,6 +37,7 @@
+  */
+ /*	from OpenSolaris "sccs:cmd/vc.c"	*/
+ # include	<defines.h>
++# include	<limits.h>
+ # include	<locale.h>
+ 
+ 
diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild
index 1ce4ed378ae3..a337a6025371 100644
--- a/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild
+++ b/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild,v 1.1 2013/06/10 05:12:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-070527-r1.ebuild,v 1.2 2013/06/25 12:33:01 ryao Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.sourceforge.net/project/heirloom/${PN}/${PV}/${P}.tar.
 
 LICENSE="BSD BSD-4 CDDL"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x64-solaris"
 IUSE=""
 
 DEPEND="app-shells/heirloom-sh"
@@ -29,12 +29,16 @@ src_prepare() {
 		-e "s:^\(CFLAGS=\)\(.*\):\1${CFLAGS}:" \
 		-e 's:^\(STRIP=\)\(.*\):\1true:' \
 		-e "s:^\(CXX = \)\(.*\):\1$(tc-getCXX):" \
+		-e "s:^\(INSTALL=\)\(.*\):\1$(which install):" \
 		./mk.config
 
 	echo "CC=$(tc-getCC)" >> "./mk.config"
 
+	epatch "${FILESDIR}/${P}-solaris.patch"
 	epatch "${FILESDIR}/${P}-64-bit.patch"
 
+	epatch_user
+
 }
 
 src_compile() {
diff --git a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
index 5f61d716c1a2..0f62dacb6921 100644
--- a/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
+++ b/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild,v 1.3 2013/06/10 05:12:17 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/heirloom-devtools/heirloom-devtools-999999.ebuild,v 1.4 2013/06/25 12:33:01 ryao Exp $
 
 EAPI=4
 
@@ -38,6 +38,7 @@ src_prepare() {
 		-e "s:^\(CFLAGS=\)\(.*\):\1${CFLAGS}:" \
 		-e 's:^\(STRIP=\)\(.*\):\1true:' \
 		-e "s:^\(CXX = \)\(.*\):\1$(tc-getCXX):" \
+		-e "s:^\(INSTALL=\)\(.*\):\1$(which install):" \
 		./mk.config
 
 	echo "CC=$(tc-getCC)" >> "./mk.config"