Version bum. Drop old versions. files/ cleanup

(Portage version: 2.2.0_alpha187/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

8 files changed, 32 insertions, 278 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index f39a13f6963f..f897af7deb01 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-dns/opendnssec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.25 2013/05/12 22:03:21 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.26 2013/07/08 11:43:49 mschiff Exp $
+
+  08 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.3.13.ebuild,
+  -opendnssec-1.4.0.ebuild, +opendnssec-1.4.1.ebuild,
+  -files/opendnssec-drop-privileges-1.4.0.patch,
+  -files/opendnssec-use-system-trang-1.4.0.patch,
+  files/opendnssec-drop-privileges.patch,
+  files/opendnssec-use-system-trang.patch, metadata.xml:
+  Drop old ebuild and cleanup patches.
+
+*opendnssec-1.4.1 (08 Jul 2013)
+
+  08 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.4.0.ebuild,
+  +opendnssec-1.4.1.ebuild:
+  Version bump.
 
 *opendnssec-1.4.0 (12 May 2013)
 
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges-1.4.0.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges-1.4.0.patch
deleted file mode 100644
index c1972bbc3d1b..000000000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges-1.4.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/conf.xml.in.orig	2013-05-12 22:36:47.530988182 +0200
-+++ conf/conf.xml.in	2013-05-12 22:37:56.459817918 +0200
-@@ -38,12 +38,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- <!-- NOTE: Enforcer worker threads are not used; this option is ignored -->
- <!--
- 		<WorkerThreads>4</WorkerThreads>
-@@ -60,12 +58,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
index 7c9f72355d20..c1972bbc3d1b 100644
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
+++ b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
@@ -1,7 +1,5 @@
-Index: conf/conf.xml.in
-===================================================================
---- conf/conf.xml.in	(revision 3022)
-+++ conf/conf.xml.in	(working copy)
+--- conf/conf.xml.in.orig	2013-05-12 22:36:47.530988182 +0200
++++ conf/conf.xml.in	2013-05-12 22:37:56.459817918 +0200
 @@ -38,12 +38,10 @@
  	</Common>
  
@@ -12,10 +10,10 @@ Index: conf/conf.xml.in
  			<Group>opendnssec</Group>
  		</Privileges>
 --->
- 
- 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- 		<Interval>PT3600S</Interval>
-@@ -56,12 +54,10 @@
+ <!-- NOTE: Enforcer worker threads are not used; this option is ignored -->
+ <!--
+ 		<WorkerThreads>4</WorkerThreads>
+@@ -60,12 +58,10 @@
  	</Enforcer>
  
  	<Signer>
@@ -27,17 +25,4 @@ Index: conf/conf.xml.in
 --->
  
  		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>8</WorkerThreads>
-@@ -80,12 +76,10 @@
- 	</Signer>
- 
- 	<Auditor>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 	</Auditor>
+ 		<WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-use-system-trang-1.4.0.patch b/net-dns/opendnssec/files/opendnssec-use-system-trang-1.4.0.patch
deleted file mode 100644
index 745b277e1339..000000000000
--- a/net-dns/opendnssec/files/opendnssec-use-system-trang-1.4.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- conf/Makefile.am.orig	2013-05-12 22:45:26.514768943 +0200
-+++ conf/Makefile.am	2013-05-12 22:46:33.399545628 +0200
-@@ -7,7 +7,7 @@
- XML =	addns.xml conf.xml kasp.xml zonelist.xml signconf.xml enforcerstate.xml
- XSL=	kasp2html.xsl
- 
--TRANG=		$(srcdir)/trang/trang.jar
-+TRANG=		/usr/bin/trang
- TRANG_URL	"https://code.google.com/p/jing-trang/"
- 
- sysconfdir = @sysconfdir@/opendnssec
-@@ -31,7 +31,7 @@
- .rnc.rng:
- 	@test -x "${JAVA}" || \
- 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
--	${JAVA} -jar ${TRANG} $< $@
-+	${TRANG} $< $@
- 
- regress: $(RNG)
- 	@test -x "${XMLLINT}" || \
diff --git a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
index 39678408264a..745b277e1339 100644
--- a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
+++ b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
@@ -1,16 +1,15 @@
-diff -urN opendnssec-1.3.0rc3.old/conf/Makefile.am opendnssec-1.3.0rc3/conf/Makefile.am
---- opendnssec-1.3.0rc3.old/conf/Makefile.am	2011-07-01 21:15:25.000000000 +0200
-+++ opendnssec-1.3.0rc3/conf/Makefile.am	2011-07-01 21:17:00.000000000 +0200
+--- conf/Makefile.am.orig	2013-05-12 22:45:26.514768943 +0200
++++ conf/Makefile.am	2013-05-12 22:46:33.399545628 +0200
 @@ -7,7 +7,7 @@
- XML =	conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
+ XML =	addns.xml conf.xml kasp.xml zonelist.xml signconf.xml enforcerstate.xml
  XSL=	kasp2html.xsl
  
--TRANG=	$(srcdir)/trang/trang.jar
-+TRANG=	/usr/bin/trang
+-TRANG=		$(srcdir)/trang/trang.jar
++TRANG=		/usr/bin/trang
+ TRANG_URL	"https://code.google.com/p/jing-trang/"
  
  sysconfdir = @sysconfdir@/opendnssec
- datadir = @datadir@/opendnssec
-@@ -25,7 +25,7 @@
+@@ -31,7 +31,7 @@
  .rnc.rng:
  	@test -x "${JAVA}" || \
  		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
index 90d860ca7097..b7a8529a61e3 100644
--- a/net-dns/opendnssec/metadata.xml
+++ b/net-dns/opendnssec/metadata.xml
@@ -5,8 +5,6 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='auditor'>Enables auditing capabilities for OpenDNSSEC</flag>
-		<flag name='eppclient'>Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
 		<flag name='signer'>Enables signing capabilities for OpenDNSSEC</flag>
 		<flag name='opensc'>Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
 		<flag name='softhsm'>Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
diff --git a/net-dns/opendnssec/opendnssec-1.3.13.ebuild b/net-dns/opendnssec/opendnssec-1.3.13.ebuild
deleted file mode 100644
index 735ad707a276..000000000000
--- a/net-dns/opendnssec/opendnssec-1.3.13.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.13.ebuild,v 1.1 2013/03/04 19:35:14 mschiff Exp $
-
-EAPI=4
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit base autotools multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="http://www.opendnssec.org/"
-SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=net-libs/ldns-1.6.12
-	auditor? ( dev-lang/ruby[ssl] dev-ruby/dnsruby )
-	curl? ( net-misc/curl )
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-# test? dev-util/cunit # Requires running test DB
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-	eppclient? ( curl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-drop-privileges.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS README )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	local i
-
-	for i in eppclient mysql; do
-		if use ${i}; then
-			ewarn "Usage of ${i} is considered experimental."
-			ewarn "Do not report bugs against this feature."
-		fi
-	done
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# $(use_with test cunit "${EPREFIX}/usr/") \
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_with curl) \
-		$(use_enable auditor) \
-		$(use_enable debug timeshift) \
-		$(use_enable eppclient) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	use sqlite && doins enforcer/utils/migrate_keyshare_sqlite3.pl
-	use mysql && doins enforcer/utils/migrate_keyshare_mysql.pl
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{conf,kasp,zonelist,zonefetch}.xml
-	use eppclient && fowners root:opendnssec /etc/opendnssec/eppclientd.conf
-
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-	fowners opendnssec:opendnssec /run/opendnssec
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.0.ebuild b/net-dns/opendnssec/opendnssec-1.4.1.ebuild
index 2ddaa1c64723..9811b9152e79 100644
--- a/net-dns/opendnssec/opendnssec-1.4.0.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.4.0.ebuild,v 1.1 2013/05/12 22:03:21 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.4.1.ebuild,v 1.1 2013/07/08 11:43:49 mschiff Exp $
 
 EAPI=4
 
@@ -48,8 +48,8 @@ REQUIRED_USE="
 PATCHES=(
 	"${FILESDIR}/${PN}-fix-localstatedir.patch"
 	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-drop-privileges-${PV}.patch"
-	"${FILESDIR}/${PN}-use-system-trang-${PV}.patch"
+	"${FILESDIR}/${PN}-drop-privileges.patch"
+	"${FILESDIR}/${PN}-use-system-trang.patch"
 )
 
 S="${WORKDIR}/${MY_P}"