old

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

6 files changed, 14 insertions, 180 deletions

diff --git a/dev-libs/libbsd/ChangeLog b/dev-libs/libbsd/ChangeLog
index 63b313104505..c1558abc62d5 100644
--- a/dev-libs/libbsd/ChangeLog
+++ b/dev-libs/libbsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libbsd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/ChangeLog,v 1.8 2012/01/15 17:11:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/ChangeLog,v 1.9 2012/01/15 17:12:59 ssuominen Exp $
+
+  15 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -libbsd-0.2.0.ebuild,
+  -files/libbsd-0.2.0-arc4random-prototypes.patch,
+  -files/libbsd-0.2.0-move-nlist.patch, -libbsd-0.3.0.ebuild:
+  old
 
   15 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> libbsd-0.3.0-r1.ebuild:
   amd64/x86 stable for last commit to prevent widespread breakage
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c14503af4754..576b5b71aafb 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libbsd-0.2.0-arc4random-prototypes.patch 441 RMD160 2b82340b4b97615e97c58298b488b79353d31af5 SHA1 7102fa9bebb57e9b087c5853dc300004e80e0edc SHA256 0e7010d1221f920c3fb7e602e290721d3ef540b8ba3da70d57085f303374da72
-AUX libbsd-0.2.0-move-nlist.patch 300 RMD160 294d9f532b6ba26ffb8556f0726b7cc7f6bf3f0b SHA1 717f58375dd03d2129c236974950cd040d2f23d6 SHA256 66b08838c41c7d008ca8d8f4c1e6964108203f37e013b35bfa147363e8ab1696
-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 1463 RMD160 a4a91743fba4a0dbc79aceee9c2648cdf81cf2e1 SHA1 08971bd750881cbd2d3c18d65d6f8e84e97ff026 SHA256 b6c8c2db747f8f74b0e7b033a2162a875762027b02265bf8f9e18464f0e9db37
-EBUILD libbsd-0.3.0.ebuild 1439 RMD160 a605cbcb3621b5bd87df63be1b313f886afdb3e8 SHA1 40d275e95a712a37ba8d093a4c861cb60b0d54b2 SHA256 a2a2b5c94541d471f5fc42ac5cb725e07d52ce7ef36e7ee01a70fca1a4cfd037
-MISC ChangeLog 1436 RMD160 3d286fedf8d7808bd785d7c5896e119998ec4274 SHA1 0faac488c2e78c40038b6e31d251c0f01f570a3d SHA256 566c4c90fbe5ed06fa4ff815cb135ae454eee270e82a882aead05f09ff2b8c85
+MISC ChangeLog 1632 RMD160 22a7cb902ca03b720e54468a5c57800b35a3ad27 SHA1 c885d320a390664aca8fc20923a903513e2ecfaa SHA256 aafd8961e99b37366fb923567b3d1bcb8ff50f78497889adbf15d8cd06f12dbd
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPEwh0AAoJEEdUh39IaPFNTjEH/jzF/+qgUI8DmtGXbSR6DGoP
-uiNWjFl/XflADSd5XUu2HPP6B+am+vmNM3kXECLp7Ys3n1vH5hYjyktLcg+YQDGE
-6zFAxdVIZHpVnqE0Wj1imdmgUu2w9UsrrBkdPU2NfmyofreoDj+H/T7/kQM4wjp4
-gBvT03OIyL4/ckR616PhAHRFRbQu7xuyNcCQHG53pDiNF+4ErfCcPxngjStDYWYp
-mVLjkiv4ODq7KrJZu5OZEqkoOZ6libhFd/rswglYKqhbJctrrjQSdss1kMgSsRcd
-mS3aAoNtZ8CKXapmr7bynsOZXIv7IwqkMaOj+EMJuwrRi8ikezMn9j2oiCQxAXk=
-=6IPB
+iQEcBAEBAgAGBQJPEwi3AAoJEEdUh39IaPFNiGQH/Am/riGqg9SQRXMdb4NpkJf4
+Y/5Y4gbUZyo5W9UuOD5Ae//kB+oDEkqeRY1hFsYXqyWwy3voKnY+2/tR4fApD59Z
+bPNXJLQnd6rd5BjvMNlO+g5j3NJGTJVOX5NopN8xRz5+kiVcXhER5659KvXCk/e2
+rHUOhY2Ng5+6+abZpt796ZLnQT9ljOkJHdhCe+Xz3isljmsa/RqV+TjlQwWkEAcL
+ik+qWY7F0aJjvN7m8qV83UZFhv1ekBlaEWgpmDE5XcU0RYu+NjPV0KDi5L3iWMby
+JJIAmD/ndxUECqQ05Pw2osFRg5mONxUAQbdEbVtjizjO3ZzrEue2YdAk3dRsaAQ=
+=VRz1
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libbsd/files/libbsd-0.2.0-arc4random-prototypes.patch b/dev-libs/libbsd/files/libbsd-0.2.0-arc4random-prototypes.patch
deleted file mode 100644
index 7587cf7efd8a..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.2.0-arc4random-prototypes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Add missing prototypes for arc4random_buf and arc4random_uniform
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- include/bsd/stdlib.h
-+++ include/bsd/stdlib.h
-@@ -45,6 +45,8 @@
- u_int32_t arc4random();
- void arc4random_stir();
- void arc4random_addrandom(u_char *dat, int datlen);
-+void arc4random_buf(void *_buf, size_t n);
-+u_int32_t arc4random_uniform(u_int32_t upper_bound);
- 
- int dehumanize_number(const char *str, int64_t *size);
- 
diff --git a/dev-libs/libbsd/files/libbsd-0.2.0-move-nlist.patch b/dev-libs/libbsd/files/libbsd-0.2.0-move-nlist.patch
deleted file mode 100644
index 226e66d144fd..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.2.0-move-nlist.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Update Makefile to use bsd/nlist.h instead of nlist.h so it won't
-conflict with dev-libs/elfutils
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- Makefile
-+++ Makefile
-@@ -65,7 +65,7 @@
- 	bsd/stdlib.h \
- 	bsd/readpassphrase.h \
- 	bsd/unistd.h \
--	nlist.h \
-+	bsd/nlist.h \
- 	vis.h \
- 	libutil.h
- 
diff --git a/dev-libs/libbsd/libbsd-0.2.0.ebuild b/dev-libs/libbsd/libbsd-0.2.0.ebuild
deleted file mode 100644
index 04dd3b4cc65a..000000000000
--- a/dev-libs/libbsd/libbsd-0.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbsd/libbsd-0.2.0.ebuild,v 1.3 2011/10/24 20:21:18 maekke Exp $
-
-EAPI=4
-inherit eutils 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=""
-
-pkg_setup() {
-	mylibbsdconf=(
-		libdir=/usr/$(get_libdir)
-		usrlibdir=/usr/$(get_libdir)
-		pkgconfigdir=/usr/$(get_libdir)/pkgconfig
-	)
-	if ! has_version "dev-libs/libbsd"; then
-		if [[ -e ${ROOT}/usr/$(get_libdir)/libbsd.a ]]; then
-			eerror
-			eerror "Sorry, you will need to rebuild sys-libs/glibc before"
-			eerror "installing dev-libs/libbsd. (emerge -1 sys-libs/glibc)"
-			eerror
-			die "Unable to install until glibc rebuilt."
-		fi
-	fi
-}
-
-src_prepare() {
-	mv include/nlist.h include/bsd/nlist.h
-	epatch "${FILESDIR}"/${P}-arc4random-prototypes.patch \
-		"${FILESDIR}"/${P}-move-nlist.patch
-	sed -i \
-		-e 's/gcc /$(CC) ${LDFLAGS} /' \
-		-e 's/^	ar /	$(AR) /' \
-		Makefile || die "Fix Makefile"
-	# Fix header paths in manpages. Has to be done in steps because
-	# not every reference in every man page is wrong.
-	sed -i \
-		-e 's^\.In stdio.h^.In bsd/stdio.h^' \
-		src/fgetln.3 \
-		src/fmtcheck.3 || die "Fix stdio.h man pages"
-	sed -i \
-		-e 's^\.In stdlib.h^.In bsd/stdlib.h^' \
-		src/humanize_number.3 \
-		src/strtonum.3 \
-		src/arc4random.3 || die "Fix stdlib.h man pages"
-	sed -i \
-		-e 's^\.In unistd.h^.In bsd/unistd.h^' \
-		src/setmode.3 || die "Fix unistd.h man pages"
-	sed -i \
-		-e 's^\.In string.h^.In bsd/string.h^' \
-		src/strlcpy.3 \
-		src/strmode.3 || die "Fix string.h man pages"
-	sed -i \
-		-e 's^\.Fd #include <mdX.h>^.Fd #include <bsd/mdX.h>^' \
-		src/mdX.3 || die "Fix md5.h man pages"
-	sed -i \
-		-e 's^\.Fd #include <readpassphrase.h>^.Fd #include <bsd/readpassphrase.h>^' \
-		src/readpassphrase.3 || die "Fix readpassphrase man page"
-	sed -i \
-		-e 's^\.In nlist.h^.In bsd/nlist.h^' \
-		src/nlist.3
-}
-
-src_compile() {
-	tc-export CC AR
-	emake ${mylibbsdconf[@]}
-}
-
-src_install() {
-	emake DESTDIR="${D}" ${mylibbsdconf[@]} install
-	dodoc ChangeLog README TODO Versions
-}
diff --git a/dev-libs/libbsd/libbsd-0.3.0.ebuild b/dev-libs/libbsd/libbsd-0.3.0.ebuild
deleted file mode 100644
index 9237d6b9ccd0..000000000000
--- a/dev-libs/libbsd/libbsd-0.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.1 2011/11/18 17:16:38 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
-
-	# Fix file collision with dev-libs/elfutils by removing deprecated include
-	rm -f "${ED}"usr/include/nlist.h
-}