dev-dotnet/log4net: version bump -> 1.2.10-r1 - Installing separate DLLs for different .NET versions; Removed assembly from GAC

Package-Manager: portage-2.1.2.7

5 files changed, 34 insertions, 22 deletions

diff --git a/dev-dotnet/log4net/ChangeLog b/dev-dotnet/log4net/ChangeLog
index 692f19dadf40..910f0cb39bc0 100644
--- a/dev-dotnet/log4net/ChangeLog
+++ b/dev-dotnet/log4net/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/log4net
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/ChangeLog,v 1.2 2007/06/25 00:59:49 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/ChangeLog,v 1.3 2007/06/26 01:00:24 jurek Exp $
+
+*log4net-1.2.10-r1 (26 Jun 2007)
+
+  26 Jun 2007; Jurek Bartuszek <jurek@gentoo.org> files/log4net.pc.in,
+  -log4net-1.2.10.ebuild, +log4net-1.2.10-r1.ebuild:
+  - Installing separate DLLs for different .NET versions
+  - Removed assembly from GAC
 
   25 Jun 2007; Jurek Bartuszek <jurek@gentoo.org> +files/log4net.pc.in,
   -files/log4net-1.2.10.pc, log4net-1.2.10.ebuild:
diff --git a/dev-dotnet/log4net/Manifest b/dev-dotnet/log4net/Manifest
index 42a416ab62a6..7b74d5b98b10 100644
--- a/dev-dotnet/log4net/Manifest
+++ b/dev-dotnet/log4net/Manifest
@@ -1,20 +1,20 @@
-AUX log4net.pc.in 195 RMD160 d15dfbc9c71287a5b870602c077871c9051085b2 SHA1 5c81777873bf0c80ba8d753182e7a649d010f7b3 SHA256 9bf642e614077435fd0a32d5a6a2258a96ad74d2c348fb85a2623284c8f6d563
-MD5 2e541c7ae4e6064cd0177ed665533b19 files/log4net.pc.in 195
-RMD160 d15dfbc9c71287a5b870602c077871c9051085b2 files/log4net.pc.in 195
-SHA256 9bf642e614077435fd0a32d5a6a2258a96ad74d2c348fb85a2623284c8f6d563 files/log4net.pc.in 195
+AUX log4net.pc.in 209 RMD160 e9fdcb366272a89198d536a7212dceaa86a54029 SHA1 bb7810ddd4717e8cd949544bb6ad025358652ddc SHA256 ce2ed7b5e7c534876f661c582a574e1964de00d93264f6aceb1a9896a461f64e
+MD5 5097a816338ed555b9922b24b7f910f4 files/log4net.pc.in 209
+RMD160 e9fdcb366272a89198d536a7212dceaa86a54029 files/log4net.pc.in 209
+SHA256 ce2ed7b5e7c534876f661c582a574e1964de00d93264f6aceb1a9896a461f64e files/log4net.pc.in 209
 DIST incubating-log4net-1.2.10.zip 8203576 RMD160 970aa5af9035d1ef01c6b49085639f95bb3d6c00 SHA1 4f8ff9892665469f915855692c9fc02801038837 SHA256 50f6124dd01febb7716625aced1727b3db200d589af2d84c99ee22d5ab34fb3f
-EBUILD log4net-1.2.10.ebuild 1361 RMD160 0f960c79cd361f647145a7792dcd7b7b0ab6736e SHA1 fb8bfdaab05104a20a5c954e9c537bd11b1b4602 SHA256 c74131c19fbd46a76993dcc76b9d96e3ca14a098b362a89d3fe33f44c53f78fc
-MD5 590fae173b2155819f558b98adf24b9f log4net-1.2.10.ebuild 1361
-RMD160 0f960c79cd361f647145a7792dcd7b7b0ab6736e log4net-1.2.10.ebuild 1361
-SHA256 c74131c19fbd46a76993dcc76b9d96e3ca14a098b362a89d3fe33f44c53f78fc log4net-1.2.10.ebuild 1361
-MISC ChangeLog 775 RMD160 f82efa1e559fb7b64866995ae20c218f36064554 SHA1 f7aaa84b8e02e0cf82740e2791caa38ef09f3dd4 SHA256 d0a1c9fc6393e0e1f420ec0113d6eef29c716829af8142da21bcc9f343dbd2d2
-MD5 6df4f0df59ea75cfb0d901e751878491 ChangeLog 775
-RMD160 f82efa1e559fb7b64866995ae20c218f36064554 ChangeLog 775
-SHA256 d0a1c9fc6393e0e1f420ec0113d6eef29c716829af8142da21bcc9f343dbd2d2 ChangeLog 775
+EBUILD log4net-1.2.10-r1.ebuild 1547 RMD160 3644b936437d4a4b01d9d6a1776866bbd2ce7988 SHA1 a6ccd8ec1e83ec72dbacbad84c2cdd227037cab3 SHA256 31ce983475c2e83ffdf9b6a4098f5cc2059aea23b1d33b721b95fed9d12fbe43
+MD5 71fce977acc7152435362a5f78e7685e log4net-1.2.10-r1.ebuild 1547
+RMD160 3644b936437d4a4b01d9d6a1776866bbd2ce7988 log4net-1.2.10-r1.ebuild 1547
+SHA256 31ce983475c2e83ffdf9b6a4098f5cc2059aea23b1d33b721b95fed9d12fbe43 log4net-1.2.10-r1.ebuild 1547
+MISC ChangeLog 1021 RMD160 afd9912049cfee1138170ff1ae01d271fa1ff229 SHA1 36f43957e3f59224420396233500b929c790526c SHA256 0a8db287c7ce9b25eba7dfda55bdc2531159060f60e91b0c992dc19e524af702
+MD5 3087ccc8ee0344c9bbe09ff097e1dcc1 ChangeLog 1021
+RMD160 afd9912049cfee1138170ff1ae01d271fa1ff229 ChangeLog 1021
+SHA256 0a8db287c7ce9b25eba7dfda55bdc2531159060f60e91b0c992dc19e524af702 ChangeLog 1021
 MISC metadata.xml 251 RMD160 c87695e01cf7a981ddd9f659d3e333da42b45f23 SHA1 df82d1167aa2452fd70985ce0affaf8cfeb21536 SHA256 62b26767094e94c9c285bce5f820209e2edfb9d4a9dac78e194ea485fa84b64f
 MD5 f20da4f3b954c7118639e75d493c35b9 metadata.xml 251
 RMD160 c87695e01cf7a981ddd9f659d3e333da42b45f23 metadata.xml 251
 SHA256 62b26767094e94c9c285bce5f820209e2edfb9d4a9dac78e194ea485fa84b64f metadata.xml 251
-MD5 7e5434b2c2ad0b65d88ef70e0400ce15 files/digest-log4net-1.2.10 271
-RMD160 cd954771566ce710c7cfb8415f7e80e563f187f8 files/digest-log4net-1.2.10 271
-SHA256 4f94fc295bc2f98739ea7beadd9380c8dbb0453375a6f1d868d686e94c54208a files/digest-log4net-1.2.10 271
+MD5 7e5434b2c2ad0b65d88ef70e0400ce15 files/digest-log4net-1.2.10-r1 271
+RMD160 cd954771566ce710c7cfb8415f7e80e563f187f8 files/digest-log4net-1.2.10-r1 271
+SHA256 4f94fc295bc2f98739ea7beadd9380c8dbb0453375a6f1d868d686e94c54208a files/digest-log4net-1.2.10-r1 271
diff --git a/dev-dotnet/log4net/files/digest-log4net-1.2.10 b/dev-dotnet/log4net/files/digest-log4net-1.2.10-r1
index 25a43400cc0f..25a43400cc0f 100644
--- a/dev-dotnet/log4net/files/digest-log4net-1.2.10
+++ b/dev-dotnet/log4net/files/digest-log4net-1.2.10-r1
diff --git a/dev-dotnet/log4net/files/log4net.pc.in b/dev-dotnet/log4net/files/log4net.pc.in
index 5f2f2a258b1e..7d319c473168 100644
--- a/dev-dotnet/log4net/files/log4net.pc.in
+++ b/dev-dotnet/log4net/files/log4net.pc.in
@@ -5,4 +5,4 @@ libdir=${exec_prefix}/@LIBDIR@
 Name: Log4net
 Description: Log4net - Logging library for C# and VB.NET
 Version: @VERSION@
-Libs: -r:${libdir}/log4net/log4net.dll
+Libs: -r:${libdir}/log4net/@NET_VERSION@/log4net.dll
diff --git a/dev-dotnet/log4net/log4net-1.2.10.ebuild b/dev-dotnet/log4net/log4net-1.2.10-r1.ebuild
index b5145c94f118..663c10301f70 100644
--- a/dev-dotnet/log4net/log4net-1.2.10.ebuild
+++ b/dev-dotnet/log4net/log4net-1.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/log4net-1.2.10.ebuild,v 1.2 2007/06/25 00:59:49 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/log4net/log4net-1.2.10-r1.ebuild,v 1.1 2007/06/26 01:00:24 jurek Exp $
 
 inherit eutils mono
 
@@ -33,16 +33,21 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/$(get_libdir)/${PN}
+	insinto /usr/$(get_libdir)/${PN}/1.0
 	doins bin/mono/1.0/release/${PN}.dll
 
+	insinto /usr/$(get_libdir)/${PN}/2.0
+	doins bin/mono/2.0/release/${PN}.dll
+
 	dodir /usr/$(get_libdir)/pkgconfig
 	sed -e "s:@VERSION@:${PV}:" \
 		-e "s:@LIBDIR@:$(get_libdir):" \
+		-e "s:@NET_VERSION@:1.0:" \
 		${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc
-
-	/usr/bin/gacutil /i bin/mono/1.0/release/${PN}.dll \
-		/check_refs /root ${D}/usr/$(get_libdir)
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@LIBDIR@:$(get_libdir):" \
+		-e "s:@NET_VERSION@:2.0:" \
+		${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}-2.0.pc
 
 	if use doc; then
 		insinto /usr/share/doc/${PF}