Bump sources to include compile fixes for Interix and OpenBSD

(Portage version: 2.2.01.18706-prefix/cvs/Darwin powerpc)

3 files changed, 7 insertions, 81 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index 0d53c15058e3..e600608e277d 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/baselayout-prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.11 2011/05/01 19:32:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.12 2011/06/05 19:04:21 grobian Exp $
+
+  05 Jun 2011; Fabian Groffen <grobian@gentoo.org>
+  baselayout-prefix-1.12.14.ebuild, -files/baselayout-1.12.14-interix.patch:
+  Bump sources to include compile fixes for Interix and OpenBSD
 
   01 May 2011; Fabian Groffen <grobian@gentoo.org>
   baselayout-prefix-1.12.14.ebuild:
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
index 6ebab8751081..8cd848117223 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild,v 1.3 2011/05/09 07:41:54 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild,v 1.4 2011/06/05 19:04:21 grobian Exp $
 
 EAPI=3
 
 inherit eutils toolchain-funcs multilib prefix flag-o-matic autotools
 
 # last part in e.g. 1.12.14.1704
-PVER=1707
+PVER=1709
 
 DESCRIPTION="Baselayout for Gentoo Prefix installs"
 HOMEPAGE="http://prefix.gentoo.org/"
@@ -40,8 +40,6 @@ src_prepare() {
 	# The consoletype application in this form will only work on Linux
 	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/baselayout-1.12.5-prefix-no-consoletype.patch
 
-	epatch "${FILESDIR}"/baselayout-1.12.14-interix.patch
-
 	cd "${S}"
 	eprefixify \
 		etc/env.d/00basic \
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.14-interix.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.14-interix.patch
deleted file mode 100644
index 60e11150e6d0..000000000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.14-interix.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ru baselayout-prefix-1.12.14.1707.orig/src/headers.h baselayout-prefix-1.12.14.1707/src/headers.h
---- baselayout-prefix-1.12.14.1707.orig/src/headers.h	2011-05-02 15:10:43 +0200
-+++ baselayout-prefix-1.12.14.1707/src/headers.h	2011-05-02 14:34:30 +0200
-@@ -8,7 +8,9 @@
-  */
- 
- /* Common includes */
--#define HAVE_TIOCNOTTY
-+#ifndef OSInterix
-+# define HAVE_TIOCNOTTY
-+#endif
- #define HAVE_SETSID
- 
- /* OS-specific includes */
-diff -ru baselayout-prefix-1.12.14.1707.orig/src/start-stop-daemon.c baselayout-prefix-1.12.14.1707/src/start-stop-daemon.c
---- baselayout-prefix-1.12.14.1707.orig/src/start-stop-daemon.c	2011-05-02 15:10:43 +0200
-+++ baselayout-prefix-1.12.14.1707/src/start-stop-daemon.c	2011-05-02 15:10:23 +0200
-@@ -60,6 +60,8 @@
- #  define OSDarwin
- #elif defined(_AIX)
- #  define OSaix
-+#elif defined(__INTERIX)
-+#  define OSInterix
- #else
- #  error Unknown architecture - cannot build start-stop-daemon
- #endif
-@@ -93,7 +95,7 @@
- #include <sys/pstat.h>
- #endif
- 
--#if defined(OSaix)
-+#if defined(OSaix) || defined(OSInterix)
- #include <sys/procfs.h>
- #endif
- #if defined(OSsunos)
-@@ -808,7 +810,7 @@
- /* WTA: this  needs to be an autoconf check for /proc/pid existance.
-  */
- 
--#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix) || defined(OSsunos)
-+#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix) || defined(OSsunos) || defined(OSInterix)
- static void
- do_procinit(void)
- {
-@@ -1076,7 +1078,7 @@
- }
- #endif /* OShpux */
- 
--#if defined(OSaix) || defined(OSsunos)
-+#if defined(OSaix) || defined(OSsunos) || defined(OSInterix)
- /* max possible pid (signed long) in theory:
-  * 32bit: 2147483647 (10 digits)
-  * 64bit: 9223372036854775807 (19 digits)
-@@ -1112,7 +1114,11 @@
- {
- 	char buf[40];
- 	FILE *f;
-+    #ifdef OSInterix
-+    psinfo_t psi;
-+    #else
- 	struct psinfo psi;
-+    #endif
- 	int r;
- 
- 	sprintf(buf, "/proc/%ld/psinfo", pid);
-@@ -1466,8 +1472,10 @@
- 	if (changeuser != NULL) {
- 		if (setgid(runas_gid))
- 			fatal("Unable to set gid to %d", runas_gid);
-+#ifndef OSInterix
- 		if (initgroups(changeuser, runas_gid))
- 			fatal("Unable to set initgroups() with gid %d", runas_gid);
-+#endif
- 		if (setuid(runas_uid))
- 			fatal("Unable to set uid to %s", changeuser);
- 	}