Version bumped. Removed CFALGS="-g -O2", bug #385151.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index 825d1c1c91a42127c18b15cc57817db7a1af3e6f..07e4889f0afd38660083e7a7b521e12307c7f325 100644 (file)
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/ldns
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.21 2011/10/06 14:40:09 chainsaw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.22 2012/01/11 15:25:31 matsuu Exp $
+
+*ldns-1.6.12 (11 Jan 2012)
+
+  11 Jan 2012; MATSUU Takuto <matsuu@gentoo.org> +files/1.6.12-cflags.patch,
+  -ldns-1.6.4.ebuild, -ldns-1.6.9.ebuild, -ldns-1.6.10.ebuild,
+  +ldns-1.6.12.ebuild:
+  Version bumped. Removed CFALGS="-g -O2", bug #385151. Removed old versions.
 
   06 Oct 2011; Tony Vroon <chainsaw@gentoo.org> ldns-1.6.11.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian

diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 72195b4aee47fd0dc0b03cc40666df63242963f6..f5a1c35677882ded7c8a94b60e1f7a599d2974cd 100644 (file)
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,20 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ldns-1.6.10.tar.gz 999717 RMD160 0401368c96c5b1ae9a781ee4c9441652a5e86af5 SHA1 7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4 SHA256 a421aa71230045e0d22a97db8c4ffbc049ee06b064de141912da270db7217a8f
+AUX 1.6.12-cflags.patch 597 RMD160 e7c8e21f71acb27ca363179aa0e735d3d158a08d SHA1 2ff51cb9d4ca1fd3f42c6f6a4539ac47459d4b4b SHA256 3d892a2d8f99912375e491ee47c2f608c2d653d3a5b52fb18cfa768a520fd6c9
 DIST ldns-1.6.11.tar.gz 1018369 RMD160 7580869e4b8bdd2d31cb08cb690c2e3d0663f381 SHA1 2c4537eee39a1af63e8dde4f35498ce78c968c1f SHA256 6891b8ea8e9ded3e7d2caaaf494a8c2459bab729cdd1716f6db2ba375f628888
-DIST ldns-1.6.4.tar.gz 895432 RMD160 1c9d78c01bc8ba6825cdc56b0be81236015e9ebd SHA1 9015968ad3ddd015c750c15b60e60b9cccd393ec SHA256 ad4d0142a84463ea646571656254694b5325545bc12bbb238358a0506e6eeb05
-DIST ldns-1.6.9.tar.gz 984563 RMD160 525fc08801500681257342e8789f0afc813b2b28 SHA1 30d136792433bef44454dc1c70bf55449160c3ad SHA256 13a0b666ba391920e1e584b773ccb07f5f2227020763b4777689b9bb635b871e
-EBUILD ldns-1.6.10.ebuild 1672 RMD160 adc32995e9b8848580265807d42581586fa9da84 SHA1 b7bcd1071dace103ab0ef9d5f5cf2d7de6bf204e SHA256 d9b3710aca2e11c3573960bae51c2ca7c1f47d25b3b072a9b6b81501c804412d
+DIST ldns-1.6.12.tar.gz 1057607 RMD160 e6497be1abef97239726eef6872dba42f7f69d65 SHA1 1d61df0f666908551d5a62768f77d63e727810aa SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c
 EBUILD ldns-1.6.11.ebuild 1672 RMD160 0b607c7db69642143e7fc6af7027f9a632de6cb0 SHA1 0728eb33f0eec5749b983326f68c6102af53e5bd SHA256 0de7422424e9d7c885e2875f703f45db576d5a082bb5d3ab20cb87c540f0b131
-EBUILD ldns-1.6.4.ebuild 1273 RMD160 3e1aabc1d815c0362c24ba3ab11b7dec01fec90e SHA1 e6cc54421d884962be66728e9ba09cc81ae43729 SHA256 8c5e383c95ee23744d21d653a8c092c092d0f1c7d6bb8487d6429eafe9e13b81
-EBUILD ldns-1.6.9.ebuild 1585 RMD160 f91e21160cdc7a8f8ddbe24adea6cd0cdd632b18 SHA1 57057f378263bf814df33934deef6a860108c70a SHA256 6ac1541a6d9a0a37698846d434b8bfa6538e71c819ef9efdea5d7c5a2bf71c07
-MISC ChangeLog 3241 RMD160 b4123e299ac0b8314d81a197bfab296646bbac3d SHA1 538aec225a517593e969e0906783c113ecef76e7 SHA256 7179d9d66a0718025b6970219b19458b7fae9355015c15d6bba08ab95965d05b
+EBUILD ldns-1.6.12.ebuild 1764 RMD160 1737b55f56f6082b7f37673b5088790ab20c50ce SHA1 44ff6860e6c39dabdb2be22c0ac0dafbd4110d8e SHA256 e4a37f0747f5ae08b0f1dfe8cbea127992a4df9b3c095e4b9b926fd125df0d78
+MISC ChangeLog 3509 RMD160 2e3869d2428d8af118504c119d590944db20c2cc SHA1 8250ed16d8e7865806f70b92b11837d1b2b8e70f SHA256 868d6155a9583cbdb203a9387ea1996a4e7ce1fdcf16e65c6d82e349184ce4cd
 MISC metadata.xml 522 RMD160 4f1173d7ac98d44d8f82029285ed669a5323823c SHA1 ea1b07b44f442429cff45dfbccfee89a5f644845 SHA256 624abeb470d3376958e49dce8675f024b4c56ec50171805fa212fee6a496a920
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6NvdYACgkQp5vW4rUFj5pBawCgqbSA92CIQRkp184k68jCMlGO
-EwcAnRDS519b+21iVP9m0G+spZCwXBEO
-=8Jth
+iQIcBAEBAgAGBQJPDanwAAoJECaGw+YFKA1p2XIP/0r1cbT50zgMAXZ52U87M16D
+MBkieJ6I+o1zLmmYrQvdKxdRA1u9JNPNvVgFyGfDMkKyhEUe8dA667+qnfE7z7+N
+Y9gTKNuYgDi/sc3XN8p8BwLWkdcDE4+pZ6rs9dH3mcYYd/jEezP0eJT8UnjHM/dv
+5cOf9OIAf+V64bXclf2YLMgasUTZTQBAsJTBNOY97id0Fa+Abp+rHjbXSl6TvLZU
+TsBJuyOVUim4CDcLk6n0zj/0EKdM0/mfrksIo9URPkEjgHsLRl1hV505EiXMcD3F
+CyXtrJptaY3yl2Xiecn0QnD2TG8XtB5/1JsCxG5zxzFMFMRVc7tlo8rc6F/yUIS4
+mR+7LrRoPqjsC6eKlmz0hPNyrnrTYHbs5QxhbVwcALXk66vfMJqz82ypku3fq+dH
+/Hs0bGaSz+yzd8uYqchkkleY1iYMYtqGQ3RHQJRK0YSgztp5Yg/KLgYLSYAwo1B4
+cjpEOON24XglaHGGRr2povyRID0FwsF/AzQ3ksh3OxOhhx0ABr8yArctG2sqGBq5
+nS8oAf+jZB8tiso3B67dHc4/7BcuDToCEv/fF5SbsXsAJ623gqsAuvd1NNQgvc8+
+a3Efx/DnCeu6sG9egL8KnnKoARWhtMpz9gWi4OW/XAu1gHxAYYC8NMwUBP2yL4nk
+mpwR8ZtD7yo+ghPNzm4b
+=3t7h
 -----END PGP SIGNATURE-----

diff --git a/net-libs/ldns/files/1.6.12-cflags.patch b/net-libs/ldns/files/1.6.12-cflags.patch
new file mode 100644 (file)
index 0000000..c039286
--- /dev/null
+++ b/net-libs/ldns/files/1.6.12-cflags.patch
@@ -0,0 +1,12 @@
+diff -Naur ldns-1.6.12.orig/configure.ac ldns-1.6.12/configure.ac
+--- ldns-1.6.12.orig/configure.ac      2012-01-10 23:51:41.000000000 +0900
++++ ldns-1.6.12/configure.ac   2012-01-12 00:08:14.913432352 +0900
+@@ -63,8 +63,6 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_LANG_C
+-ACX_CHECK_COMPILER_FLAG(g, [CFLAGS="-g $CFLAGS"])
+-ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="-O2 $CFLAGS"])
+ ACX_CHECK_COMPILER_FLAG(Wall, [CFLAGS="-Wall $CFLAGS"])
+ ACX_CHECK_COMPILER_FLAG(W, [CFLAGS="-W $CFLAGS"])
+ ACX_CHECK_COMPILER_FLAG(Wwrite-strings, [CFLAGS="-Wwrite-strings $CFLAGS"])

diff --git a/net-libs/ldns/ldns-1.6.10.ebuild b/net-libs/ldns/ldns-1.6.12.ebuild
similarity index 85%
rename from net-libs/ldns/ldns-1.6.10.ebuild
rename to net-libs/ldns/ldns-1.6.12.ebuild
index ed3fc2a7d3a74ed840a4be1d8261babc65a4d45a..4ef30dab658ba2805539074f1b16d6672d5aab83 100644 (file)
--- a/net-libs/ldns/ldns-1.6.10.ebuild
+++ b/net-libs/ldns/ldns-1.6.12.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.10.ebuild,v 1.1 2011/06/01 23:05:47 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.12.ebuild,v 1.1 2012/01/11 15:25:31 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.4"
 
-inherit python
+inherit autotools eutils python
 
 DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
@@ -28,6 +28,12 @@ pkg_setup() {
        python_set_active_version 2
 }
 
+src_prepare() {
+       epatch "${FILESDIR}/1.6.12-cflags.patch"
+
+       eautoreconf
+}
+
 src_configure() {
        econf \
                $(use_enable gost) \

diff --git a/net-libs/ldns/ldns-1.6.4.ebuild b/net-libs/ldns/ldns-1.6.4.ebuild
deleted file mode 100644 (file)
index bf7b174..0000000
--- a/net-libs/ldns/ldns-1.6.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.4.ebuild,v 1.4 2010/04/02 19:33:34 grobian Exp $
-
-EAPI="2"
-
-DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
-#IUSE="doc python ssl vim-syntax"
-IUSE="doc ssl vim-syntax"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )"
-#      python? (
-#              >=dev-lang/python-2.4
-#              dev-lang/swig
-#      )
-DEPEND="${DEPEND}
-       doc? ( app-doc/doxygen )"
-
-src_configure() {
-       econf \
-               $(use_enable ssl sha2) \
-               $(use_with ssl) \
-               --disable-rpath || die "econf failed"
-#              $(use_with python pyldns) \
-}
-
-src_compile() {
-       emake || die "emake failed"
-       if use doc ; then
-               emake doxygen || die "emake doxygen failed"
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc Changelog README* || die "dodoc failed"
-
-       if use doc ; then
-               dohtml doc/html/* || die "dohtml failed"
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/ftdetect
-               doins libdns.vim || die "doins libdns.vim failed"
-       fi
-}

diff --git a/net-libs/ldns/ldns-1.6.9.ebuild b/net-libs/ldns/ldns-1.6.9.ebuild
deleted file mode 100644 (file)
index 7ffa215..0000000
--- a/net-libs/ldns/ldns-1.6.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.9.ebuild,v 1.3 2011/05/11 19:36:54 angelos Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.4"
-
-inherit python
-
-DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
-IUSE="doc gost python ssl static-libs vim-syntax"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )
-       gost? ( >=dev-libs/openssl-1 )"
-DEPEND="${RDEPEND}
-       python? ( dev-lang/swig )
-       doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_configure() {
-       econf \
-               $(use_enable gost) \
-               $(use_enable ssl sha2) \
-               $(use_enable static-libs static) \
-               $(use_with ssl) \
-               $(use_with python pyldns) \
-               --disable-rpath || die "econf failed"
-}
-
-src_compile() {
-       emake || die "emake failed"
-       if use doc ; then
-               emake doxygen || die "emake doxygen failed"
-       fi
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc Changelog README* || die "dodoc failed"
-
-       if use python ; then
-               find "${ED}$(python_get_sitedir)" "(" -name "*.a" -o -name "*.la" ")" -type f -delete || die
-       fi
-
-       if use doc ; then
-               dohtml doc/html/* || die "dohtml failed"
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/ftdetect
-               doins libdns.vim || die "doins libdns.vim failed"
-       fi
-}