diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-09-10 22:50:33 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-09-10 22:50:50 +1000 |
| commit | fe8a2e39d517000c96acb39a9c3c9640eac9f7f2 (patch) | |
| tree | 9ac4bd7dddd0d576d789bd3ae9dcfdda270c7a8e | |
| parent | net-analyzer/nmapsi: remove old. (diff) | |
| download | gentoo-fe8a2e39d517000c96acb39a9c3c9640eac9f7f2.tar.gz gentoo-fe8a2e39d517000c96acb39a9c3c9640eac9f7f2.tar.bz2 gentoo-fe8a2e39d517000c96acb39a9c3c9640eac9f7f2.zip | |
net-analyzer/nmapsi: add patch fixing build with kde-base/kdelibs-4.14.11.
Gentoo-bug: 558574
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch | 22 | ||||
| -rw-r--r-- | net-analyzer/nmapsi/nmapsi-0.4.1.ebuild | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch b/net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch new file mode 100644 index 000000000000..f5a338ad7a9d --- /dev/null +++ b/net-analyzer/nmapsi/files/nmapsi-0.4.1-kdelibs-4.14.11.patch @@ -0,0 +1,22 @@ +The uninstall target is created automatically by FindKDE4Internal. Due to +cmake policy changes in kdelibs-4.14.11, this target name collision causes +a build failure. + +https://bugs.gentoo.org/show_bug.cgi?id=558574 + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -35,13 +35,6 @@ + + add_subdirectory( src ) + +-CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake_uninstall.cmake.in" +- "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" +- IMMEDIATE @ONLY ) +- +-ADD_CUSTOM_TARGET( uninstall +- "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" ) +- + message("-------------------------------------------------------------------") + message(" Required for build: qt4-dev (>>= 4.6) ") + message(" Required for runtime: nmap+nping ( >= 6.00 ), dig ") diff --git a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild index ffb545d0cd18..6457fee79399 100644 --- a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild +++ b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -34,9 +34,11 @@ RDEPEND="${DEPEND} S=${WORKDIR}/${MY_P} DOCS=( AUTHORS HACKING NEWS TODO Translation ) +PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" ) src_prepare() { l10n_for_each_disabled_locale_do nmapsi_disable_locale + cmake-utils_src_prepare } src_configure() { |