Version bump to latest RC. Drop older.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

4 files changed, 17 insertions, 31 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index acf5a5709164..17ed9314d7ad 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/opendnssec
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.4 2011/06/08 22:34:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.5 2011/07/01 19:21:53 scarabeus Exp $
+
+*opendnssec-1.3.0_rc3 (01 Jul 2011)
+
+  01 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -opendnssec-1.3.0_rc2-r1.ebuild, +opendnssec-1.3.0_rc3.ebuild,
+  -files/opendnssec-rename-test.patch, files/opendnssec-use-system-trang.patch:
+  Version bump to latest RC. Drop older.
 
   08 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   opendnssec-1.3.0_rc2-r1.ebuild:
diff --git a/net-dns/opendnssec/files/opendnssec-rename-test.patch b/net-dns/opendnssec/files/opendnssec-rename-test.patch
deleted file mode 100644
index 39ef26248519..000000000000
--- a/net-dns/opendnssec/files/opendnssec-rename-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/conf/Makefile.am
-+++ b/conf/Makefile.am
-@@ -27,7 +27,7 @@ SUFFIXES = .rng .rnc .xml
- 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
- 	${TRANG} $< $@
- 
--regress: $(RNG)
-+check: $(RNG)
- 	@test -x ${XMLLINT} || \
- 		(echo "xmllint is required for regression tests"; false)
- 	@for i in ${XML}; do \
diff --git a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
index 967b3bbdca7e..39678408264a 100644
--- a/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
+++ b/net-dns/opendnssec/files/opendnssec-use-system-trang.patch
@@ -1,6 +1,7 @@
---- a/conf/Makefile.am
-+++ b/conf/Makefile.am
-@@ -7,7 +7,7 @@ RNG =	conf.rng kasp.rng zonelist.rng sig
+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
+@@ -7,7 +7,7 @@
  XML =	conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
  XSL=	kasp2html.xsl
  
@@ -9,22 +10,12 @@
  
  sysconfdir = @sysconfdir@/opendnssec
  datadir = @datadir@/opendnssec
-@@ -16,9 +16,6 @@ noinst_DATA = ${XML} ${XSL}
- 
- dist_data_DATA = ${RNG} ${RNC} ${XSL}
- 
--EXTRA_DIST =	${TRANG} \
--		$(srcdir)/trang/copying.txt
--
- CLEANFILES =+		*.xml
- DISTCLEANFILES =+	*.rng
- 
-@@ -28,7 +25,7 @@ SUFFIXES = .rng .rnc .xml
+@@ -25,7 +25,7 @@
  .rnc.rng:
- 	@test -x ${JAVA} || \
+ 	@test -x "${JAVA}" || \
  		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
 -	${JAVA} -jar ${TRANG} $< $@
 +	${TRANG} $< $@
  
  regress: $(RNG)
- 	@test -x ${XMLLINT} || \
+ 	@test -x "${XMLLINT}" || \
diff --git a/net-dns/opendnssec/opendnssec-1.3.0_rc2-r1.ebuild b/net-dns/opendnssec/opendnssec-1.3.0_rc3.ebuild
index 07026e160c61..15df2ede752c 100644
--- a/net-dns/opendnssec/opendnssec-1.3.0_rc2-r1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.0_rc2-r1.ebuild,v 1.2 2011/06/08 22:34:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.0_rc3.ebuild,v 1.1 2011/07/01 19:21:53 scarabeus Exp $
 
 EAPI=4
 
@@ -50,10 +50,9 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-use-system-trang.patch"
 	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-rename-test.patch"
 	"${FILESDIR}/${PN}-drop-privileges.patch"
+	"${FILESDIR}/${PN}-use-system-trang.patch"
 )
 
 S="${WORKDIR}/${MY_P}"