Duplicate license file (see bug #211534)

Package-Manager: portage-2.1.4.4

4 files changed, 23 insertions, 18 deletions

diff --git a/sci-mathematics/wxmaxima/ChangeLog b/sci-mathematics/wxmaxima/ChangeLog
index 1183839336dd..7f547d889fe6 100644
--- a/sci-mathematics/wxmaxima/ChangeLog
+++ b/sci-mathematics/wxmaxima/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/wxmaxima
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/ChangeLog,v 1.11 2008/01/29 16:48:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/ChangeLog,v 1.12 2008/02/26 17:34:25 bicatali Exp $
+
+  26 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  wxmaxima-0.7.3a.ebuild, wxmaxima-0.7.4.ebuild:
+  Duplicate license file (see bug #211534)
 
 *wxmaxima-0.7.4 (29 Jan 2008)
 
@@ -54,4 +58,3 @@
   <lucas.chiesa@gmail.com> for his help in the gentooscience overlay, 
   Andreas Volz <linux@brachttal.net>, and Yosef Meller <yosefm@gmail.com>
   for their initial help.
-
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index c3a483021d1b..d23dbad331ff 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST wxMaxima-0.7.3a.tar.gz 802526 RMD160 ed4ae9d852046d21c46cc8d2fccd301063cbc156 SHA1 456ee53fc8dd273d64badec2a9867d7dc8c1470b SHA256 a87e1a3f118f1bd7b17936248ee38671525cdba02770fc121c632dbb5b6365f2
 DIST wxMaxima-0.7.4.tar.gz 809228 RMD160 fcd8d5ae66eecfb4b3bd5ba87157c33f03faa6f3 SHA1 6df58896ba8d01b766eb29e2b08d34955ab68e85 SHA256 caf2115507da686636789b69b4de1392ce014569172ca579a8b4df67c00ebd2e
-EBUILD wxmaxima-0.7.3a.ebuild 1696 RMD160 42e473c6afa7d15913b1c0fba52d067620a672c4 SHA1 f2dd2766dc74c994b82d744095f2f3beb1d2ee37 SHA256 375499dd39697475ed4be8f2c394ac569e421b46813918cee0b44a4324517a93
-EBUILD wxmaxima-0.7.4.ebuild 1600 RMD160 b18eb07099f910a857ede6e06fcb8ff243d7364c SHA1 4c24cb456707a31afccd0852360a2b2eaa4ebf48 SHA256 088297a7b9b18e31ef5e57511e516bd0d189e80c792616ac7f7f260264a733a1
-MISC ChangeLog 2063 RMD160 3e996c874ac1546329f6fb4d698b6f9a87f4aec2 SHA1 457de275c5023a0bdf844bbe48fef44348aa2bf2 SHA256 cce0be6c2f45a35d362f283095fad632c5d98426bfa36506eaa47fe918e59fe6
+EBUILD wxmaxima-0.7.3a.ebuild 1574 RMD160 0b81f07f5b1311412a0fe9ccd101e0fa14c58b4d SHA1 c44d8e091987442c9c7b63a2527a9cc18bc7f38f SHA256 2f863890b084309843f8070d29b71c3af943a5f458dbf64da2f62d367b8cdf2c
+EBUILD wxmaxima-0.7.4.ebuild 1476 RMD160 418cb54d42a71c0feaf73fbb0389a6fb96a07848 SHA1 5f2caa9983d5693dc516dabb807bda91d1673ccd SHA256 250ae81e3e1cce3bc35bfc571fca8b70d7a78d807c9a856e8f450e57ab9e46ca
+MISC ChangeLog 2210 RMD160 321d116d4b4b6418921d391e1ad75ffe20bc3b92 SHA1 0ded45878774fde727074aeaac20fc0545ad6c7c SHA256 ab4e8d7e725313854dab82e426344f65fef0b5929e02243ff162c7567888c6dd
 MISC metadata.xml 517 RMD160 baf1e245fd04a68066d9df651bfabafdad5bf93b SHA1 5f2e8be04f1cbfb3f71c45e535044d029632e49f SHA256 84060fc148aeee241cd08b55666c2c0783203d5085b8b3ebe2d95a6b6e198b71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxE2q1ycZbhPLE2ARAldEAKCWJF39lL1KH8ccZ4wmlc2wCyTP7wCfZyGJ
+X0zVa4BgXVYnfF+142hJS7Q=
+=X0cm
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild b/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild
index f13c10891d80..a2becac60368 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild,v 1.6 2007/12/22 13:47:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-0.7.3a.ebuild,v 1.7 2008/02/26 17:34:25 bicatali Exp $
 
 WX_GTK_VER="2.6"
 inherit eutils autotools wxwidgets fdo-mime
@@ -35,7 +35,6 @@ src_compile () {
 
 	# consistent package names
 	sed -i \
-		-e 's:COPYING::' \
 		-e "s:${datadir}/wxMaxima:${datadir}/${PN}:g" \
 		Makefile.in data/Makefile.in || die "sed failed"
 
@@ -56,10 +55,7 @@ src_compile () {
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	newicon maxima-new.png wxmaxima.png
-	make_desktop_entry wxmaxima "wxMaxima ${PV}" wxmaxima \
-		"Science;Math;Education"
-
-	dosym "${PORTDIR}"/licenses/${LICENSE} /usr/share/${PN}/COPYING
+	make_desktop_entry wxmaxima wxMaxima wxmaxima
 	dodir /usr/share/doc/${PF}
 	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
 	dodoc AUTHORS
diff --git a/sci-mathematics/wxmaxima/wxmaxima-0.7.4.ebuild b/sci-mathematics/wxmaxima/wxmaxima-0.7.4.ebuild
index 9b1f16f9a82d..88ba8cd71f13 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-0.7.4.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-0.7.4.ebuild,v 1.1 2008/01/29 16:48:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-0.7.4.ebuild,v 1.2 2008/02/26 17:34:25 bicatali Exp $
 
 WX_GTK_VER="2.8"
 inherit eutils autotools wxwidgets fdo-mime
@@ -27,7 +27,6 @@ src_compile () {
 
 	# consistent package names
 	sed -i \
-		-e 's:COPYING::' \
 		-e "s:${datadir}/wxMaxima:${datadir}/${PN}:g" \
 		Makefile.in data/Makefile.in || die "sed failed"
 
@@ -48,10 +47,7 @@ src_compile () {
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	newicon maxima-new.png wxmaxima.png
-	make_desktop_entry wxmaxima "wxMaxima ${PV}" wxmaxima \
-		"Science;Math;Education"
-
-	dosym "${PORTDIR}"/licenses/${LICENSE} /usr/share/${PN}/COPYING
+	make_desktop_entry wxmaxima wxMaxima wxmaxima
 	dodir /usr/share/doc/${PF}
 	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
 	dodoc AUTHORS