Really fixing bug #320901. Removed interim version 2.7.14 again

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 13 insertions, 67 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/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
 }