Version bump and fixes to dev-haskell/network. See bug #278545.

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

6 files changed, 92 insertions, 10 deletions

diff --git a/dev-haskell/network/ChangeLog b/dev-haskell/network/ChangeLog
index 528722a03cca..a7b7d0f15ce8 100644
--- a/dev-haskell/network/ChangeLog
+++ b/dev-haskell/network/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-haskell/network
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.36 2009/04/19 10:21:08 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.37 2009/07/27 19:00:13 kolmodin Exp $
+
+*network-2.2.1.4 (27 Jul 2009)
+
+  27 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org>
+  +network-2.2.1.4.ebuild:
+  Version bump.
+
+  27 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org>
+  +files/network-2.2.0.0-eat-configure-opts.patch, network-2.2.1.ebuild:
+  Make ./configure disregard unneeded flags --with-hc and --with-hc-pkg.
+  See bug #278545.
 
 *network-2.2.1 (19 Apr 2009)
 
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 421c8641f06d..88d7c4f4ee6c 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,11 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX network-2.2.0.0-eat-configure-opts.patch 747 RMD160 ada479126d1e1a50c7d25c3f0af82d41a2975413 SHA1 4d2cdff2470296b82a1a29d966deecc1333bd59a SHA256 33f46b0bdcd63ea98fcd401409732f57c06c6421b92620ad7da49e75e2f62779
+AUX network-2.2.0.0-ghc-6.10-build-fix.patch 385 RMD160 fcb2de61dd1a653074ebafaea024623b9f6b3bce SHA1 b9f9e157d1f4b73bf86ea7f8ad499e8a8936324b SHA256 cdaf8fa43ad8bec77aa879f63fb0781b87765a6cb9797a1408241844472afd40
 DIST ghc-6.6-src-extralibs.tar.bz2 2015443 RMD160 63d87d02f42efc032c20de7394f3b29431fd8eed SHA1 b94974e255165703d882bb522ec44c5bdc4b0aec SHA256 1c811695d074c7560ca9bd7773523f817ccb57390044392a1ad92cf0079bea29
 DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 RMD160 1c18c85d978c4b3369132e247c823aaa90ea8530 SHA1 1398f6c35191d52410a2e066b382635dff0d8d6d SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902
 DIST network-2.1.0.0.tar.gz 108096 RMD160 0731f0dce9977ec5e1a90bb3c1701c4754bce886 SHA1 1e67f86a0af3be167c7968b3ddfafa61557486c2 SHA256 e39a731740f357900ea2de9eb071399c438b02018436f2ba6e7decf7f7988aba
 DIST network-2.2.0.0.tar.gz 108063 RMD160 29210bd6b55e8499a98e463727037c7f016a4bc3 SHA1 d7e919cf6265534f9369fd854b722f2a818d68b7 SHA256 ca1b8083600faed1ad6daef910fded2619a19dd9649f2c723bbf17d63cad44fd
 DIST network-2.2.0.1.tar.gz 108865 RMD160 dd5f1288cf67a53c605413b30cc2cdd171a959f6 SHA1 51894f37638735115bd6b51b2a59f25f8b0f59ca SHA256 f2fb06a1d2595f0e31cc7e13a1565ea98a9998c68cb628108d9c164a52c2e8b2
+DIST network-2.2.1.4.tar.gz 112607 RMD160 b59a8d5467d10eba7065106efb4994ee77a72b91 SHA1 1c4a6856d51336df34fc6e33a1d683b22d18ba25 SHA256 16a842bee5db116f754b459ef261426b6705a6d79383c6d545c9df5f6329cd25
 DIST network-2.2.1.tar.gz 111070 RMD160 7fab4f5c2aeaf10623d65ae23b980674840a1ce0 SHA1 bd57f3736bd2fecf87a4989da9eea6e1d78ca743 SHA256 111e4963a0a979570993e79511a778b267ef58df35320d1ddda61a869259b63c
 EBUILD network-1.0.ebuild 659 RMD160 677b1790540a81411c788f2930e9d3abd3264a3b SHA1 29b964873f8f38eefccb3a8d8f40f9907f592e00 SHA256 7f8ed9d8f2cac0253c00054dbe47ef782e0d69f50bf4e8acde528975c726a617
 EBUILD network-2.0.1.ebuild 679 RMD160 18cbf52ec8b03b612c790fa32c64ded5a0f13509 SHA1 245eef576a3837ed2045629f0e0a2e0d90ef5c52 SHA256 55e052fccb03dc41c9a25e53376c3c35db82795f4c824690b6331c98980d55f4
@@ -13,13 +16,14 @@ EBUILD network-2.0.ebuild 646 RMD160 734f1b2ed4ea389b6a192521030848a4f5ee650d SH
 EBUILD network-2.1.0.0.ebuild 553 RMD160 90e0e609216e1cf590ef7b4b8136320cc5223571 SHA1 b462e8e3a71f1aa4eaaea9d3b0a1dfbe233555e8 SHA256 e63eb67491d38698428521caa5133e83d99ccb8a98c4c65f3f32c53663d9b1d8
 EBUILD network-2.2.0.0.ebuild 564 RMD160 c8fefe7a980fcbcf2737baeabf03ba1b0273b178 SHA1 3c48502abc886855477158580f85b1e4276c48e9 SHA256 a66c4a10a4da21ce3af2d0d28ddd9a41aa810963ef81b87d357489bb460d5943
 EBUILD network-2.2.0.1.ebuild 596 RMD160 a1b0ff307290bf59258c417b388c077b0defc12e SHA1 24632170d906d799453a2f9cf7a32d83ebe78aca SHA256 be9a1bb5053df3fa57e5cf7cdbe9637472568b243cc872936a5d60bbfae5e415
-EBUILD network-2.2.1.ebuild 682 RMD160 7fb8ad2d4d4e89b3ba4334247a346acc960e67b5 SHA1 81a4021f9228c9e5a6a5cc1400d26d28f3b9b739 SHA256 31332e7ab408b0142294813b2a42742a59f4dd62f563eeb2f00087c6882e4ace
-MISC ChangeLog 4203 RMD160 95b184c25ff1cfdec7a0cddf78c5bd3d4028ff71 SHA1 ea6ab951adb168644a670664756a6dcf09841724 SHA256 06f1a39701310cca228fd652dc23873b28289838e82b33a6a4e5521c7fa6153a
+EBUILD network-2.2.1.4.ebuild 825 RMD160 d56d00a2c80b0acb18f08f1c99c44935d85ebf56 SHA1 35f0007b3ea48f9862245b2613d13c44b6850027 SHA256 dbbd4048b6e60936e0fc5fee2c6c7a6b502fdf0ecd0c1ac5cf0fdbd99682119b
+EBUILD network-2.2.1.ebuild 823 RMD160 eab1b759ac5085f90c15202af5d4932dc47eacdd SHA1 394dc355dd02ec4dddd6ccd276c345977d9931e2 SHA256 38b7f8291ecdb46d156bba45f396e3488548419a551b8d14df1761f29821c1a2
+MISC ChangeLog 4553 RMD160 10cb1878aded5904a51d1f0f1d6dfbbaa7bdb2d5 SHA1 33370a8337f26d6a15f0ce081ef54119e9839bc0 SHA256 8c0363e2e19c0901fa83b5efcbc70f8ccb12c00b007ac137c770c97ceaa82294
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknq+xoACgkQ1n/CYbXjntLieACdHynWgjPNQR82p/zvlJ0eHX1a
-LAMAoKIcZuq9Gks8hE7ir+z/TgJSzwnQ
-=891E
+iEYEARECAAYFAkpt+UYACgkQ1n/CYbXjntKkhwCgqTiUpdjG2ml4IrdA4E+fvMDF
+O1EAnjT56ptlfYo1Pufwj5UOd93QKfa3
+=TVDY
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/network/files/network-2.2.0.0-eat-configure-opts.patch b/dev-haskell/network/files/network-2.2.0.0-eat-configure-opts.patch
new file mode 100644
index 000000000000..49c430da44a7
--- /dev/null
+++ b/dev-haskell/network/files/network-2.2.0.0-eat-configure-opts.patch
@@ -0,0 +1,17 @@
+Make sure ./configure can eat --with-hc and --with-hc-pkg without giving QA
+warnings.
+
+diff -rN -u old-network-2.2.0.0/configure.ac new-network-2.2.0.0/configure.ac
+--- old-network-2.2.0.0/configure.ac	2009-07-21 22:07:20.000000000 +0200
++++ new-network-2.2.0.0/configure.ac	2009-07-21 22:07:20.000000000 +0200
+@@ -14,6 +14,10 @@
+ 
+ AC_C_CONST
+ 
++dnl * dummy options to eat --with-hc= and --with-hc-pkg= flags
++AC_ARG_WITH([hc], [(dummy option)], [])
++AC_ARG_WITH([hc-pkg], [(dummy option)], [])
++
+ dnl ** check for specific header (.h) files that we are interested in
+ AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h sys/types.h unistd.h winsock.h])
+ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h netinet/tcp.h sys/socket.h sys/uio.h sys/un.h])
diff --git a/dev-haskell/network/files/network-2.2.0.0-ghc-6.10-build-fix.patch b/dev-haskell/network/files/network-2.2.0.0-ghc-6.10-build-fix.patch
new file mode 100644
index 000000000000..a0bb1d271415
--- /dev/null
+++ b/dev-haskell/network/files/network-2.2.0.0-ghc-6.10-build-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/network.cabal b/network.cabal
+index 8814063..237f45e 100644
+--- a/network.cabal
++++ b/network.cabal
+@@ -18,7 +18,7 @@ extra-source-files:
+ extra-tmp-files:
+ 		config.log config.status autom4te.cache
+ 		network.buildinfo include/HsNetworkConfig.h
+-build-depends:	base, parsec
++build-depends:	base<4, parsec
+ extensions:	CPP
+ include-dirs: 	include
+ includes:       HsNet.h
diff --git a/dev-haskell/network/network-2.2.1.4.ebuild b/dev-haskell/network/network-2.2.1.4.ebuild
new file mode 100644
index 000000000000..2b0ebec9c321
--- /dev/null
+++ b/dev-haskell/network/network-2.2.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.2.1.4.ebuild,v 1.1 2009/07/27 19:00:13 kolmodin Exp $
+
+CABAL_FEATURES="lib profile haddock"
+inherit base haskell-cabal autotools
+
+DESCRIPTION="Networking-related facilities"
+HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/network"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.6.1
+		dev-haskell/parsec"
+
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+PATCHES=(" ${FILESDIR}/network-2.2.0.0-eat-configure-opts.patch ")
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	eautoreconf
+}
diff --git a/dev-haskell/network/network-2.2.1.ebuild b/dev-haskell/network/network-2.2.1.ebuild
index ebff4ce9ea2e..4f5226446e4a 100644
--- a/dev-haskell/network/network-2.2.1.ebuild
+++ b/dev-haskell/network/network-2.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.2.1.ebuild,v 1.1 2009/04/19 10:21:08 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.2.1.ebuild,v 1.2 2009/07/27 19:00:13 kolmodin Exp $
 
 CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
+inherit base haskell-cabal autotools
 
 DESCRIPTION="Networking-related facilities"
 HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/network"
@@ -15,7 +15,15 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1
-		 dev-haskell/parsec"
+		dev-haskell/parsec"
 
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+
+PATCHES=(" ${FILESDIR}/network-2.2.0.0-eat-configure-opts.patch ")
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	eautoreconf
+}