summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-06-24 21:21:55 +0000
committerMike Frysinger <vapier@gentoo.org>2013-06-24 21:21:55 +0000
commit397a6a5714e12ca89808948b6d505f78d24753f2 (patch)
treee39a43aa49c09ef37ff32628da172f0c170decc2
parentDepend on mdds-0.9.0. (diff)
downloadhistorical-397a6a5714e12ca89808948b6d505f78d24753f2.tar.gz
historical-397a6a5714e12ca89808948b6d505f78d24753f2.tar.bz2
historical-397a6a5714e12ca89808948b6d505f78d24753f2.zip
Simplify how we install libmnl into / by letting gen_usr_ldscript do all the work. This also avoids installing an empty /lib/pkgconfig dir.
Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64 Manifest-Sign-Key: 0xFB7C4156
-rw-r--r--net-libs/libmnl/ChangeLog6
-rw-r--r--net-libs/libmnl/Manifest20
-rw-r--r--net-libs/libmnl/libmnl-1.0.3-r1.ebuild20
3 files changed, 25 insertions, 21 deletions
diff --git a/net-libs/libmnl/ChangeLog b/net-libs/libmnl/ChangeLog
index 15b38972425a..f1c8bb644bd4 100644
--- a/net-libs/libmnl/ChangeLog
+++ b/net-libs/libmnl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libmnl
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/ChangeLog,v 1.30 2013/04/29 21:16:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/ChangeLog,v 1.31 2013/06/24 21:21:44 vapier Exp $
+
+ 24 Jun 2013; Mike Frysinger <vapier@gentoo.org> libmnl-1.0.3-r1.ebuild:
+ Simplify how we install libmnl into / by letting gen_usr_ldscript do all the
+ work. This also avoids installing an empty /lib/pkgconfig dir.
29 Apr 2013; Jeroen Roovers <jer@gentoo.org> libmnl-1.0.3-r1.ebuild:
Fix building with USE=-static-libs.
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 27d02a35e784..90a07a532c11 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -2,14 +2,24 @@
Hash: SHA256
DIST libmnl-1.0.3.tar.bz2 337375 SHA256 6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de SHA512 c47b76a6125271ef9dce13bc8bebd415d2bbd79b6d50491d8ba23344e7e6fe0c1413fe055913ab9444203f0d73166b79f0d4b532b13b62feecde3e5a8cd442a7 WHIRLPOOL 80717c63015e8df36a11c2b7914d63747ff296fac72b4f3a66670038f94d28961ddc6dce2050c41d3ceaf195030b61535ee84a628fa1fa686d8fed013f4d6261
-EBUILD libmnl-1.0.3-r1.ebuild 1114 SHA256 d10ad023cc98cafa51a4e126e9cbe14ef5c12fec82ea3c9e222bf0c3b0967a7e SHA512 a4f5a0c38480df69f243d0124de74372431dcc84a6e029f1b7ae3399bca24993cf8e99cd36dfc5fba8948b1aa71d5fc556642bf9597d0b9aba9c3d36eedae41e WHIRLPOOL bfe378b013897f003bbfbe6e2b800e1800762ac580bba4de6881280dddbcd1c4f62d98a18746bd5bd00595c4cbae7ad6bee997e474ae902831a8a51fc4410664
+EBUILD libmnl-1.0.3-r1.ebuild 830 SHA256 ba28c0bfe15c70305e3d49dc83fa0d294eef34e739d971cb2e8fbdbe87f9148d SHA512 1cdb249e04b39bf184b9aa3e34da8968fc00326b19ce2515030886168d1675a8bc152bbdce263cf4c8fd555db7f58cfba43165ce275ff29eb3a8d4a6bfa93cf9 WHIRLPOOL fda65c393ab1247282cdad3af5f26a12beb920782ff406be80ce7b02d09f55d02abe721e02ee2a65f49a957ae0bb2c726dd21db124f8c0f5292ba86944dc4ccc
EBUILD libmnl-1.0.3.ebuild 877 SHA256 346ac52d722ccb80031a0d6a89ba5877ef2d36e506b179a365e280f94f89fdef SHA512 68462943ecd46d7de23633e83a426e3a2ed7acfeb7dc2858b583154d0abbbccdce54c4a653ce5c1d898353eed27b7fc3ed5eac83e3c50923b9b8c12ba3d56695 WHIRLPOOL 4ee405b420ce16fe9c876bea7de2d06399e92cd8f4f3ecfe2f65224538eb27ef63113ff0db4e3b8848159b97fa645ba16d10fc3917935194a6bd1bce23b76e2a
-MISC ChangeLog 3689 SHA256 71ae7e3b58b65d6e45184fdb193f3ea566e86c86ecdfb11b07e3d47c86817e44 SHA512 8b61fa64b0c772df9a279f48f69869e47f780a8875b450c41c4c773f912d2fba970f87cdb1d85b17425dc289ae60a8d1b78ede46c2e8674eadf2172691e01e46 WHIRLPOOL a1b4eb6d8f98877e4570c5fe5eb71cee9a5ffed0e137812fc2b39449aa6556498aa650b7bfd8e859e3d18bf201f8549444d064e82707ffe8fe1329661a5f6e06
+MISC ChangeLog 3912 SHA256 bfb78a8c26df33351f943d588082ce0d62dd895ef1967a8c25a5692a93010153 SHA512 ddafe5e32e4a4683ac43e80e7ca25616827ba039ec0461ea8b568318529f6c434c7f33bb9eef2bab53897b4a5730493e7d22dfc3fb55aad1c63d35822d5d54ac WHIRLPOOL 9563c0cf96c6c31933aa0060741fa88162a93b287c8cde7a2ff7752c458016125dba19f557a0c481deafa162b706e7fcf32f409feebf52c5098486792a73ae40
MISC metadata.xml 548 SHA256 28a8017caf4f83aad20dad3aa1af6eab5d5bb6916500459b447ffe2faa543d9d SHA512 155c22299b7a2b59accdf51c8a641e7a12a501e549d1f97f6a655b1d47d3951b0120acb3593eb84cda2baad12b52db31811a100ca672e58f2dd4299c2be69d28 WHIRLPOOL 0c643a51187ef69dd6f2edc91aafdc63e2eba8dba2b122d9efe168733badeef0c5c7cb946a8f5ee5d6d859b14e85a896b6cc127a15b1e2a3b8aeaece8010457c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlF+4zoACgkQVWmRsqeSphOxJQCeLhkzQiOpNfwI/LA9ntj/QfoK
-RfcAn3JaKkEPM+Oq9w4acXvg+NbYZI9l
-=33+7
+iQIcBAEBCAAGBQJRyLhrAAoJELEHsLL7fEFWJ9UP/iaOwTcoZBk2kNEg9/n5zxvO
+5Nm4yn+J1+DiLNIUlmIiR+jbyKnbA9bgFUBVon72Id6Tx6vpo2cLVDbtp+Dqk8/p
+OgSKCcKa9drVESDoQefIFR9N4O40MqwHuEQNpluJyd/GAxeQC4iWgXVrBekpwoeL
+D/rH6nHYjcWu+Po+kQjTXO4gjlsMNZjLv32jlw33Il947x3aGgFzNiR4SssC/UfE
+1Wu5D4B2gOQ5pnqNu88NBKUF6lgQQ3nFV02QIHDrjnhZ499l4Q/XFG1am0kNA+du
+N8+iss1QwpBk7nmEd11Heu6bZyEWMYp4EZuYPVyAdm6SF2B5rL4bQ98ctQ5+mpcT
+tpUwrQTMrfAmQX47YaTZM5X5wT+HvNTJWygtmPACaHo5arGO0C4ykqfF1XdXk24+
+Qrg7GOhptuoLkTwbk6twTHPILtUW9Wdc5BPONxVJvvzVQj4tGB51Wy70lTOBQcMz
+AjjywJVVnWe5DFOG3KRLdd3i6eD7aYKrX4rtDqanX/zLiXNgc4xq5wU0k0SST2i3
+BAXVCJL0kgbohiSQBJ9fpwwZr85/oLXa4hcZZNWy/P02SqafjmKZxHZ/hL8dZoQQ
++8xNSnwPEecXALJXJPKEJPsoRRsCSGGn+z8ywpEHF07JMKB334LRP9Sc7bvWsPzv
+aBF5dwzIof6VlFKbXqNm
+=nDIb
-----END PGP SIGNATURE-----
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index 0ad8e731b8bb..81f5ec05db22 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.2 2013/04/29 21:16:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.3 2013/06/24 21:21:43 vapier Exp $
EAPI=4
-inherit eutils multilib toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="Minimalistic netlink library"
HOMEPAGE="http://netfilter.org/projects/libmnl"
@@ -16,27 +16,17 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE="examples static-libs"
src_configure() {
- econf \
- $(use_enable static-libs static) \
- --libdir="${EPREFIX}"/$(get_libdir)
+ econf $(use_enable static-libs static)
}
src_install() {
default
- dodir /usr/$(get_libdir)/pkgconfig/
- mv "${ED}"/{,usr/}$(get_libdir)/pkgconfig/libmnl.pc || die
-
- if use static-libs; then
- mv "${ED}"/{,usr/}$(get_libdir)/libmnl.a || die
- mv "${ED}"/{,usr/}$(get_libdir)/libmnl.la || die
- gen_usr_ldscript libmnl.so
- fi
+ gen_usr_ldscript -a mnl
+ prune_libtool_files
if use examples; then
find examples/ -name 'Makefile*' -delete
dodoc -r examples/
docompress -x /usr/share/doc/${PF}/examples
fi
-
- prune_libtool_files
}