--- /var/package-manager/portage/net-analyzer/nmap/nmap-6.25.ebuild	2014-08-28 14:31:13.000000000 +0400
+++ nmap-6.25.ebuild	2014-11-11 23:35:46.000000000 +0300
@@ -2,9 +2,11 @@
 # 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"
+EAPI=5
 
-inherit eutils flag-o-matic python toolchain-funcs
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="sqlite"
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P=${P/_beta/BETA}
 
@@ -20,27 +22,25 @@
 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"
+REQUIRED_USE="
+	gtk? ( ${PYTHON_REQUIRED_USE} )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+"
 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}
+		>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
 	)
 	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
+	ndiff? ( ${PYTHON_DEPS} )
 	nls? ( virtual/libintl )
 	nmap-update? ( dev-libs/apr dev-vcs/subversion )
 	ssl? ( dev-libs/openssl )
@@ -54,7 +54,7 @@
 
 pkg_setup() {
 	if use gtk || use ndiff; then
-		python_set_active_version 2
+		python-single-r1_pkg_setup
 	fi
 }
 
@@ -144,5 +144,8 @@
 
 	dodoc CHANGELOG HACKING docs/README docs/*.txt
 
-	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
+	if use gtk; then
+		python_optimize "${ED}"/$(python_get_sitedir)
+		doicon "${DISTDIR}/nmap-logo-64.png"
+	fi
 }