dev-dotnet/pnet: Removing conflicting versions (bug #189497)

Package-Manager: portage-2.1.3.19

6 files changed, 19 insertions, 132 deletions

diff --git a/dev-dotnet/pnet/ChangeLog b/dev-dotnet/pnet/ChangeLog
index b823fae286e1..ef04041cb815 100644
--- a/dev-dotnet/pnet/ChangeLog
+++ b/dev-dotnet/pnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/pnet
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnet/ChangeLog,v 1.51 2007/11/16 00:16:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnet/ChangeLog,v 1.52 2007/11/16 17:53:44 jurek Exp $
+
+  16 Nov 2007; Jurek Bartuszek <jurek@gentoo.org> -pnet-0.6.12.ebuild,
+  -pnet-0.7.4.ebuild:
+  Removing conflicting versions (bug #189497)
 
   16 Nov 2007; Steve Dibb <beandog@gentoo.org> pnet-0.6.12-r1.ebuild,
   pnet-0.7.4-r1.ebuild:
diff --git a/dev-dotnet/pnet/Manifest b/dev-dotnet/pnet/Manifest
index c0d77667820f..575cbba9f5c2 100644
--- a/dev-dotnet/pnet/Manifest
+++ b/dev-dotnet/pnet/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pnet-0.6.12.tar.gz 3514901 RMD160 ae854cc8407f1bb99659812c6faed88aad42eba5 SHA1 b83c0d6ade099ee7e2c85f0ec56634383c9df8b5 SHA256 d9ac56d4ee5850621f2ae81a6c56460dd2236bc70d98b5493e1248d07dea77c6
 DIST pnet-0.7.4.tar.gz 3625274 RMD160 bdc683433e159a5b0af73ac9b8c05b94886fa296 SHA1 303e91df109eebec9fcc4883f95b98ca7c6a8575 SHA256 fe1367cbc3e69dea77aef20438fb024864ed41b09dbd6817b08ec36128361ea5
 DIST pnet-0.8.0.tar.gz 4510420 RMD160 232f96fb92be2cab4109ab03845bafa84c3d0259 SHA1 3d048cbef0476f21cbdd86f81c1706f52b7a7218 SHA256 f1340ae3567a5f05729d9d201bd719268ceca07bde4f62c58a92abfda64551bb
@@ -5,42 +8,35 @@ EBUILD pnet-0.6.12-r1.ebuild 1974 RMD160 f39f2f47b1eec3b80d657babe97d1380a120855
 MD5 748e181d459a7b178d1d3e29eb6fe2cd pnet-0.6.12-r1.ebuild 1974
 RMD160 f39f2f47b1eec3b80d657babe97d1380a1208558 pnet-0.6.12-r1.ebuild 1974
 SHA256 95bd30170be98c047fd9951480eed16f305b21a48c56d33948d88b17ed9bcf6f pnet-0.6.12-r1.ebuild 1974
-EBUILD pnet-0.6.12.ebuild 1864 RMD160 2875e4ceb9a24dcab4d196a41b3c4e94c0bad3f4 SHA1 91620e515f2b709666077e02ca56982faad16b81 SHA256 63b9612355efaa0f8c43bcc428e4cda332b9e92f2b3ed36f07ac4d7f7922f195
-MD5 bb9f75ea6bc188158924875a1fc9049e pnet-0.6.12.ebuild 1864
-RMD160 2875e4ceb9a24dcab4d196a41b3c4e94c0bad3f4 pnet-0.6.12.ebuild 1864
-SHA256 63b9612355efaa0f8c43bcc428e4cda332b9e92f2b3ed36f07ac4d7f7922f195 pnet-0.6.12.ebuild 1864
 EBUILD pnet-0.7.4-r1.ebuild 1474 RMD160 e6267040690aee2eabd744aa65fdd2c92712bbe3 SHA1 699409bfd09073d862b594bcc43a70cc0af2d603 SHA256 88908f1bf4689b6525a8c9fd2d437f77747a46d3cac84ba9a4c4c3991d5e9d93
 MD5 8ab8fd48ac3f169fe6c97e5767bd0bad pnet-0.7.4-r1.ebuild 1474
 RMD160 e6267040690aee2eabd744aa65fdd2c92712bbe3 pnet-0.7.4-r1.ebuild 1474
 SHA256 88908f1bf4689b6525a8c9fd2d437f77747a46d3cac84ba9a4c4c3991d5e9d93 pnet-0.7.4-r1.ebuild 1474
-EBUILD pnet-0.7.4.ebuild 1364 RMD160 2295d3eecb7c12d637f5796a992733bc9e47eddc SHA1 09bc54ea5c9ce2381d0bf976c0b37eeaa11e485c SHA256 ef3d49083733bce3691274a502922118cee641b5288b4f139ec36a464ced0397
-MD5 17addee39cd15ea83bddfc5743e72a03 pnet-0.7.4.ebuild 1364
-RMD160 2295d3eecb7c12d637f5796a992733bc9e47eddc pnet-0.7.4.ebuild 1364
-SHA256 ef3d49083733bce3691274a502922118cee641b5288b4f139ec36a464ced0397 pnet-0.7.4.ebuild 1364
 EBUILD pnet-0.8.0.ebuild 1574 RMD160 3e5be90250076eb35be6e7aaaf63054d37a330c7 SHA1 d6eaa782d1364775b7aa4d9c832e915b59f00438 SHA256 944ecb7b5a5d452bdf3c439ad8670503287349a2bd5f5e955dfd1bbf057e3610
 MD5 402be3b10f62b4f262a47bec85a23f4e pnet-0.8.0.ebuild 1574
 RMD160 3e5be90250076eb35be6e7aaaf63054d37a330c7 pnet-0.8.0.ebuild 1574
 SHA256 944ecb7b5a5d452bdf3c439ad8670503287349a2bd5f5e955dfd1bbf057e3610 pnet-0.8.0.ebuild 1574
-MISC ChangeLog 8146 RMD160 95f025529100720c5be75a9a02c3ee8174468ba7 SHA1 47b65ecd2e71a6619b841b4d45abd1d4e070db87 SHA256 875bcc31639b14734e773296571e9c4301d0af7c63fc300197ef1690562cae92
-MD5 803bf2830988cfbb6b943b83d081926a ChangeLog 8146
-RMD160 95f025529100720c5be75a9a02c3ee8174468ba7 ChangeLog 8146
-SHA256 875bcc31639b14734e773296571e9c4301d0af7c63fc300197ef1690562cae92 ChangeLog 8146
+MISC ChangeLog 8284 RMD160 54b3660e0e302c040421c745686a283e81d6dfc0 SHA1 6670515660e29760a10ae5ee44da8d359e6af02d SHA256 679e84aa17009625e8db8b223c4b3b73ed8208edde95c126f739fd680b00990e
+MD5 49c8929c9b324e39158b715c2ffa5d69 ChangeLog 8284
+RMD160 54b3660e0e302c040421c745686a283e81d6dfc0 ChangeLog 8284
+SHA256 679e84aa17009625e8db8b223c4b3b73ed8208edde95c126f739fd680b00990e ChangeLog 8284
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 metadata.xml 159
 SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909 metadata.xml 159
-MD5 0c1cc09978bd187c4f756edbda5fe081 files/digest-pnet-0.6.12 238
-RMD160 470c341c789b468e69051d0c8bb6c720eceeffb2 files/digest-pnet-0.6.12 238
-SHA256 af9ca98385e3e2dbbe62bb906a82702444124f328cc78903ce1d594f6d4b4efa files/digest-pnet-0.6.12 238
 MD5 0c1cc09978bd187c4f756edbda5fe081 files/digest-pnet-0.6.12-r1 238
 RMD160 470c341c789b468e69051d0c8bb6c720eceeffb2 files/digest-pnet-0.6.12-r1 238
 SHA256 af9ca98385e3e2dbbe62bb906a82702444124f328cc78903ce1d594f6d4b4efa files/digest-pnet-0.6.12-r1 238
-MD5 fba3230a496a12225b20d6f23d644fd2 files/digest-pnet-0.7.4 235
-RMD160 56ab47d15432e786c1a141379f36dec551c8b88f files/digest-pnet-0.7.4 235
-SHA256 48958592e68c9f7ba3b2a8a026d0641f654affd2b92d93c061133afde967c61a files/digest-pnet-0.7.4 235
 MD5 fba3230a496a12225b20d6f23d644fd2 files/digest-pnet-0.7.4-r1 235
 RMD160 56ab47d15432e786c1a141379f36dec551c8b88f files/digest-pnet-0.7.4-r1 235
 SHA256 48958592e68c9f7ba3b2a8a026d0641f654affd2b92d93c061133afde967c61a files/digest-pnet-0.7.4-r1 235
 MD5 6fb0da7f19e8405964d99889b2362eb3 files/digest-pnet-0.8.0 235
 RMD160 d9120e643e5c455bc3d7ce8fca43a66811a569ff files/digest-pnet-0.8.0 235
 SHA256 ab40d33d8c18b0b7c566d50612bf7d5722421c88a72bb5e0fb47a9566ab9f126 files/digest-pnet-0.8.0 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHPdktyvXkcyXx2ogRAnaCAJ9AZx0q8XlIW/CrG9B4Mv0NVCMp5QCgj4TK
+X0KkCAxq9rhfM+RqiA2/kEI=
+=W/Yz
+-----END PGP SIGNATURE-----
diff --git a/dev-dotnet/pnet/files/digest-pnet-0.6.12 b/dev-dotnet/pnet/files/digest-pnet-0.6.12
deleted file mode 100644
index dcef9efb0d05..000000000000
--- a/dev-dotnet/pnet/files/digest-pnet-0.6.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a35ad029e4d4cce936f3ba768f0d186 pnet-0.6.12.tar.gz 3514901
-RMD160 ae854cc8407f1bb99659812c6faed88aad42eba5 pnet-0.6.12.tar.gz 3514901
-SHA256 d9ac56d4ee5850621f2ae81a6c56460dd2236bc70d98b5493e1248d07dea77c6 pnet-0.6.12.tar.gz 3514901
diff --git a/dev-dotnet/pnet/files/digest-pnet-0.7.4 b/dev-dotnet/pnet/files/digest-pnet-0.7.4
deleted file mode 100644
index 8cdebfd6c293..000000000000
--- a/dev-dotnet/pnet/files/digest-pnet-0.7.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 064baa390e6b1ae9463f68c929e36f74 pnet-0.7.4.tar.gz 3625274
-RMD160 bdc683433e159a5b0af73ac9b8c05b94886fa296 pnet-0.7.4.tar.gz 3625274
-SHA256 fe1367cbc3e69dea77aef20438fb024864ed41b09dbd6817b08ec36128361ea5 pnet-0.7.4.tar.gz 3625274
diff --git a/dev-dotnet/pnet/pnet-0.6.12.ebuild b/dev-dotnet/pnet/pnet-0.6.12.ebuild
deleted file mode 100644
index 9ce71902fe94..000000000000
--- a/dev-dotnet/pnet/pnet-0.6.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnet/pnet-0.6.12.ebuild,v 1.11 2007/10/09 14:33:46 corsair Exp $
-
-DESCRIPTION="Portable.NET runtime, compiler, tools"
-HOMEPAGE="http://www.dotgnu.org/"
-SRC_URI="mirror://gnu/dotgnu/pnet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-util/treecc-0.3.0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Fix symlink for renamed executables
-	sed -i "s:ilasm.1.gz:ilasm.pnet.1.gz:" ilasm/Makefile.am
-	sed -i "s:al.1.gz:al.pnet.1.gz:" ilasm/Makefile.am
-}
-
-src_compile() {
-	./auto_gen.sh
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	# Rename file names conflicting with dev-lang/mono
-	# This should be removed again once we have 'dotnet-config'
-	# bug 39369
-	mv ${D}/usr/bin/al ${D}/usr/bin/al.pnet
-	mv ${D}/usr/bin/ilasm ${D}/usr/bin/ilasm.pnet
-	mv ${D}/usr/bin/resgen ${D}/usr/bin/resgen.pnet
-	mv ${D}/usr/share/man/man1/ilasm.1 ${D}/usr/share/man/man1/ilasm.pnet.1
-	mv ${D}/usr/share/man/man1/resgen.1 ${D}/usr/share/man/man1/resgen.pnet.1
-
-	dodoc AUTHORS ChangeLog HACKING INSTALL NEWS README
-	dodoc doc/gtk-sharp.HOWTO
-	dohtml doc/*.html
-
-	# init script
-	exeinto /etc/init.d ; newexe ${FILESDIR}/dotnet.init dotnet
-	insinto /etc/conf.d ; newins ${FILESDIR}/dotnet.conf dotnet
-}
-
-pkg_postinst() {
-	echo
-	elog "If you want to avoid typing '<runtime> program.exe'"
-	elog "you can configure your runtime in /etc/conf.d/dotnet"
-	elog "Use /etc/init.d/dotnet to register your runtime"
-	echo
-	elog "dev-dotnet/pnet is only the runtime, compiler and tools"
-	elog "for DotGNU Portable.NET."
-	elog "For running and developing applications that use .NET APIs"
-	elog "you will also need to install the library: dev-dotnet/pnetlib"
-	echo
-}
diff --git a/dev-dotnet/pnet/pnet-0.7.4.ebuild b/dev-dotnet/pnet/pnet-0.7.4.ebuild
deleted file mode 100644
index 6ea5f24b9a4c..000000000000
--- a/dev-dotnet/pnet/pnet-0.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnet/pnet-0.7.4.ebuild,v 1.11 2007/10/09 14:33:46 corsair Exp $
-
-inherit autotools
-
-DESCRIPTION="Portable.NET runtime, compiler, tools"
-HOMEPAGE="http://www.dotgnu.org/"
-SRC_URI="http://www.southern-storm.com.au/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-util/treecc-0.3.0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix symlink for renamed executables ; Bug #39369
-	# Renamed to avoid conflicting with dev-lang/mono
-	# This should be removed again once we have 'dotnet-config'
-	sed -i "s:ilasm.1.gz:ilasm.pnet.1.gz:" ilasm/Makefile.am
-	sed -i "s:al.1.gz:al.pnet.1.gz:" ilasm/Makefile.am
-
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# move fixes for the mono conflict
-	mv ${D}/usr/bin/al ${D}/usr/bin/al.pnet
-	mv ${D}/usr/bin/ilasm ${D}/usr/bin/ilasm.pnet
-	mv ${D}/usr/bin/resgen ${D}/usr/bin/resgen.pnet
-	mv ${D}/usr/share/man/man1/ilasm.1 ${D}/usr/share/man/man1/ilasm.pnet.1
-	mv ${D}/usr/share/man/man1/resgen.1 ${D}/usr/share/man/man1/resgen.pnet.1
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-	dodoc doc/gtk-sharp.HOWTO
-	dohtml doc/*.html
-}