Old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 6 insertions, 498 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index b31c29519f4d..25bb43920bbf 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.331 2014/12/03 09:57:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.332 2014/12/03 10:08:28 jer Exp $
+
+  03 Dec 2014; Jeroen Roovers <jer@gentoo.org> -nmap-6.01.ebuild,
+  -nmap-6.25.ebuild, -nmap-6.25-r1.ebuild,
+  -files/nmap-5.51-su-to-zenmap-fix.patch, -files/nmap-6.25-lua.patch:
+  Old.
 
   03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> nmap-6.47-r1.ebuild:
   Stable for ppc, wrt bug #480474
diff --git a/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch b/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch
deleted file mode 100644
index a2b53907752a..000000000000
--- a/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh
---- nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:08:06.141000195 +0200
-+++ nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:09:00.487000200 +0200
-@@ -40,8 +40,8 @@ else
-     fi
-     case $SU_TO_ROOT_X in
-       gksu) gksu -u "$PRIV" "$COMMAND";;
--      kdesu) kdesu -u "$PRIV" "$COMMAND";;
--      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-+      kdesu) kdesu -u "$PRIV" $COMMAND;;
-+      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" $COMMAND;;
-       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
-   # As a last resort, open a new xterm use sudo/su
-       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
diff --git a/net-analyzer/nmap/files/nmap-6.25-lua.patch b/net-analyzer/nmap/files/nmap-6.25-lua.patch
deleted file mode 100644
index 4f7786c37b68..000000000000
--- a/net-analyzer/nmap/files/nmap-6.25-lua.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/output.h
-+++ b/output.h
-@@ -226,6 +226,10 @@
- void printscriptresults(ScriptResults *scriptResults, stype scantype);
- 
- void printhostscriptresults(Target *currenths);
-+
-+/*This is a helper function to determine the ordering of the script results
-+  based on their id */
-+bool comparescriptids(ScriptResult first, ScriptResult second);
- #endif
- 
- /* Print a table with traceroute hops. */
-@@ -253,8 +257,4 @@
-    were found. */
- void printdatafilepaths();
- 
--/*This is a helper function to determine the ordering of the script results
--  based on their id */
--bool comparescriptids(ScriptResult first, ScriptResult second);
--
- #endif /* OUTPUT_H */
---- a/output.cc
-+++ b/output.cc
-@@ -2613,6 +2613,7 @@
-   }
- }
- 
-+#ifndef NOLUA
- /*This is a helper function to determine the ordering of the script results
-   based on their id */
- bool comparescriptids(ScriptResult first, ScriptResult second){
-@@ -2625,5 +2626,6 @@
-     else
-         return false;
- }
-+#endif
- 
- 
---- a/portlist.cc
-+++ b/portlist.cc
-@@ -144,6 +144,7 @@
-   }
- }
- 
-+#ifndef NOLUA
- void Port::freeScriptResults(void)
- {
-     while (!scriptResults.empty()) {
-@@ -151,6 +152,7 @@
-         scriptResults.pop_front();
-     }
- }
-+#endif
- 
- /* Fills in namebuf (as long as there is space in buflen) with the
-    Name nmap normal output will use to describe the port.  This takes
---- a/Target.cc
-+++ b/Target.cc
-@@ -162,10 +162,12 @@
- 
- Target::~Target() {
-   FreeInternal();
-+#ifndef NOLUA
-   while (!scriptResults.empty()) {
-     scriptResults.front().clear();
-     scriptResults.pop_front();
-   }
-+#endif
- }
- 
- void Target::FreeInternal() {
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
deleted file mode 100644
index f95dccb79d66..000000000000
--- a/net-analyzer/nmap/nmap-6.01.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.26 2014/08/28 10:07:45 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic python toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk lua ncat ndiff nmap-update nping ssl"
-
-NMAP_PYTHON_DEPEND="
-|| (
-	dev-lang/python:2.7[sqlite]
-)
-"
-DEPEND="
-	dev-libs/apr
-	dev-libs/libpcre
-	net-libs/libpcap
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		>=dev-python/pygtk-2.6
-		${NMAP_PYTHON_DEPEND}
-	)
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gtk || use ndiff; then
-		python_set_active_version 2
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
-	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	epatch "${FILESDIR}"/${PN}-5.21-python.patch
-	epatch "${FILESDIR}"/${PN}-5.51-su-to-zenmap-fix.patch
-	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
-
-	# bug #416987
-	epatch "${FILESDIR}"/${P}-make.patch
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.25-r1.ebuild b/net-analyzer/nmap/nmap-6.25-r1.ebuild
deleted file mode 100644
index 42426464683e..000000000000
--- a/net-analyzer/nmap/nmap-6.25-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25-r1.ebuild,v 1.3 2014/11/12 16:28:24 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
-NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
-for lingua in ${NMAP_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-REQUIRED_USE="
-	gtk? ( ${PYTHON_REQUIRED_USE} )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gtk || use ndiff; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-lua.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || die
-
-	mv docs/man-xlate/${PN}-j{p,a}.1 || die
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS}; do
-			if ! use linguas_${lingua}; then
-				rm -rf zenmap/share/zenmap/locale/${lingua}
-				rm -f zenmap/share/zenmap/locale/${lingua}.po
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS}; do
-			rm -rf zenmap/share/zenmap/locale/${lingua}
-			rm -f zenmap/share/zenmap/locale/${lingua}.po
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use gtk; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
deleted file mode 100644
index 0e2fd54bc3c5..000000000000
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.30 2014/08/28 10:07:45 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic python toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
-NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
-for lingua in ${NMAP_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-NMAP_PYTHON_DEPEND="
-|| (
-	dev-lang/python:2.7[sqlite]
-)
-"
-RDEPEND="
-	dev-libs/apr
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		>=dev-python/pygtk-2.6
-		${NMAP_PYTHON_DEPEND}
-	)
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gtk || use ndiff; then
-		python_set_active_version 2
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-lua.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || die
-
-	mv docs/man-xlate/${PN}-j{p,a}.1 || die
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS}; do
-			if ! use linguas_${lingua}; then
-				rm -rf zenmap/share/zenmap/locale/${lingua}
-				rm -f zenmap/share/zenmap/locale/${lingua}.po
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS}; do
-			rm -rf zenmap/share/zenmap/locale/${lingua}
-			rm -f zenmap/share/zenmap/locale/${lingua}.po
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
-}