| 1 |
commit: 60ba53b88755c62f589c3787765bd6f39da78eef |
| 2 |
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Feb 6 08:52:03 2015 +0000 |
| 4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 6 20:24:01 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=60ba53b8 |
| 7 |
|
| 8 |
Updated bowtie:{1,2} ebuilds to match current ebuild policy. |
| 9 |
|
| 10 |
--- |
| 11 |
sci-biology/bowtie/bowtie-1.1.1.ebuild | 29 +++++++++++++++++++---------- |
| 12 |
sci-biology/bowtie/bowtie-2.2.4.ebuild | 23 ++++++++++++----------- |
| 13 |
2 files changed, 31 insertions(+), 21 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sci-biology/bowtie/bowtie-1.1.1.ebuild b/sci-biology/bowtie/bowtie-1.1.1.ebuild |
| 16 |
index ad20591..f152518 100644 |
| 17 |
--- a/sci-biology/bowtie/bowtie-1.1.1.ebuild |
| 18 |
+++ b/sci-biology/bowtie/bowtie-1.1.1.ebuild |
| 19 |
@@ -4,22 +4,27 @@ |
| 20 |
|
| 21 |
EAPI=5 |
| 22 |
|
| 23 |
-inherit base eutils toolchain-funcs |
| 24 |
+inherit eutils toolchain-funcs |
| 25 |
|
| 26 |
DESCRIPTION="An ultrafast memory-efficient short read aligner" |
| 27 |
HOMEPAGE="http://bowtie-bio.sourceforge.net/" |
| 28 |
-SRC_URI="mirror://sourceforge/bowtie-bio/bowtie-1.1.1-src.zip" |
| 29 |
+SRC_URI="mirror://sourceforge/bowtie-bio/${P}-src.zip" |
| 30 |
|
| 31 |
LICENSE="Artistic" |
| 32 |
SLOT="1" |
| 33 |
-IUSE="" |
| 34 |
KEYWORDS="~amd64 ~x86 ~x64-macos" |
| 35 |
|
| 36 |
+IUSE="examples" |
| 37 |
+ |
| 38 |
DEPEND="app-arch/unzip" |
| 39 |
RDEPEND="" |
| 40 |
|
| 41 |
PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch ) |
| 42 |
|
| 43 |
+src_prepare() { |
| 44 |
+ epatch ${PATCHES[@]} |
| 45 |
+} |
| 46 |
+ |
| 47 |
src_compile() { |
| 48 |
unset CFLAGS |
| 49 |
emake \ |
| 50 |
@@ -29,14 +34,18 @@ src_compile() { |
| 51 |
} |
| 52 |
|
| 53 |
src_install() { |
| 54 |
- dobin bowtie bowtie-* |
| 55 |
- exeinto /usr/share/${PN}/scripts |
| 56 |
- doexe scripts/* |
| 57 |
+ dobin ${PN} ${PN}-* |
| 58 |
|
| 59 |
- insinto /usr/share/${PN} |
| 60 |
- doins -r genomes indexes |
| 61 |
+ exeinto /usr/libexec/${PN} |
| 62 |
+ doexe scripts/* |
| 63 |
|
| 64 |
- newman MANUAL bowtie.1 |
| 65 |
+ newman MANUAL ${PN} |
| 66 |
dodoc AUTHORS NEWS TUTORIAL doc/README |
| 67 |
- dohtml doc/{manual.html,style.css} |
| 68 |
+ docinto html |
| 69 |
+ dodoc doc/{manual.html,style.css} |
| 70 |
+ |
| 71 |
+ if use examples; then |
| 72 |
+ insinto /usr/share/${PN} |
| 73 |
+ doins -r genomes indexes |
| 74 |
+ fi |
| 75 |
} |
| 76 |
|
| 77 |
diff --git a/sci-biology/bowtie/bowtie-2.2.4.ebuild b/sci-biology/bowtie/bowtie-2.2.4.ebuild |
| 78 |
index 19e0bca..4b518ca 100644 |
| 79 |
--- a/sci-biology/bowtie/bowtie-2.2.4.ebuild |
| 80 |
+++ b/sci-biology/bowtie/bowtie-2.2.4.ebuild |
| 81 |
@@ -4,7 +4,7 @@ |
| 82 |
|
| 83 |
EAPI=5 |
| 84 |
|
| 85 |
-inherit base eutils toolchain-funcs |
| 86 |
+inherit eutils toolchain-funcs |
| 87 |
|
| 88 |
DESCRIPTION="An ultrafast memory-efficient short read aligner" |
| 89 |
HOMEPAGE="http://bowtie-bio.sourceforge.net/bowtie2/" |
| 90 |
@@ -12,9 +12,11 @@ SRC_URI="mirror://sourceforge/project/${PN}-bio/${PN}2/${PV}/${PN}2-${PV}-source |
| 91 |
|
| 92 |
LICENSE="GPL-3" |
| 93 |
SLOT="2" |
| 94 |
-IUSE="examples" |
| 95 |
KEYWORDS="~amd64 ~x86" |
| 96 |
|
| 97 |
+IUSE="examples cpu_flags_x86_sse2" |
| 98 |
+REQUIRED_USE="cpu_flags_x86_sse2" |
| 99 |
+ |
| 100 |
RDEPEND="dev-lang/perl" |
| 101 |
DEPEND="${RDEPEND} |
| 102 |
app-arch/unzip" |
| 103 |
@@ -23,16 +25,13 @@ S="${WORKDIR}/${PN}2-${PV}" |
| 104 |
|
| 105 |
PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch ) |
| 106 |
|
| 107 |
-pkg_pretend() { |
| 108 |
- grep "sse2" /proc/cpuinfo > /dev/null |
| 109 |
- if [[ $? -ne 0 ]] ; then |
| 110 |
- ewarn "Your processor does not support sse2. Bowtie will probably not work on this machine." |
| 111 |
- fi |
| 112 |
+src_prepare() { |
| 113 |
+ epatch ${PATCHES[@]} |
| 114 |
} |
| 115 |
|
| 116 |
src_compile() { |
| 117 |
+ unset CFLAGS |
| 118 |
emake \ |
| 119 |
- CC="$(tc-getCC)" \ |
| 120 |
CXX="$(tc-getCXX)" \ |
| 121 |
EXTRA_FLAGS="${LDFLAGS}" \ |
| 122 |
RELEASE_FLAGS="${CXXFLAGS} -msse2" |
| 123 |
@@ -40,12 +39,14 @@ src_compile() { |
| 124 |
|
| 125 |
src_install() { |
| 126 |
dobin ${PN}2 ${PN}2-* |
| 127 |
- exeinto /usr/share/${PN}2/scripts |
| 128 |
+ |
| 129 |
+ exeinto /usr/libexec/${PN}2 |
| 130 |
doexe scripts/* |
| 131 |
|
| 132 |
- newman MANUAL ${PN}2.1 |
| 133 |
+ newman MANUAL ${PN}2.2 |
| 134 |
dodoc AUTHORS NEWS TUTORIAL |
| 135 |
- dohtml doc/manual.html doc/style.css |
| 136 |
+ docinto html |
| 137 |
+ dodoc doc/{manual.html,style.css} |
| 138 |
|
| 139 |
if use examples; then |
| 140 |
insinto /usr/share/${PN}2 |
Archives