dev-lang/swig: Remove 2.0.7, now in tree. Small changes to -9999 to look similar to tree's 2.0.7-r1 ebuild

(Portage version: 2.2.0_alpha117/git/Linux i686, signed Manifest commit with key 0xBE63A96F)

5 files changed, 16 insertions, 172 deletions

diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index 6959bcc0..ef4b3e3e 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX swig-2.0.7_bug-417823.patch 4536 RMD160 41ae1cd29a49e1083dba85435948e9823d31d7e2 SHA1 e2206b33816233999c7806cfe6a8eaa196cb7fc4 SHA256 35077dd580756ba189abe274418e20c4c6a407685422bb14c47867381f82e9bb
-DIST swig-2.0.7.tar.gz 5281076 RMD160 2183dbd51b8c548e0f657df707c911c6dc60cdd8 SHA1 307020fb6437092e32c9c1bd9af8bccb1645b529 SHA256 ac1f29be405d78b3848c8ba76add2deffc2cdc166c9a1773eda7972ba3898967
-EBUILD swig-2.0.7-r1.ebuild 1199 RMD160 6d04a024716737f47be7dad2dafe5a0631816ae7 SHA1 a137eb12ba55986b8000d63eedd8068ab37b0b6c SHA256 2213f97b636f23f42c4cd47f0293565c3a465757cdd128dd4c615ea1a86d4158
-EBUILD swig-2.0.7.ebuild 1055 RMD160 f1a7e88ebf55c0bb341e5b4a18f4c990beb0ba87 SHA1 619946011c39ddf437570bdc03100fc0b30e1fe7 SHA256 24625b66d1d11150696fa36f02f6259ccb81de66438bc1767bdba2daf1a367c0
-EBUILD swig-9999.ebuild 1096 RMD160 c83846c150dbdb06bcaecf593ec0c01dff89d3d7 SHA1 fef23e43a58b479de18f37772e772089834c1563 SHA256 3cd225978249d45a0ecb345289f013ecc2f90d6a6926233ed9c9a3e26e58ce3f
-MISC metadata.xml 956 RMD160 b26e212d1522661e27f2141db2aebfd8625f8e67 SHA1 91eb76f152ed9c1faba2678d823f75634519cb19 SHA256 e0d747d1fc0ddfd97fbfdb0f4d53ee635e5f0b435dd36b6e2c5943cbb34d41f8
+EBUILD swig-9999.ebuild 1055 SHA256 d0e74032e1fc778873a5dd255f34fce0f7608273cb335885d1e24f8d5c05e8a7 SHA512 abaf7ddf841d3dece64b5be99c2ca6c860f3e194fff0f2436ab0df8678162f52cb60f6faebfbab24d6e11041185cb2072cb70101a5b75b6a885caf848d7171c6 WHIRLPOOL bda14d75e1c7510d10f7ed3969aa41162faad14c9e36f1b66f4c202d6a0696d2439d4b521701637fc5b35462cc0875437aeda8823b0a14125fd43c4ca996c49d
+MISC metadata.xml 956 SHA256 e0d747d1fc0ddfd97fbfdb0f4d53ee635e5f0b435dd36b6e2c5943cbb34d41f8 SHA512 544259ad175329fc0f80370241981be2cfd6c26a956036910e17e06385e1b1b05915e67bab06abbdbaf37cafdd91190b3ba4f9499fc2bd7bd94015b3c3807083 WHIRLPOOL 70da04b2c013eeb502190cfd117e1301db3f653a702310c5a191804767bc51913ca4eaf1b7c67916f8623fde6e10aabab30a053a7854e4ded223731e0d889bfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPw1bxAAoJED15R4++Y6lveOcH/R5HZH1ELY9niAAuHBAQgEwl
-ZBksa5nBrocDlHGd/mR0sboT2t1ikOVwGNEyYVjptRoumyZdb/cxCNIjqdenIBtK
-rqCVm5kqWA4INtTUPPkrZCQ99IEt8tec4ceYNHH3ppSFnYyDVFV7VMzsVcj2sg6D
-2dV+jtus3lDRjH3g0QAWId9L85NzOKhSTEVN2zRoldZB9YcIAsXyClXitusRJ1vv
-ALNTzUltmSKROiIyRiaKP6UiiEanRMIdHLxnuzyNmK5GKepWXo4klBsy4kK30yvz
-YrdDnW26umy0NuNabQMDi37vT6eSba/eYx/sA0SdgiFmxqf57yP5KJW+YhUCmsg=
-=TNi/
+iQEcBAEBCAAGBQJQAI10AAoJED15R4++Y6lv15QIAKncevVzEiL5gsUYVCisdhMx
+gP+gUNft0D0RrcjocFOcLLWPfMmReGnZuCBTmaTN+TnjtQ+AQ5t9InYh9HsKWYO8
+RbUPqvWHLRTQs9xX/n9nBrBDsQrwSZEPv/ow19HwKbNT3xJM+uY8uUh/8UtRIPzF
+u/ExnhX6DAYCEpFB4WiDKALv2i5MfvQ3LDElFV7xNxyvYjIEvkVfJ2Gwsf64WYlX
+/a0JhgnaIqDP1tmy1Q6/c/kaCssBbPGeZ3Li+0SH7Rt2Dgqkz+MKF2HgpPrGmFun
+5q0D49XnSZGUUh9iFuv72suw8dujMurKX6KpXAJzUPrEC4ROSQbImABVP/xEkRk=
+=3K22
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/swig/files/swig-2.0.7_bug-417823.patch b/dev-lang/swig/files/swig-2.0.7_bug-417823.patch
deleted file mode 100644
index c4fc0e2b..00000000
--- a/dev-lang/swig/files/swig-2.0.7_bug-417823.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: Source/Modules/lang.cxx
-===================================================================
---- Source/Modules/lang.cxx	(revision 13127)
-+++ Source/Modules/lang.cxx	(revision 13128)
-@@ -2623,7 +2623,7 @@
- 	  Delete(expected_name_resolved);
- 	}
- 	if (illegal_name) {
--	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name));
-+	  Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n));
- 	  Swig_restore(n);
- 	  return SWIG_NOWRAP;
- 	}
-@@ -2760,7 +2760,7 @@
-     }
-
-     if (illegal_name) {
--      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name));
-+      Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n));
-       Swig_restore(n);
-       Delete(expected_name);
-       return SWIG_NOWRAP;
-Index: Examples/test-suite/errors/expected.log
-===================================================================
---- Examples/test-suite/errors/expected.log	(revision 13127)
-+++ Examples/test-suite/errors/expected.log	(revision 13128)
-@@ -227,17 +227,17 @@
- cpp_extend_destructors.i:85: Warning 302: previous definition of '~JStruct'.
- cpp_extend_destructors.i:100: Warning 302: Identifier '~LStruct' redefined (ignored),
- cpp_extend_destructors.i:98: Warning 302: previous definition of '~LStruct'.
--cpp_extend_destructors.i:24: Warning 521: Illegal destructor name ~NOT_CStruct. Ignored.
--cpp_extend_destructors.i:30: Warning 521: Illegal destructor name ~NOT_DStruct. Ignored.
--cpp_extend_destructors.i:44: Warning 521: Illegal destructor name ~NOT_EStruct. Ignored.
--cpp_extend_destructors.i:50: Warning 521: Illegal destructor name ~NOT_FStruct. Ignored.
--cpp_extend_destructors.i:65: Warning 521: Illegal destructor name ~NOT_GStruct. Ignored.
--cpp_extend_destructors.i:72: Warning 521: Illegal destructor name ~NOT_HStruct. Ignored.
--cpp_extend_destructors.i:81: Warning 521: Illegal destructor name ~NOT_IStruct. Ignored.
--cpp_extend_destructors.i:86: Warning 521: Illegal destructor name ~NOT_JStruct. Ignored.
--cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored.
--cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< int >. Ignored.
--cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< short >. Ignored.
-+cpp_extend_destructors.i:24: Warning 521: Illegal destructor name CStruct::~NOT_CStruct(). Ignored.
-+cpp_extend_destructors.i:30: Warning 521: Illegal destructor name DStruct::~NOT_DStruct(). Ignored.
-+cpp_extend_destructors.i:44: Warning 521: Illegal destructor name EStruct::~NOT_EStruct(). Ignored.
-+cpp_extend_destructors.i:50: Warning 521: Illegal destructor name FStruct::~NOT_FStruct(). Ignored.
-+cpp_extend_destructors.i:65: Warning 521: Illegal destructor name GStruct::~NOT_GStruct(). Ignored.
-+cpp_extend_destructors.i:72: Warning 521: Illegal destructor name HStruct::~NOT_HStruct(). Ignored.
-+cpp_extend_destructors.i:81: Warning 521: Illegal destructor name IStruct::~NOT_IStruct(). Ignored.
-+cpp_extend_destructors.i:86: Warning 521: Illegal destructor name JStruct::~NOT_JStruct(). Ignored.
-+cpp_extend_destructors.i:92: Warning 521: Illegal destructor name KStruct::~NOT_KStruct(). Ignored.
-+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< int >::~NOT_LStruct(). Ignored.
-+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< short >::~NOT_LStruct(). Ignored.
-
- :::::::::::::::::::::::::::::::: cpp_extend_redefine.i :::::::::::::::::::::::::::::::::::
- cpp_extend_redefine.i:9: Warning 302: Identifier 'bar' redefined by %extend (ignored),
-@@ -312,8 +312,8 @@
- cpp_no_access.i:3: Warning 319: No access specifier given for base class 'foo' (ignored).
-
- :::::::::::::::::::::::::::::::: cpp_no_return_type.i :::::::::::::::::::::::::::::::::::
--cpp_no_return_type.i:6: Warning 504: Function R must have a return type. Ignored.
--cpp_no_return_type.i:10: Warning 504: Function UU must have a return type. Ignored.
-+cpp_no_return_type.i:6: Warning 504: Function S::R() must have a return type. Ignored.
-+cpp_no_return_type.i:10: Warning 504: Function U::UU() must have a return type. Ignored.
-
- :::::::::::::::::::::::::::::::: cpp_nobase.i :::::::::::::::::::::::::::::::::::
- cpp_nobase.i:3: Warning 401: Nothing known about base class 'Bar'. Ignored.
diff --git a/dev-lang/swig/swig-2.0.7-r1.ebuild b/dev-lang/swig/swig-2.0.7-r1.ebuild
deleted file mode 100644
index 12729899..00000000
--- a/dev-lang/swig/swig-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit base
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://swig.svn.sourceforge.net/svnroot/swig/trunk"
-	ESVN_BOOTSTRAP="autogen.sh"
-	inherit subversion
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/"
-LICENSE="GPL-3 as-is"
-SLOT="0"
-IUSE="ccache doc pcre"
-
-RESTRICT="test"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-		ccache? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	# Backport from swig trunk; svn diff -r 13127:13128
-	"${FILESDIR}"/${P}_bug-417823.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable ccache) \
-		$(use_with pcre)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES CHANGES.current README TODO || die
-	if use doc; then
-		dohtml -r Doc/{Devel,Manual} || die
-	fi
-}
diff --git a/dev-lang/swig/swig-2.0.7.ebuild b/dev-lang/swig/swig-2.0.7.ebuild
deleted file mode 100644
index 49759143..00000000
--- a/dev-lang/swig/swig-2.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.4-r1.ebuild,v 1.10 2012/04/26 20:39:51 aballier Exp $
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ccache doc pcre"
-RESTRICT="test"
-
-DEPEND="pcre? ( dev-libs/libpcre )
-		ccache? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable ccache) \
-		$(use_with pcre)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES CHANGES.current README TODO || die
-	if use doc; then
-		dohtml -r Doc/{Devel,Manual} || die
-	fi
-}
diff --git a/dev-lang/swig/swig-9999.ebuild b/dev-lang/swig/swig-9999.ebuild
index 6b351ea5..f657170d 100644
--- a/dev-lang/swig/swig-9999.ebuild
+++ b/dev-lang/swig/swig-9999.ebuild
@@ -18,17 +18,18 @@ fi
 
 DESCRIPTION="Simplified Wrapper and Interface Generator"
 HOMEPAGE="http://www.swig.org/"
+
 LICENSE="GPL-3 as-is"
 SLOT="0"
 IUSE="ccache doc pcre"
-
 RESTRICT="test"
 
 DEPEND="pcre? ( dev-libs/libpcre )
-		ccache? ( sys-libs/zlib )"
-
+	ccache? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
+DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
+
 src_configure() {
 	econf \
 		$(use_enable ccache) \
@@ -36,9 +37,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ANNOUNCE CHANGES CHANGES.current README TODO || die
+	default
 	if use doc; then
-		dohtml -r Doc/{Devel,Manual} || die
+		dohtml -r Doc/{Devel,Manual}
 	fi
 }