From: Justin Lecher <jlec@gentoo.org>
Date: Wed, 2 Sep 2015 16:52:44 +0000 (+0200)
Subject: dev-python/python-nss: Use append-cflags
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1866e7063bae2aba278602e1a2bc9fe9eea987b4;p=gentoo.git

dev-python/python-nss: Use append-cflags

remove buildtime deps from RDEPEND
drop old

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---

diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest
index cca5c2b0b613..803aafe91fc7 100644
--- a/dev-python/python-nss/Manifest
+++ b/dev-python/python-nss/Manifest
@@ -1,2 +1 @@
-DIST python-nss-0.12.tar.bz2 167007 SHA256 e1084fef686f5b2f74f47fa46a7403d8b747ad14be7d9b3685b1bb105a4283cb SHA512 7772e45e40b66b241d033338b7f9ec8b0d5e1d814e36d0302c24a3a28569f136556249ed6b4c8a30d8db3dec40882de7cfc67dec1ac5fa68e8e7e95c349537e9 WHIRLPOOL e8e2fe15bdbeb2e549f551722832f4a1f2a27efb8d301e46ae428213c9ccc6e7bdeda217d8969abe63eedcd927b3cfe2a3c00e4a4ba08b9ab378e405e5284b5d
 DIST python-nss-0.16.0.tar.bz2 208535 SHA256 cecd3a33c4cb4ab0f5a3c303a733b2eb62a3760b500e6b411313ab3b30f8e575 SHA512 3ff7d29f10942f4d36be8e223b518e046b5502f15029aa684b925cbd131bbc2041f7860abd50ec1344479b6e5594735cc9b7fcd801d7c4d1025f68e11a57cc3f WHIRLPOOL 543f27384b5faa61e2b1d26b54ac896c1a8b96308a6f2e6698cd0c2656667a0f1abc08cbc4143b2a5ca333195cf756936f366ecc614134fdf413e6e812b52e34
diff --git a/dev-python/python-nss/metadata.xml b/dev-python/python-nss/metadata.xml
index 170c1ce97c53..8b50aef611de 100644
--- a/dev-python/python-nss/metadata.xml
+++ b/dev-python/python-nss/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<herd>python</herd>
-<maintainer>
-	<email>andreis.vinogradovs@gmail.com</email>
-</maintainer>
-<maintainer>
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-<longdescription>
+	<herd>proxy-maintainers</herd>
+	<herd>python</herd>
+	<maintainer>
+		<email>andreis.vinogradovs@gmail.com</email>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<longdescription>
 	This package provides Python bindings for Network Security Services (NSS)
 	and the Netscape Portable Runtime (NSPR)
-</longdescription> 
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/python-nss/python-nss-0.12-r1.ebuild b/dev-python/python-nss/python-nss-0.12-r1.ebuild
deleted file mode 100644
index 39737eb241f4..000000000000
--- a/dev-python/python-nss/python-nss-0.12-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PV="$(replace_all_version_separators  '_' )_0"
-DESCRIPTION="Python bindings for Network Security Services (NSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-libs/nss
-	dev-libs/nspr
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/epydoc[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-CFLAGS="${CFLAGS} -fno-strict-aliasing"
-DOCS="README doc/ChangeLog"
-# RHB #754750 ; bgo #390869
-PATCHES=( "${FILESDIR}/python-nss-0.12-rsapssparams.patch" )
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generating API documentation..."
-		mkdir doc/html
-		epydoc --html --docformat restructuredtext -o doc/html \
-			"${BUILD_DIR}"/lib/nss
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && local EXAMPLES=( doc/examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-nss/python-nss-0.16.0.ebuild b/dev-python/python-nss/python-nss-0.16.0.ebuild
index 5ffc04a8889c..2b5431a27721 100644
--- a/dev-python/python-nss/python-nss-0.16.0.ebuild
+++ b/dev-python/python-nss/python-nss-0.16.0.ebuild
@@ -3,9 +3,10 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )	# still only supports py2
 
-inherit distutils-r1 versionator
+inherit distutils-r1 flag-o-matic versionator
 
 MY_PV="$(replace_all_version_separators  '_' )"
 DESCRIPTION="Python bindings for Network Security Services (NSS)"
@@ -17,16 +18,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
-DEPEND="dev-libs/nss
+RDEPEND="
 	dev-libs/nspr
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/epydoc[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/epydoc[${PYTHON_USEDEP}]
+	)"
 
-CFLAGS="${CFLAGS} -fno-strict-aliasing"
 DOCS="README doc/ChangeLog"
 
 python_prepare_all() {
+	append-cflags -fno-strict-aliasing
 	# Remove test file using a dep, called nss-tools, unavailable in portage
 	rm -f test/test_pkcs12.py || die
 	sed -e '/import test_pkcs12/d' \