Really fixing bug #320901. Removed interim version 2.7.14 again

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 15 insertions, 71 deletions

diff --git a/net-libs/gsoap/ChangeLog b/net-libs/gsoap/ChangeLog
index a9214c92cdd9..8934fc0219cd 100644
--- a/net-libs/gsoap/ChangeLog
+++ b/net-libs/gsoap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gsoap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/ChangeLog,v 1.9 2010/06/03 21:25:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/ChangeLog,v 1.10 2010/06/03 22:02:07 polynomial-c Exp $
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org> -gsoap-2.7.14.ebuild,
+  gsoap-2.7.17.ebuild:
+  Really fixing bug #320901. Removed interim version 2.7.14 again.
 
 *gsoap-2.7.17 (03 Jun 2010)
 *gsoap-2.7.14 (03 Jun 2010)
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 2405d437858b..24c7c518bc46 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -3,10 +3,8 @@ AUX gsoap-2.7-fix-pre-iso-headers.patch 3599 RMD160 156c6dab53794b97df7dbff3994e
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 RMD160 012a2f1f66cd201121697aa89918e752d2223268 SHA1 515d53833680a2eed65382574e83c8fd856894ca SHA256 5964ea1b815bc5382cabc6f1235fd0a4c4c313e07d1d4452eecde0a04c9fda40
 AUX gsoap-2.7.15-use_libtool.patch 4790 RMD160 ca5cdee078b3f326bd69b44a016760cbe35f45d8 SHA1 25fcecd21bdc45f8583d60684fb4512663cb5244 SHA256 e4129e70ec9833720b07efacc35d3834cee125c75f18a548de1aae5e3e9c5bbc
 DIST gsoap_2.7.13.tar.gz 6564489 RMD160 58f2bcd95199fdec3c5ce6579374148eaab955b1 SHA1 4c91ce860ee6853f785a11484c7298d294a53ef6 SHA256 3d40a528b8f3309f392945dca2ecaee5a698f4ee00a6036907a57c4f25a6a479
-DIST gsoap_2.7.14.tar.gz 6278034 RMD160 3486341e2cff04d6ad322727798ff3c670f0b12b SHA1 7c55bf67ebed8200efb16d73632b5ae93b7b3431 SHA256 990b78ba2642e42aea84ea58d3dee072066eaa9b53f737df36cf688c1f52fac6
 DIST gsoap_2.7.17.zip 10224444 RMD160 3f947cbc5e1656dd82b8c6425816cfaf08063c19 SHA1 573a08ab7d8ca2d970158911482c308484fdd5ed SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16
 EBUILD gsoap-2.7.13.ebuild 1291 RMD160 470284703d760033ff90846446d3d2cec15f5bf8 SHA1 b97ab43025501deecf56094379c16536a9c09912 SHA256 fb6242b6754b8a1cc9a7bd40a822a669d8a96f026fe2774218a00d95cd65f287
-EBUILD gsoap-2.7.14.ebuild 1372 RMD160 f298f91d25edda1a03c3bb9cc2084bc1ce48902d SHA1 9a777e955060eb4543426de4343b74c887e10651 SHA256 f697127733eca5b949066f5009ab89ce218979d2019a2ab52859724e380e3605
-EBUILD gsoap-2.7.17.ebuild 1617 RMD160 734927f19cfaa711d499d89e4252636ab3b46c52 SHA1 3eca15c033397c4bd762398a9b13b4f7f748bec9 SHA256 a3fee29b11f66ddcf75e5ce2fecb3e4d58edaeeb0271e2271af4de522d9523e0
-MISC ChangeLog 2136 RMD160 73b0145ca76ddb484828a54988cfbec2fbf97826 SHA1 ed9c879ec1e558697956cc236c4096e2fcd50e8e SHA256 1dcc07eb2a76d6f1ca573aa0a1d9917ac6c2a533822526658041882d2a18c99d
+EBUILD gsoap-2.7.17.ebuild 1703 RMD160 bb0d1889bacb9374e0221697b70df9f6436daad1 SHA1 84f9417b61ec78c5b00bdd1b5c4f5ffbf928b3dd SHA256 8b945eecb531b055e6938f4a7a471337db58063a0132c7069f87c83be63a25ef
+MISC ChangeLog 2304 RMD160 4c316485b59a8c0fea0a68c16607059502996889 SHA1 59e5b9b46625ac6dd52d88c50c361b2931335808 SHA256 b61139b3b65852d76d3792ec15147377a090de942c3852a579dfa2de04209711
 MISC metadata.xml 532 RMD160 6ef28bd3af65d98c51696bb9c4e3fd2d653f62df SHA1 f655ab4efbf1af4b9acd99a8c3b3767f07b8fa1c SHA256 bc34d15c6890718544dec4bb32057b9706376c02fd8de390d74bb21c4d45ce3d
diff --git a/net-libs/gsoap/gsoap-2.7.14.ebuild b/net-libs/gsoap/gsoap-2.7.14.ebuild
deleted file mode 100644
index 46dd41b5d57d..000000000000
--- a/net-libs/gsoap/gsoap-2.7.14.ebuild
+++ /dev/null
@@ -1,61 +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/gsoap/gsoap-2.7.14.ebuild,v 1.1 2010/06/03 21:25:46 polynomial-c Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_P="${PN}-2.7"
-DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.tar.gz"
-
-LICENSE="GPL-2 gSOAP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug examples +ssl"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Fix Pre-ISO headers
-	epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
-	#fix for >=openssl-1.0.0
-	epatch "${FILESDIR}/${PN}-2.7-fedora-openssl.patch"
-}
-
-src_configure() {
-	econf $(use_enable ssl openssl) \
-	$(use_enable examples samples) \
-	$(use_enable debug) \
-	|| die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodir /usr/share/doc/${P}
-	dodoc LICENSE.txt NOTES.txt README.txt
-	dohtml changelog.html
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		rm -rf gsoap/samples/Makefile* README.txt
-		doins -r gsoap/samples
-	fi
-
-	if use doc; then
-		dohtml -r gsoap/doc/
-	fi
-}
diff --git a/net-libs/gsoap/gsoap-2.7.17.ebuild b/net-libs/gsoap/gsoap-2.7.17.ebuild
index b48edf504d81..a3b53d25044a 100644
--- a/net-libs/gsoap/gsoap-2.7.17.ebuild
+++ b/net-libs/gsoap/gsoap-2.7.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.7.17.ebuild,v 1.1 2010/06/03 21:25:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gsoap/gsoap-2.7.17.ebuild,v 1.2 2010/06/03 22:02:07 polynomial-c Exp $
 
 EAPI=2
 
@@ -27,10 +27,13 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# Fix Pre-ISO headers
-	epatch \
-		"${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch" \
-		"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" \
-		"${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
+	epatch "${FILESDIR}/${PN}-2.7-fix-pre-iso-headers.patch"
+	epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
+
+	# causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to
+	# break:
+	#epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch"
+
 	eautoreconf
 }