10 files changed, 6 insertions, 122 deletions
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
deleted file mode 100644
index e3c9ef4..0000000
--- a/dev-libs/libtermkey/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libtermkey-0.17.tar.gz 42176 SHA256 68949364ed5eaad857b3dea10071cde74b00b9f236dfbb702169f246c3cef389 SHA512 8b96f9961ff77872a974b376c73abc4afbe444a761f96b3681fc5420e33548a02609bf8b2b24494965824ca5dd80c953d1d4e2701070559365633d7bf0fdcb12 WHIRLPOOL ef755c2de422d8778d8501be3aefe249b6194e71ffd862a2479158c009dd483508e6a4e35a5a1338d219e585ad465ccd3cfecfc8db6c7cd0440aa802d71f645a
diff --git a/dev-libs/libtermkey/libtermkey-0.17.ebuild b/dev-libs/libtermkey/libtermkey-0.17.ebuild
deleted file mode 100644
index c88687d..0000000
--- a/dev-libs/libtermkey/libtermkey-0.17.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Library for easy processing of keyboard entry from terminal-based programs"
-HOMEPAGE="http://www.leonerd.org.uk/code/libtermkey/"
-SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="demos"
-
-RDEPEND="dev-libs/unibilium:="
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig
-	demos? ( dev-libs/glib:2 )"
-
-src_prepare() {
-	if ! use demos; then
-		sed -e '/^all:/s:$(DEMOS)::' -i Makefile || die
-	fi
-}
-
-src_compile() {
-	append-flags -fPIC -fPIE
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libtermkey/metadata.xml b/dev-libs/libtermkey/metadata.xml
deleted file mode 100644
index f2b4a5d..0000000
--- a/dev-libs/libtermkey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
deleted file mode 100644
index dd3625e..0000000
--- a/dev-libs/msgpack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST msgpack-0.6.0_pre20150220.tar.xz 121096 SHA256 a0de45c66c0730012f0c6f12ed00bd6a6645c9b796f0168b66c03ce52d646080 SHA512 186e28dd2b7a8ddba0fe08ab73366ebf31bd22a9e52af320b542ff6b3c948fdaf2e5c27923d5a7315248378da27d6bd5eb199cf98cf2ea41ccebb96863b2cbfc WHIRLPOOL a708454ce41ba057011e8c7d513d44ada6bd2e4170c43cdbb2ef6597fe1912af2dc619267f3182d2869be742f3d09e8270f7b71aca14421cb8f43a4ee2ad3a15
diff --git a/dev-libs/msgpack/metadata.xml b/dev-libs/msgpack/metadata.xml
index 157326a..71d3191 100644
--- a/dev-libs/msgpack/metadata.xml
+++ b/dev-libs/msgpack/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+  <herd>vim</herd>
 </pkgmetadata>
diff --git a/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild b/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild
deleted file mode 100644
index 97273ac..0000000
--- a/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-	KEYWORDS=""
-else
-	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-
-DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2 )"
-DOCS=( CHANGELOG.md QUICKSTART-C.md QUICKSTART-CPP.md README.md CROSSLANG.md )
diff --git a/dev-libs/msgpack/msgpack-9999.ebuild b/dev-libs/msgpack/msgpack-9999.ebuild
index 3497fef..53a1a20 100644
--- a/dev-libs/msgpack/msgpack-9999.ebuild
+++ b/dev-libs/msgpack/msgpack-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/msgpack/msgpack-0.6.0_pre20150220.ebuild,v 1.3 2015/02/26 06:16:37 yngwin Exp $
 
 EAPI=5
-inherit cmake-utils
+inherit cmake-multilib
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
 HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
@@ -12,15 +12,13 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 	KEYWORDS=""
 else
-	inherit vcs-snapshot
-	COMMIT="f6d0cd9a4ba46f4341014a199e3d352fad76b215"
-	SRC_URI="https://github.com/${PN}/${PN}-c/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"
 
-DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2 )"
+DEPEND="test? ( >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] )"
 DOCS=( CHANGELOG.md QUICKSTART-C.md QUICKSTART-CPP.md README.md CROSSLANG.md )
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
deleted file mode 100644
index 7988cf2..0000000
--- a/dev-libs/unibilium/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unibilium-1.1.2.tar.xz 50076 SHA256 8c7ac52c31ac9567967891c3006bf8a677ec98eeaf46cc4acfc52efe9e165c3c SHA512 275146b0f4ad15997876180143938ff782f3be24c6fcfc2a0a3dbf22e19bfc6999f4c27ec6a39ebf8e45ad5cc0c3e5a80caa1ef00526bf54c824b78eaa0c29d4 WHIRLPOOL c50c816de331c0715191a1801e759facc968ff17a24b4a4d21ded9ab43acfbae4fe5693cfc08fd32ce0a46e2faa11211153cbf76f641931c0fbf197ad52934e8
diff --git a/dev-libs/unibilium/metadata.xml b/dev-libs/unibilium/metadata.xml
deleted file mode 100644
index f2b4a5d..0000000
--- a/dev-libs/unibilium/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/unibilium/unibilium-1.1.2.ebuild b/dev-libs/unibilium/unibilium-1.1.2.ebuild
deleted file mode 100644
index 9e0c792..0000000
--- a/dev-libs/unibilium/unibilium-1.1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="A very basic terminfo library"
-HOMEPAGE="https://github.com/mauke/unibilium/"
-SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	sys-devel/libtool"
-RDEPEND=""
-
-src_compile() {
-	append-flags -fPIC -fPIE
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	prune_libtool_files
-}