Remove libutil.h (and vis.h) from /usr/include to prevent automagic #include by dev-lang/perl wrt #399001 by Michał Górny

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 74 insertions, 7 deletions

diff --git a/dev-libs/libbsd/ChangeLog b/dev-libs/libbsd/ChangeLog
index 10af236fb65a..233f5f1b3637 100644
--- a/dev-libs/libbsd/ChangeLog
+++ b/dev-libs/libbsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libbsd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/ChangeLog,v 1.6 2011/12/15 22:47:02 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/ChangeLog,v 1.7 2012/01/15 17:08:11 ssuominen Exp $
+
+*libbsd-0.3.0-r1 (15 Jan 2012)
+
+  15 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +libbsd-0.3.0-r1.ebuild:
+  Remove libutil.h (and vis.h) from /usr/include to prevent automagic #include
+  by dev-lang/perl wrt #399001 by Michał Górny
 
   15 Dec 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #353461
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index e3afd076c5b8..d1c8fbe5f1e6 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -6,13 +6,18 @@ AUX libbsd-0.2.0-move-nlist.patch 300 RMD160 294d9f532b6ba26ffb8556f0726b7cc7f6b
 DIST libbsd-0.2.0.tar.gz 81824 RMD160 e0038f00313ab07e7185ce180bcd3e624b0c7d97 SHA1 048f8522d15df9f160c17e43a45485bcd617bb0d SHA256 5c7920d4d3d0e253f4698b42b7b67130295d59df61c5a0e04e2d1787d543f0f1
 DIST libbsd-0.3.0.tar.gz 102409 RMD160 bb7aeecafcfc9a9ad250df45e5381e26b558b366 SHA1 cb294a6123fb1dd173369144adfcaccb278db310 SHA256 fbf36ed40443e1d0d795adbae8d461952509e610c3ccf0866ae160b723f7fe38
 EBUILD libbsd-0.2.0.ebuild 2284 RMD160 8cdd013a2f787859eca6feb4d742fefd797d4e28 SHA1 923cf0d3f3b13cae2ff9199e5be06f356ea1a338 SHA256 17f8f2af6b076cd83ccf466307c0798072703f67132b76f5d623e416d4187216
+EBUILD libbsd-0.3.0-r1.ebuild 1465 RMD160 cb6032b026637cd5bb5c5a0417f424182be880a2 SHA1 8baf2b7f0a17c61e2d81e9277bf16fcf0abd0007 SHA256 22768825c06223d8018f43f37e46fa003b2e1825942f6fbf05be198a84316ba6
 EBUILD libbsd-0.3.0.ebuild 1439 RMD160 a605cbcb3621b5bd87df63be1b313f886afdb3e8 SHA1 40d275e95a712a37ba8d093a4c861cb60b0d54b2 SHA256 a2a2b5c94541d471f5fc42ac5cb725e07d52ce7ef36e7ee01a70fca1a4cfd037
-MISC ChangeLog 1047 RMD160 ca0c553b0b633f6d88f56336aba6d0329c578560 SHA1 06191c3554b346185279650dd960b22b623ba24d SHA256 28eaa03e652bd8b9bbe31b0bb78fd3913dd9c9f104283385f6366537355e7914
+MISC ChangeLog 1291 RMD160 be39c7de118d02c29d2dc3b6200f8de06adcda2e SHA1 d61e8c36472d442271964167d5d8160218028a5c SHA256 7faf560fc81b9ab51aff9a17a4a8026c7c2eeda2e4ca0a51969c749a79005767
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7qeOsACgkQCaWpQKGI+9TbFQCdGp97hEjoEQyRvJY155FZwXvr
-in0Anj0nfYRMq0O5jA9Y38cLjJ8/Dh9w
-=VorS
+iQEcBAEBAgAGBQJPEweXAAoJEEdUh39IaPFN2QIH/32KV0infCBl3dzRXf1spDEO
+uDMftvjiBSyB86oAGXTxDCbN6sbyd2wOz8VzxZds6VByy4cHfLU1QBByH2neI53V
+O9pGTMEH0jHFUub94rh1Q0zqilqpqaLTAquEmHk6gGx3t/izw2GR+35ZjcnTI2NX
+o0yQXcPT3xQTA2LxaIZIL53zvBML+qQ6d0QM6CrprJoZ1VV3vXjQpCd4FY4xMvgs
+rl+2raWmfkVvaz3iLTSpjE/RZ8DO3r/VTdpIflYf5N/0EbuWzahvGbG7bnpLPNeR
+1CD5aWzPID8JQkaZrq+p9/Xs5S1A3zx36EIbKCMlF6V5NrkTiYdC4sJTf1J8U+A=
+=7Bfl
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libbsd/libbsd-0.3.0-r1.ebuild b/dev-libs/libbsd/libbsd-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..eb170702e73c
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.3.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/libbsd-0.3.0-r1.ebuild,v 1.1 2012/01/15 17:08:11 ssuominen Exp $
+
+EAPI=4
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A BSD compatibility library"
+HOMEPAGE="http://libbsd.freedesktop.org/wiki/"
+SRC_URI="http://libbsd.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+pkg_setup() {
+	mylibbsdconf=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		libdir=/usr/$(get_libdir)
+		usrlibdir=/usr/$(get_libdir)
+		)
+
+	local f="${ROOT}"usr/$(get_libdir)/libbsd.a
+	if ! has_version dev-libs/libbsd; then
+		if [[ -e ${f} ]]; then
+			eerror "You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+			die "You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
+		fi
+	fi
+}
+
+src_prepare() {
+	# Instead of replacing upstream warning flags, append to them
+	sed -i -e 's:CFLAGS ?= -g:CFLAGS +=:' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/^libs/s:$(LIB_STATIC)::' \
+			-e 's:install -m644 $(LIB_STATIC):-&:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	emake "${mylibbsdconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" "${mylibbsdconf[@]}" install
+	dodoc ChangeLog README TODO
+
+	# File collision with dev-libs/elfutils and dev-lang/perl build problem wrt #399001
+	rm -f "${ED}"usr/include/{libutil,nlist,vis}.h
+}