aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2013-09-14 00:18:50 +0200
committerMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2013-09-14 00:18:50 +0200
commit51dbd486d1fb08026b4f366e33c2a1395f49b16e (patch)
treea586ce02d2a4ca3627677b3b5f3a5919012e79e7
parentmore 12.0.0 cleanup, still not working (diff)
downloadsci-51dbd486d1fb08026b4f366e33c2a1395f49b16e.tar.gz
sci-51dbd486d1fb08026b4f366e33c2a1395f49b16e.tar.bz2
sci-51dbd486d1fb08026b4f366e33c2a1395f49b16e.zip
Fix URL to point to a public SVN repository
-rw-r--r--sci-biology/ncbi-tools++/ChangeLog11
-rw-r--r--sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-svn-URL-upstream.patch10
-rw-r--r--sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-svn-URL-upstream.patch10
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild5
-rw-r--r--sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild1
5 files changed, 35 insertions, 2 deletions
diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index b4a234b98..6b670ef3e 100644
--- a/sci-biology/ncbi-tools++/ChangeLog
+++ b/sci-biology/ncbi-tools++/ChangeLog
@@ -3,6 +3,17 @@
# $Header: $
13 Sep 2013; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+ ncbi-tools++-9.0.0-r1.ebuild, ncbi-tools++-12.0.0.ebuild,
+ +files/ncbi-tools++-9.0.0-fix-svn-URL-upstream.patch,
+ +files/ncbi-tools++-12.0.0-fix-svn-URL-upstream.patch:
+ Fix URL to point to a public SVN repository (an upstream patch from email
+ list):
+
+ Date: Sun, 28 Jul 2013 22:05:34 -0400
+ CC: <cpp@ncbi.nlm.nih.gov>
+ Subject: Re: [C++] new project startup example needed
+
+ 13 Sep 2013; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
ncbi-tools++-12.0.0.ebuild,
files/ncbi-tools++-9.0.0-fix-creaders-linking.patch,
+files/ncbi-tools++-12.0.0-fix-FreeTDS-upstream.patch,
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-svn-URL-upstream.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-svn-URL-upstream.patch
new file mode 100644
index 000000000..8bba91f1d
--- /dev/null
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-12.0.0-fix-svn-URL-upstream.patch
@@ -0,0 +1,10 @@
+--- scripts/common/new_project.sh (revision 408264)
++++ scripts/common/new_project.sh (working copy)
+@@ -6,7 +6,7 @@
+ svn_revision=`echo '$Revision$' | sed "s%\\$[R]evision: *\\([^$][^$]*\\) \\$.*%\\1%"`
+ def_builddir="$NCBI/c++/Debug/build"
+
+-repository_url='https://svn.ncbi.nlm.nih.gov/repos/toolkit'
++repository_url='http://anonsvn.ncbi.nlm.nih.gov/repos/v1'
+ tmp_app_checkout_dir='tmp_app_sample'
+ stem='sample/app'
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-svn-URL-upstream.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-svn-URL-upstream.patch
new file mode 100644
index 000000000..8bba91f1d
--- /dev/null
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-9.0.0-fix-svn-URL-upstream.patch
@@ -0,0 +1,10 @@
+--- scripts/common/new_project.sh (revision 408264)
++++ scripts/common/new_project.sh (working copy)
+@@ -6,7 +6,7 @@
+ svn_revision=`echo '$Revision$' | sed "s%\\$[R]evision: *\\([^$][^$]*\\) \\$.*%\\1%"`
+ def_builddir="$NCBI/c++/Debug/build"
+
+-repository_url='https://svn.ncbi.nlm.nih.gov/repos/toolkit'
++repository_url='http://anonsvn.ncbi.nlm.nih.gov/repos/v1'
+ tmp_app_checkout_dir='tmp_app_sample'
+ stem='sample/app'
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
index 7415d8ff1..f217ab346 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-12.0.0.ebuild
@@ -105,9 +105,10 @@ src_prepare() {
# The conf-opts.patch and as-needed.patch need to be adjusted for 12.0.0 line numbers
local PATCHES=(
- "${FILESDIR}"/${P}-conf-opts.patch
- "${FILESDIR}"/${P}-as-needed.patch
+ #"${FILESDIR}"/${P}-conf-opts.patch
+ #"${FILESDIR}"/${P}-as-needed.patch
"${FILESDIR}"/${P}-fix-creaders-linking.patch
+ "${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
"${FILESDIR}"/${P}-fix-FreeTDS-upstream.patch
)
epatch ${PATCHES[@]}
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
index a43dfefba..24f92be32 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-9.0.0-r1.ebuild
@@ -106,6 +106,7 @@ src_prepare() {
"${FILESDIR}"/${P}-conf-opts.patch
"${FILESDIR}"/${P}-as-needed.patch
"${FILESDIR}"/${P}-fix-creaders-linking.patch
+ "${FILESDIR}"/${P}-fix-svn-URL-upstream.patch
"${FILESDIR}"/${P}-fix-undef-reference-to-GenBankReaders_Register_Id1.patch
)
epatch ${PATCHES[@]}