Remove library USE as it doesn't work the expected way

Package-Manager: portage-2.2.14
RepoMan-Options: --force
Manifest-Sign-Key: 0xA5C1A1D24B128E52

3 files changed, 21 insertions, 28 deletions

diff --git a/net-misc/i2pd/ChangeLog b/net-misc/i2pd/ChangeLog
index 01f57d0..57b0f39 100644
--- a/net-misc/i2pd/ChangeLog
+++ b/net-misc/i2pd/ChangeLog
@@ -1,5 +1,8 @@
 
 
+  07 Jan 2015; Francisco Blas Izquierdo Riera (klondike) i2pd-0.6.0.ebuild:
+  Remove library USE as it doesn't work the expected way
+
 *i2pd-0.6.0 (06 Jan 2015)
 
   06 Jan 2015; Francisco Blas Izquierdo Riera (klondike) +i2pd-0.6.0.ebuild,
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index 03837ab..105d69a 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -11,18 +11,18 @@ AUX i2pd.service 412 SHA256 afc2b4a72e3bec2c45a838971375a1e8a438bc9cb09a082f1385
 DIST i2pd-0.5.0.tar.gz 352460 SHA256 7f2033fe1c380c458722d68f611d0fa69a844ceba71db13a918adac6e01a0594 SHA512 08c51dc5fa3712af54b7dcc9f4524fb19d7b42a279646c7852efdf1fd49cf4ea24192c936229954c3733ba4bcbc480205bcfeca739ffae3642f5c62bd24e0cf6 WHIRLPOOL 1812a8733f17cd6b9885cf8af3ad0412f238356121118d46fbed53cb826aaa6c878a045adb69e0a692fd5cd3fc720192c635f4e594d3d42efb2116f14bbba9e9
 DIST i2pd-0.6.0.tar.gz 360829 SHA256 149a8c2d870ebc3988aea06eec906c9e968b3d89ae282bd3b2b5ead205f7c3b7 SHA512 084c75c5f972dbc07740119c3ae1711924cf740391703a95752164eab7a04d6cea0cfb302530e1e1bebafb54f9eed552e747479ae55fb053e824cdf059ab3266 WHIRLPOOL a858a49173755e052f31a95f4f7075965dac0c89943a7dc05c3c88d51b646ab86a7510a9533e33d9c5f0e7736e9f702f6fd0de4e6a841cc3ec57ea5aaf2b991c
 EBUILD i2pd-0.5.0.ebuild 1845 SHA256 d359c5eae64a9421cb831938eee3d4d8a484cd872169b40c0b93bda40b7b2420 SHA512 f2844531b16a4be3609bda365326354d3ecae205434bffe4eaa2e5b4177f723e97be2ae1d222bb9a28d6e40c015dea09071bccc7b2a7faa9ceb23009b32b6cdb WHIRLPOOL e1d8c5c591479d80f5912a7d5bf0e17b1b0f0323260506862a03000d345aaded6bc9172e5cecdc24a9a3804316175a81665f1a18724431ca4c6074d7ae2a900f
-EBUILD i2pd-0.6.0.ebuild 2329 SHA256 5c80e418d8ed074afffc7b917e339abfad64f46dcf3f5b2d59fd46d05e563728 SHA512 e5d28ba5200fe2a6d37422ee8c68482aa6cd021e82ce75bbe5325d122796b06e477221a0e991c31e7a3b17b43705a015cab3bb4e5a0ab072bf1ed6a8093e9207 WHIRLPOOL 129850acf9c38a368757e0b664e0199ccf14ce5bce44870b98cdadb349bf3c35dd5a7e53ffef8298939bfb0d84a3376bec96f9fa80214b87d95560bf5e9acbbe
+EBUILD i2pd-0.6.0.ebuild 1882 SHA256 8bf8e74e0d6df36d791964ab62d943d348ec60dcf192dcf4a7edfe8f78ea6b83 SHA512 79e343eedcb4f5940973e251275973159fba4c71e205a4ca029eb37c4ebbf54df893655a3ac897ef972a98fbbbc2aec09ac01a1ea95aee8be4bcb1307e883fb0 WHIRLPOOL 30c1032a9561f21e6b926b6af1bc39374032b7ae2a3f6d8c6aba0da612e5603be0184204722b427bb8cd9b735a74922577e171edca64e8a220fef0c9aa82f33a
 EBUILD i2pd-9999.ebuild 2313 SHA256 c0e1c345d04eb3052f43a419c25222f25aa673435c213215ec181817c60dfa2b SHA512 664a1b9e573919898406a1cda8ab1b9d4e166b47ebd253a4605ce5bef984f34b8f352c8849c1b700954b5e16c87eaf9a8f3e40834badbb5b36a805b5b106fc12 WHIRLPOOL c021c2a6bbd3962765741120c149a59074a0e3509202f22e186edae37705d93f4739dab53b2d9fd410ed8e81596cc447a87d6439e9ac75e4bb2f3537fe3b7a4e
-MISC ChangeLog 1358 SHA256 1c766dee2c42bf48e33b84020ff082e441edd2dcac820b20736899d6c8e35815 SHA512 32cf651b799621d741715766a65d2aac11920b47f4f1cfea912a41da12d5abf4120da580f1e73ab0dbf974041b5826d27c033884ba860ea1268c710e4fd20c8e WHIRLPOOL 6d22af71c8d057743bbe181435777e2508fc8873f87e7ae4198d90a2ad1d20b5c61f6b256ae008d7e07ff083b63b3956048e6bbb4a1ec779462832bda99213e2
+MISC ChangeLog 1492 SHA256 f3c31070c1683aabc1693b0019f3d321b8475725a6191eb7f81fc5cee6d27e1f SHA512 0f3c7abe79f3e45edcd8c21dd429471bea3cffe24acc2e38974aae89d661b0a96d7ef1a8a1a75978389caebad265a255012471d87681cf6dac3ac3e1993281d5 WHIRLPOOL 20c0b2fb57f1a6011c667d3189a8be4769585c1a5dfe607807d4d1cf3c2adc99a4ac11b6e50b7e0506026efd0b82b26df75c84bda85668148e9e8f30309938e8
 MISC metadata.xml 505 SHA256 94805fb4a94ff250fb81c585d9088f9575b6cef36b717bee72a566fe7a9d13aa SHA512 c4ff8b6c0535316934c77fd3c5249481a4c2a619a4f743b7f7784ff25e1b2839690239581c1d92b4176d4369c4f6a5a488f206c3ed6cc0433843e08b1f2c20f5 WHIRLPOOL 8231dfd31bdbc80c375f3efc8f190c10bd208c553e070ae3181bcf3d7e0760b540877a90f347080c43984c6a6a3815e91f5e211972058b444869b43b82c7e710
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUq+4IAAoJEKXBodJLEo5SZFYIAJAVh519Lmm0CbWfsq4i0IZ1
-NimACx1GBJ6r4C0XGurb3gVkQMgfLpfNMI46A/ljTy9nukll9pdGGaPYvz86V3GE
-o/x5goR/At/iHdNjbWkAyeWoLZZt97hljZEbsGd2K7BmYwJXxYkjrBWkOx69olia
-6VLSqsY5mFanAl3oZI2mtJ33f8Nd2c2eseLJBbeBJXhzJgLjJdqzfftfrtDF9VeY
-R8lDn/k+xtD7l1xfnzZnubo+r/dYlAe/Jp3GYM9Hg8+PbZ6CeQWQQGvpncUiUWC/
-Z03FGj5TpHsntzqS7E7uWZgYuulWRhzazCekTXjxeka0FWmXsy5/jamouCsh0G8=
-=STmh
+iQEcBAEBCAAGBQJUrTYaAAoJEKXBodJLEo5SHsgIAM+A35FzdxLL4RmqkvazEyx2
++ZTgQ56MUtP7bVBS8VlsHxolEVOCI+8Xayk99OoSX8tpIdiBENnrhprHFMu3QNql
+uq0QISoceXYIeTcPXd/H8+kSmiIw1QnIJa3dLSPJFsl1VHSr+OdkB+J+m42AGqsP
+K/iw1hPTNUvjuEleHBsqkUcKvHJA7dNAYCOXJS8UcrR8PmATQiv64hMbG/yeRUWn
+jIDNUgScjd0l0SPWlbNvGdL/+tVQ5rfawI4e0E89RSNIuCLFmrzQcQ6nLYqN4zqj
+5Oj9bo6eR4Oy+jQyVnB0oumU3sF2B0kenWXuzN2l2EKlpD2RBnGpduFW1RULtt4=
+=bnoT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/i2pd/i2pd-0.6.0.ebuild b/net-misc/i2pd/i2pd-0.6.0.ebuild
index cb34044..9c4ddb1 100644
--- a/net-misc/i2pd/i2pd-0.6.0.ebuild
+++ b/net-misc/i2pd/i2pd-0.6.0.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit eutils systemd user cmake-multilib
+inherit eutils systemd user cmake-utils
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PrivacySolutions/i2pd"
@@ -11,12 +11,10 @@ SRC_URI="https://github.com/PrivacySolutions/${PN}/archive/${PV}.tar.gz -> ${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aesni i2p-hardening library static"
+IUSE="aesni i2p-hardening static"
 
 RDEPEND="!static? ( >=dev-libs/boost-1.46[threads] )
-	!static? ( dev-libs/crypto++ )
-	library? ( >=dev-libs/boost-1.46[threads,${MULTILIB_USEDEP}] )
-	library? ( dev-libs/crypto++[${MULTILIB_USEDEP}] )"
+	!static? ( dev-libs/crypto++ )"
 DEPEND="${RDEPEND}
 	static? ( >=dev-libs/boost-1.46[static-libs,threads] )
 	static? ( dev-libs/crypto++[static-libs] )
@@ -29,27 +27,19 @@ I2PD_GROUP="${I2PD_GROUP:-i2pd}"
 
 CMAKE_USE_DIR="${S}/build"
 
-multilib_src_configure() {
+src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with aesni AESNI)
 		$(cmake-utils_use_with i2p-hardening HARDENING)
-		$(cmake-utils_use_with library LIBRARY)
 		$(cmake-utils_use_with static STATIC)
-		$(multilib_is_native_abi && echo -DWITH_BINARY=ON \
-					|| echo -DWITH_BINARY=OFF)
+		-DWITH_LIBRARY=OFF
+		-DWITH_BINARY=ON
 	)
-	(multilib_is_native_abi || use library) && cmake-utils_src_configure
+	cmake-utils_src_configure
 }
 
-multilib_src_compile() {
-	(multilib_is_native_abi || use library) && cmake-utils_src_compile
-}
-
-multilib_src_install() {
-	(multilib_is_native_abi || use library) && cmake-utils_src_install
-}
-
-multilib_src_install_all() {
+src_install() {
+	cmake-utils_src_install
 	dodoc README.md
 	doman "${FILESDIR}/${PN}.1"
 	keepdir /var/lib/i2pd/