bump to latest debian patchset, fix bug #367891

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

2 files changed, 87 insertions, 2 deletions

diff --git a/sys-devel/pmake/ChangeLog b/sys-devel/pmake/ChangeLog
index 2bea99748913..8d4193abfde7 100644
--- a/sys-devel/pmake/ChangeLog
+++ b/sys-devel/pmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/pmake
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.37 2009/09/23 20:42:21 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.38 2011/07/07 20:17:09 aballier Exp $
+
+*pmake-1.111.3.1 (07 Jul 2011)
+
+  07 Jul 2011; Alexis Ballier <aballier@gentoo.org> +pmake-1.111.3.1.ebuild:
+  bump to latest debian patchset, fix bug #367891
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> pmake-1.98.ebuild:
   Remove virtual/libc
diff --git a/sys-devel/pmake/pmake-1.111.3.1.ebuild b/sys-devel/pmake/pmake-1.111.3.1.ebuild
new file mode 100644
index 000000000000..c3f1925ddb46
--- /dev/null
+++ b/sys-devel/pmake/pmake-1.111.3.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.3.1.ebuild,v 1.1 2011/07/07 20:17:09 aballier Exp $
+
+inherit eutils toolchain-funcs versionator
+
+MY_P="${PN}-$(get_version_component_range 1-2)"
+DEBIAN_SOURCE="${PN}_$(get_version_component_range 1-2).orig.tar.gz"
+DEBIAN_PATCH="${PN}_$(replace_version_separator 2 '-').debian.tar.gz"
+
+DESCRIPTION="BSD build tool to create programs in parallel. Debian's version of NetBSD's make"
+HOMEPAGE="http://www.netbsd.org/"
+SRC_URI="mirror://debian/pool/main/p/pmake/${DEBIAN_SOURCE}
+	mirror://debian/pool/main/p/pmake/${DEBIAN_PATCH}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-g0 -E --no-backup-if-mismatch -p1" \
+		EPATCH_SUFFIX="diff" \
+		epatch "${WORKDIR}/debian/patches"
+
+	# pmake makes the assumption that . and .. are the first two
+	# entries in a directory, which doesn't always appear to be the
+	# case on ext3...  (05 Apr 2004 agriffis)
+	epatch "${FILESDIR}/${PN}-1.98-skipdots.patch"
+
+	# Don't ignore ldflags
+	epatch "${FILESDIR}/${PN}-1.111.1-ldflags.patch"
+}
+
+src_compile() {
+	# The following CFLAGS are almost directly from Red Hat 8.0 and
+	# debian/rules, so assume it's okay to void out the __COPYRIGHT
+	# and __RCSID.  I've checked the source and don't see the point,
+	# but whatever...  (07 Feb 2004 agriffis)
+	CFLAGS="${CFLAGS} -Wall -Wno-unused -D_GNU_SOURCE \
+		-DHAVE_STRERROR -DHAVE_STRDUP -DHAVE_SETENV \
+		-D__COPYRIGHT\(x\)= -D__RCSID\(x\)= -I. \
+		-DMACHINE=\\\"gentoo\\\" -DMACHINE_ARCH=\\\"$(tc-arch-kernel)\\\""
+	if [[ "${USERLAND}" == "GNU" ]]; then
+		CFLAGS="${CFLAGS} -D_PATH_DEFSYSPATH=\\\"/usr/share/mk/${PN}\\\""
+	fi
+
+	emake -f Makefile.boot \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		|| die "make failed"
+}
+
+src_install() {
+	# Don't install these on BSD, else they conflict
+	if [[ "${USERLAND}" == "GNU" ]]; then
+		insinto /usr/share/mk/${PN}
+		doins mk/*
+	fi
+
+	newbin bmake pmake || die "newbin failed"
+	dobin mkdep || die "dobin failed"
+	mv make.1 pmake.1
+	doman mkdep.1 pmake.1
+	dodoc PSD.doc/tutorial.ms
+
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		dosym pmake /usr/bin/make
+		dosym pmake.1.gz /usr/share/man/man1/make.1.gz
+	fi
+}