sci-chemistry/polygon: Version BUmp; fixed license

Package-Manager: portage-2.2.0_alpha180

5 files changed, 34 insertions, 23 deletions

diff --git a/sci-chemistry/polygon/ChangeLog b/sci-chemistry/polygon/ChangeLog
index 354b0fef7..4a9ca0394 100644
--- a/sci-chemistry/polygon/ChangeLog
+++ b/sci-chemistry/polygon/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-chemistry/polygon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2013; Justin Lecher <jlec@gentoo.org> +polygon-0612.ebuild,
+  -polygon-0710.ebuild, +files/0612-db.patch, -files/0710-db.patch,
+  metadata.xml:
+  Version BUmp; fixed license
+
 *polygon-0710 (23 Oct 2009)
 
   23 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/polygon/Manifest b/sci-chemistry/polygon/Manifest
index 693c1c379..0c1b4065b 100644
--- a/sci-chemistry/polygon/Manifest
+++ b/sci-chemistry/polygon/Manifest
@@ -1,2 +1,2 @@
-DIST pdb_2009-04-29_ord.zip 4371434 SHA256 cd949ded9c7c656e4cc9d5f9c28584b648fec3bd2df2e80811ea8eb7baf81f69
-DIST polygon0710.tcl 128282 SHA256 db1b985805c750550328d0092bbf826c30df68e38453f2866329fd96cbfe45d8
+DIST pdb_2009-04-29_ord.zip 4371434 SHA256 cd949ded9c7c656e4cc9d5f9c28584b648fec3bd2df2e80811ea8eb7baf81f69 SHA512 3d1621c96f7e65197a5a7b7e655648ec957717bc38622b64f900142bac98d9b6450c8c9d128055dc9d673ae031c0a7b379a7d28ae97b22a070337b9563169287 WHIRLPOOL 258848856c4375fc00bda3382bed18a30de159348a246aa82f94569249ea24ee851109064a4800f2e17fc7d755d48d3c3f60d1608b418a198dd367a900de45fb
+DIST polygon0612.tcl 124276 SHA256 d5b2c55faa37097db04a98c70cee5a49480f0b9e6e4e93345b67eee72c2c6aac SHA512 20d5e2011d28fe38c39f92be3d2221186f43048f173eb8b3971238836b5a09ae55cb44c0aad9e9efb3206e3c8a6e0017b749ce3911455e63dd8fcdba5c7c9dfe WHIRLPOOL cbde37636166a60ea1eeabf53da5398bb10e0e2ed7742beb87738773ffd45015f3ffe1df97745a98d52b7e00a5a1700279fa73ecf20ba456d8a8c2429c3db012
diff --git a/sci-chemistry/polygon/files/0710-db.patch b/sci-chemistry/polygon/files/0612-db.patch
index faab35e4a..a12225f29 100644
--- a/sci-chemistry/polygon/files/0710-db.patch
+++ b/sci-chemistry/polygon/files/0612-db.patch
@@ -1,11 +1,11 @@
---- polygon0710.tcl	2009-10-15 16:11:36.000000000 +0200
-+++ polygon0710.tcl.new	2009-10-23 17:59:32.723500534 +0200
+--- polygon0612.tcl	2009-10-15 16:11:36.000000000 +0200
++++ polygon0612.tcl.new	2009-10-23 17:59:32.723500534 +0200
 @@ -22,7 +22,7 @@
- #

- #database name

- #

--set currentFile1 pdb_2009-04-29_ord.txt

-+set currentFile1 /usr/share/polygon/pdb_2009-04-29_ord.txt

- 

- # numcol - number of columns in the database

-   set numcol 63

+ #
+ #database name
+ #
+-set currentFile1 pdb_2009-04-29_ord.txt
++set currentFile1 /usr/share/polygon/pdb_2009-04-29_ord.txt
+ 
+ # numcol - number of columns in the database
+   set numcol 63
diff --git a/sci-chemistry/polygon/metadata.xml b/sci-chemistry/polygon/metadata.xml
index 0fbe927f0..d410f1573 100644
--- a/sci-chemistry/polygon/metadata.xml
+++ b/sci-chemistry/polygon/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/polygon/polygon-0710.ebuild b/sci-chemistry/polygon/polygon-0612.ebuild
index ba2415f16..ac2335746 100644
--- a/sci-chemistry/polygon/polygon-0710.ebuild
+++ b/sci-chemistry/polygon/polygon-0612.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=5
+
 inherit eutils
 
 DB="pdb_2009-04-29_ord"
@@ -15,23 +17,27 @@ SRC_URI="
 "
 
 SLOT="0"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~x86"
-LICENSE="as-is"
 IUSE=""
 
 RDEPEND="dev-lang/tcl"
 DEPEND="app-arch/unzip"
 
+S="${WORKDIR}"
+
 src_unpack() {
 	unpack ${DB}.zip
-	cp "${DISTDIR}"/${MY_P}.tcl "${WORKDIR}"
-	cd "${WORKDIR}"
+	cp "${DISTDIR}"/${MY_P}.tcl "${S}" || die
+}
+
+src_prepare() {
 	epatch "${FILESDIR}"/${PV}-db.patch
 }
 
 src_install() {
 	edos2unix ${MY_P}.tcl
-	newbin ${MY_P}.tcl ${PN} || die
+	newbin ${MY_P}.tcl ${PN}
 	insinto /usr/share/${PN}
-	doins ${DB}.txt || die
+	doins ${DB}.txt
 }