Version bump, change name to follow Debian, and drop old files

(Portage version: 2.2_rc30/cvs/Linux x86_64)

3 files changed, 12 insertions, 59 deletions

diff --git a/sci-biology/plink/ChangeLog b/sci-biology/plink/ChangeLog
index 308221f90b68..8a1cad862711 100644
--- a/sci-biology/plink/ChangeLog
+++ b/sci-biology/plink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/plink
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.1 2009/03/07 04:37:27 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.2 2009/06/21 14:58:13 weaver Exp $
+
+*plink-1.06 (21 Jun 2009)
+
+  21 Jun 2009; Andrey Kislyuk <weaver@gentoo.org>
+  -files/plink-1.05-gcc43.patch, -plink-1.05.ebuild, +plink-1.06.ebuild:
+  Version bump, change name to follow Debian, and drop old files
 
   06 Mar 2009; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
   New package, ebuild written by Neil Shephard <nshephard@gmail.com> and me
diff --git a/sci-biology/plink/files/plink-1.05-gcc43.patch b/sci-biology/plink/files/plink-1.05-gcc43.patch
deleted file mode 100644
index 84f813cc88e4..000000000000
--- a/sci-biology/plink/files/plink-1.05-gcc43.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -durr plink-1.05-src-orig/helper.cpp plink-1.05-src/helper.cpp
---- plink-1.05-src-orig/helper.cpp	2008-12-11 20:52:22.000000000 +0000
-+++ plink-1.05-src/helper.cpp	2009-03-06 23:22:06.199103558 +0000
-@@ -36,7 +36,7 @@
- 
- extern ofstream LOG;
- extern Plink * PP;
--
-+/*
- template <class T>
- bool from_string(T& t, 
-                  const std::string& s, 
-@@ -45,7 +45,7 @@
-   std::istringstream iss(s);
-   return !(iss >> f >> t).fail();
- }
--
-+*/
- vector<bool> nvec_bool()
- { 
-   vector<bool> t(0);
-diff -durr plink-1.05-src-orig/helper.h plink-1.05-src/helper.h
---- plink-1.05-src-orig/helper.h	2008-12-11 20:52:24.000000000 +0000
-+++ plink-1.05-src/helper.h	2009-03-06 23:22:06.218353426 +0000
-@@ -18,6 +18,9 @@
- #include <vector>
- #include <cstdio>
- 
-+#include <iostream>
-+#include <sstream>
-+
- #include "plink.h"
- 
- template<class T>
-@@ -89,7 +92,13 @@
- template <class T>
- bool from_string(T& t, 
- 		 const std::string& s, 
--		 std::ios_base& (*f)(std::ios_base&));
-+		 std::ios_base& (*f)(std::ios_base&))
-+{
-+   std::istringstream iss(s);
-+   return !(iss >> f >> t).fail();
-+ }
-+
-+
- 
- void error(string);
- void shutdown();
diff --git a/sci-biology/plink/plink-1.05.ebuild b/sci-biology/plink/plink-1.06.ebuild
index 17d8a31f5237..18ba53cb75ac 100644
--- a/sci-biology/plink/plink-1.05.ebuild
+++ b/sci-biology/plink/plink-1.06.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.05.ebuild,v 1.1 2009/03/07 04:37:27 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.06.ebuild,v 1.1 2009/06/21 14:58:13 weaver Exp $
 
-EAPI="1"
-
-inherit eutils
+EAPI="2"
 
 DESCRIPTION="Whole genome association analysis toolset"
 HOMEPAGE="http://pngu.mgh.harvard.edu/~purcell/plink/"
@@ -20,17 +18,15 @@ RDEPEND=""
 
 S="${WORKDIR}/${P}-src"
 
-# Package collides with net-misc/putty. Renamed to snplink following Debian.
+# Package collides with net-misc/putty. Renamed to p-link following discussion with Debian.
 # Package contains bytecode-only jar gPLINK.jar. Ignored, notified upstream.
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-*.patch
+src_prepare() {
 	sed -i -e '/CXXFLAGS =/ s/^/#/' -e 's/-static//' "${S}/Makefile" || die
 	use webcheck || sed -i '/WITH_WEBCHECK =/ s/^/#/' "${S}/Makefile" || die
 }
 
 src_install() {
-	newbin plink snplink || die
+	newbin plink p-link || die
 	dodoc README.txt
 }