diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-07-18 19:42:28 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-07-18 19:42:28 +0000 |
| commit | cbcaeee5b3b3d1a1ab0a428f880aa9f7bcb7023e (patch) | |
| tree | d7342139fa6c15fcba0c7ec0a371810f1c5ad772 | |
| parent | Convert to eclass-manpages. (diff) | |
| download | gentoo-2-cbcaeee5b3b3d1a1ab0a428f880aa9f7bcb7023e.tar.gz gentoo-2-cbcaeee5b3b3d1a1ab0a428f880aa9f7bcb7023e.tar.bz2 gentoo-2-cbcaeee5b3b3d1a1ab0a428f880aa9f7bcb7023e.zip | |
Use get_libdir instead of hard-coded lib64 (bug #384691).
(Portage version: 2.2.0_alpha119/cvs/Linux x86_64)
| -rw-r--r-- | net-libs/daq/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/daq/daq-0.6.2-r1.ebuild (renamed from net-libs/daq/daq-0.6.2.ebuild) | 17 |
2 files changed, 15 insertions, 10 deletions
diff --git a/net-libs/daq/ChangeLog b/net-libs/daq/ChangeLog index a473786b6efe..aa7a58fb0ecb 100644 --- a/net-libs/daq/ChangeLog +++ b/net-libs/daq/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/daq # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.17 2012/06/27 18:14:47 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.18 2012/07/18 19:42:28 jer Exp $ + +*daq-0.6.2-r1 (18 Jul 2012) + + 18 Jul 2012; Jeroen Roovers <jer@gentoo.org> -daq-0.6.2.ebuild, + +daq-0.6.2-r1.ebuild: + Use get_libdir instead of hard-coded lib64 (bug #384691). 27 Jun 2012; Markus Meier <maekke@gentoo.org> daq-0.6.2.ebuild: add ~arm, bug #407799 diff --git a/net-libs/daq/daq-0.6.2.ebuild b/net-libs/daq/daq-0.6.2-r1.ebuild index f48b7c7e54d2..d70e6422058a 100644 --- a/net-libs/daq/daq-0.6.2.ebuild +++ b/net-libs/daq/daq-0.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.6.2.ebuild,v 1.4 2012/06/27 18:14:47 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-0.6.2-r1.ebuild,v 1.1 2012/07/18 19:42:28 jer Exp $ EAPI="2" @@ -11,7 +11,7 @@ HOMEPAGE="http://www.snort.org/" SRC_URI="http://www.snort.org/downloads/1339 -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc x86" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" IUSE="ipv6 +afpacket +dump +pcap nfq ipq static-libs" DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 ) @@ -43,18 +43,17 @@ src_install() { dodoc ChangeLog README # Remove unneeded .la files - for x in pcap afpacket dump nfq ipq; do - rm "${D}"usr/lib64/daq/daq_${x}.la - done - for y in libdaq libdaq_static libdaq_static_modules libsfbpf; do - rm "${D}"usr/lib64/${y}.la - done + rm \ + "${D}"usr/$(get_libdir)/daq/*.la \ + "${D}"usr/$(get_libdir)/libdaq*.la \ + "${D}"usr/$(get_libdir)/libsfbpf.la \ + || die # If not using static-libs don't install the static libraries # This has been bugged upstream if ! use static-libs; then for z in libdaq_static libdaq_static_modules; do - rm "${D}"usr/lib64/${z}.a + rm "${D}"usr/$(get_libdir)/${z}.a done fi } |