Duplicate license file (see bug #211534)

(Portage version: 2.1.4.4)

3 files changed, 10 insertions, 15 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/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