diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2014-03-29 21:54:57 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2014-03-29 21:54:57 +0000 |
| commit | 4283d378c2550ef1336fde67c8bfc79961a6e7d3 (patch) | |
| tree | 703d4ff9ce8c971b9e9cbee1319e7d3aa32488b5 /net-libs/libnipper | |
| parent | systemd now has subslots (diff) | |
| download | gentoo-2-4283d378c2550ef1336fde67c8bfc79961a6e7d3.tar.gz gentoo-2-4283d378c2550ef1336fde67c8bfc79961a6e7d3.tar.bz2 gentoo-2-4283d378c2550ef1336fde67c8bfc79961a6e7d3.zip | |
Fix multilib-strict issues with libnipper.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 6C20157A)
Diffstat (limited to 'net-libs/libnipper')
| -rw-r--r-- | net-libs/libnipper/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch | 13 | ||||
| -rw-r--r-- | net-libs/libnipper/libnipper-0.12.6-r1.ebuild | 5 |
3 files changed, 22 insertions, 4 deletions
diff --git a/net-libs/libnipper/ChangeLog b/net-libs/libnipper/ChangeLog index 8ac40d75c87a..befb063e72e8 100644 --- a/net-libs/libnipper/ChangeLog +++ b/net-libs/libnipper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libnipper -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnipper/ChangeLog,v 1.11 2013/03/03 05:18:56 dirtyepic Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnipper/ChangeLog,v 1.12 2014/03/29 21:54:56 ikelos Exp $ + + 29 Mar 2014; Mike Auty <ikelos@gentoo.org> libnipper-0.12.6-r1.ebuild, + +files/libnipper-0.12.6-multilib-strict.patch: + Fix multilib-strict issues with libnipper. 03 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> libnipper-0.12.6-r1.ebuild, +files/libnipper-0.12.6-gcc47.patch: diff --git a/net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch b/net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch new file mode 100644 index 000000000000..471236b84f92 --- /dev/null +++ b/net-libs/libnipper/files/libnipper-0.12.6-multilib-strict.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4cc6260..d4518fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -319,7 +319,7 @@ SET(libnipper_SRC + ADD_LIBRARY(nipper SHARED ${libnipper_SRC}) + + # Install... +-INSTALL(TARGETS nipper LIBRARY DESTINATION /usr/lib) ++INSTALL(TARGETS nipper LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + INSTALL(FILES nipper.conf DESTINATION /etc) + INSTALL(FILES libnipper.h config.h DESTINATION /usr/include/libnipper/) + INSTALL(FILES man/nipper.conf.5 DESTINATION /usr/share/man/man5) diff --git a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild b/net-libs/libnipper/libnipper-0.12.6-r1.ebuild index 1a1e9d095a92..6107cedefc3d 100644 --- a/net-libs/libnipper/libnipper-0.12.6-r1.ebuild +++ b/net-libs/libnipper/libnipper-0.12.6-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnipper/libnipper-0.12.6-r1.ebuild,v 1.3 2013/03/03 05:18:56 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libnipper/libnipper-0.12.6-r1.ebuild,v 1.4 2014/03/29 21:54:56 ikelos Exp $ EAPI=4 @@ -19,4 +19,5 @@ IUSE="" PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" "${FILESDIR}/${P}-gcc47.patch" + "${FILESDIR}/${P}-multilib-strict.patch" ) |