Dont ignore ldflags, install mk to /usr/share/PN and remove the bmake blocker as that allows to install both of them.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26.5 x86_64

4 files changed, 117 insertions, 2 deletions

diff --git a/sys-devel/pmake/ChangeLog b/sys-devel/pmake/ChangeLog
index 14e04c56dc5a..808e8ba780b3 100644
--- a/sys-devel/pmake/ChangeLog
+++ b/sys-devel/pmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/pmake
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.33 2008/02/29 03:23:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/ChangeLog,v 1.34 2008/09/25 08:45:14 aballier Exp $
+
+*pmake-1.111.1-r1 (25 Sep 2008)
+
+  25 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/pmake-1.111.1-ldflags.patch, +pmake-1.111.1-r1.ebuild:
+  Dont ignore ldflags, install mk to /usr/share/PN and remove the bmake
+  blocker as that allows to install both of them.
 
   29 Feb 2008; Brent Baude <ranger@gentoo.org> pmake-1.111.1.ebuild:
   keyworded ~arch for ppc64, bug 211799
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index 48fed36b8d67..0f12c7289876 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 02_all_mktemp.patch 406 RMD160 a24461f973b1e36988ae191753ac456cf3e0d4f7 SHA1 b7c8f19801d5d42d1368729fc02874a09406c4b4 SHA256 ae0bbd4211ed3e3a0bc0eeeea5e74a0ca9804011a58d355ccc40607c13ebcb43
+AUX pmake-1.111.1-ldflags.patch 484 RMD160 fca7d1773d302b3f82e8bbf9f9d11f7b84270c40 SHA1 0470faf8bdb50cdae594da39f7a853f8ff6154a4 SHA256 64bfa9f5d832c6a7ffd19c133c5f061ab347f69da0130141b54d378f2173fd89
 AUX pmake-1.111.1-obsd-inttypes.patch 269 RMD160 5ce24fb75782d2c097fd9c2ab168dbf9ce1d069a SHA1 b0a4cee75b7f79dc5669c12d5d10794ab02a819e SHA256 ddb38877b8fd2e9d831a059ac7daf8520ec6ccc5044fc44467b121e3c242f792
 AUX pmake-1.98-skipdots.patch 513 RMD160 384425fe18ab9b8dca9233c12c23bf9b81ad7bd5 SHA1 4004eef24bcfbaf779ae326e026ebcddada40180 SHA256 4d12778d4940012a98773fc4c180418f3409529beadc909921dc07d2c8b4e32d
 AUX skipdots.patch 677 RMD160 4e36b720fb0d8f1371e88f136629e05da780c505 SHA1 a7cd98574f37ccba9ccbe718b1a7b31ebd3c957c SHA256 ba005525adaf44c0b9c1f0b8d590465950f4673810be6a24208549507451c13d
@@ -7,8 +11,16 @@ DIST pmake_1.111.orig.tar.gz 264383 RMD160 d1acb558b3b89fa9f1665ab16fb93aad281bd
 DIST pmake_1.45-11.tar.gz 252673 RMD160 719fa3b9c59b8495c20e1395698fea89a01a6053 SHA1 7e8468598833f87efcfe895e381b3782ab1f3c55 SHA256 fa69830032312e7fd32cff84cea2dacabd3718165b0158a4b121010f9286d5b0
 DIST pmake_1.98-3.diff.gz 27151 RMD160 a8fcb38c9670dc72d0fc850dc03d6b6cbee3518f SHA1 d9b80ff19d49ce2d3703b5c225c8ed6f6e1aca9e SHA256 63f074ed7d7e5ae06e7a194c8522128c19faf41b7e58031069f0f13081dd37c4
 DIST pmake_1.98.orig.tar.gz 261933 RMD160 a28deeb61168b221dd5f7816bdd1ce7f1de7370e SHA1 c8f165952da38017fe1c2c89b0638a4ed661b9d1 SHA256 c33985fbd532fd0bdd67aed8eda0d610a9c3c8eb64b937504c9c5e32ba29501f
+EBUILD pmake-1.111.1-r1.ebuild 2470 RMD160 357662e735f0eacdfef2576ca8e69e3bbb80c286 SHA1 10adf2059ba326582cdc9b1df0aebaf6c5246202 SHA256 f8398e3ead313ad7c4fe066d98e3175665a237cf2b21c08fca49cc91c5dd937a
 EBUILD pmake-1.111.1.ebuild 2298 RMD160 5950a3b838bba4ce86f452c153ade08ca51159ed SHA1 8c56cb6a0c16bf84bb7128802428ca76b2d5c5ea SHA256 7dea43ad6eb6d3a1c42de5e6e10adff65fd1c60d42bc1097f3fc9580850902fd
 EBUILD pmake-1.45-r4.ebuild 1706 RMD160 a795174aea7bd2e17bee62a0c5783dc11546e8c7 SHA1 24e3186ebddd9204a3890269eaffe7813e815c70 SHA256 b8795cc5bb6b9d8ff3121e30bcccdcb9ac3d5adc0d691eb12372eaad498e1263
 EBUILD pmake-1.98.ebuild 1904 RMD160 9ddb1365b2080408a559fe89b5ee4e560e0a1634 SHA1 1e1ccacd0d385a3c3f93bae8fc94195bf73e6ba0 SHA256 235e0c0ee58564d9807bebaf65ca6ed7e2ac8d478e760b9c89afb337960adf2f
-MISC ChangeLog 4333 RMD160 17dfa082dab7eec8e9773ba0423b8106c2281fd4 SHA1 4488ef7209322723fe33404b112d449bcbd4c1c1 SHA256 2cdab6eb0900be4383a9bcb169f3a35aad839993c251fd5ce89ecb70c1e39320
+MISC ChangeLog 4607 RMD160 03f4c5b176606c4cacdcbc2ab82316dcbc5bc4a2 SHA1 3d5c9b999b107becce400788e50914d4ea65ac46 SHA256 31311c7973e5699ff86007c3dbad823a7d4b2353c413ea6f912d7380420498da
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjbT58ACgkQvFcC4BYPU0pOhQCdHEmXsgRm6b5HodyC/+N9g60Z
+bfUAoLv3SIWtnrypAVu0TzAJwkzHfeKV
+=rhRP
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/pmake/files/pmake-1.111.1-ldflags.patch b/sys-devel/pmake/files/pmake-1.111.1-ldflags.patch
new file mode 100644
index 000000000000..d6047d48994b
--- /dev/null
+++ b/sys-devel/pmake/files/pmake-1.111.1-ldflags.patch
@@ -0,0 +1,13 @@
+Index: pmake/Makefile.boot
+===================================================================
+--- pmake.orig/Makefile.boot
++++ pmake/Makefile.boot
+@@ -36,7 +36,7 @@ LIBOBJ= lst.lib/lstAppend.o lst.lib/lstA
+ 
+ bmake: ${OBJ} ${LIBOBJ}
+ #	@echo 'make of make and make.0 started.'
+-	${CC} ${CFLAGS} ${OBJ} ${LIBOBJ} -o bmake ${LIBS}
++	${CC} ${LDFLAGS} ${CFLAGS} ${OBJ} ${LIBOBJ} -o bmake ${LIBS}
+ 	@ls -l $@
+ #	nroff -h -man make.1 > make.0
+ #	@echo 'make of make and make.0 completed.'
diff --git a/sys-devel/pmake/pmake-1.111.1-r1.ebuild b/sys-devel/pmake/pmake-1.111.1-r1.ebuild
new file mode 100644
index 000000000000..152afc6da4e5
--- /dev/null
+++ b/sys-devel/pmake/pmake-1.111.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/pmake/pmake-1.111.1-r1.ebuild,v 1.1 2008/09/25 08:45:14 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 '-').diff.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 "${WORKDIR}/${DEBIAN_PATCH/.gz/}"
+
+	# 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"
+
+	# Add inttypes.h header on OpenBSD
+	epatch "${FILESDIR}/${P}-obsd-inttypes.patch"
+
+	# Clean up headers to reduce warnings
+	sed -i -e 's|^#endif.*|#endif|' *.h */*.h
+
+	# Don't ignore ldflags
+	epatch "${FILESDIR}/${P}-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
+
+	make -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
+}