commit: f6b72dc87573d7e4c51d85a60f2c26b1b697bdac
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:35:49 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:38:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b72dc8
sci-libs/idlcoyote: version bump to 29161220
Added live ebuild as well.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/idlcoyote/Manifest | 2 +-
sci-libs/idlcoyote/files/idlcoyote-cgloadct.patch | 77 ----------------------
sci-libs/idlcoyote/files/idlcoyote-gdl-fixes.patch | 13 ----
sci-libs/idlcoyote/idlcoyote-20161220.ebuild | 1 +
...e-20160321.ebuild => idlcoyote-99999999.ebuild} | 25 +++----
sci-libs/idlcoyote/metadata.xml | 20 +++---
6 files changed, 25 insertions(+), 113 deletions(-)
diff --git a/sci-libs/idlcoyote/Manifest b/sci-libs/idlcoyote/Manifest
index b065d17..c8939fb 100644
--- a/sci-libs/idlcoyote/Manifest
+++ b/sci-libs/idlcoyote/Manifest
@@ -1 +1 @@
-DIST idlcoyote-20160321.zip 1360470 SHA256
35a7735df44dbad466051aa18890405e0d5a8abba4bf82dd8baafc104ca5fb56 SHA512
e4cd163b684d44bfacdd56895441ddddc7ab06360c31a94fb5334ba64ab3fb42bdf52ee359585d8766ae9d04d3f9e140e0ee6f507290f3dd01f5728384229ddd
WHIRLPOOL
309e69fae6d18640cb3bcd886091875427527939692e68417465d815827c18a8e58a1983211c9c149f84f6cfea9f9fc8273b5cb101ad6fbb30a3984cf90f1c09
+DIST idlcoyote-20161220.zip 1437560 SHA256
64cf332a6f630f97799837dc0592a28945aa3543bc38976fc1543af22fecbd30 SHA512
2c175cf3a42a0f2915eb8d02884f06892245ee023e6f3f2702b00ced0311dcde504d014fb8936aef7148fe6d91e258e3f6ffeec7d5c0bb22f65962b8ebe3bd8b
WHIRLPOOL
a4949825fc53d5002af68764df598e914525e853b929c9a686550b33c741466e1aec00b01ed083442c5baebcd89ef2314e0cb103050cfd379e161aaed49fa94d
diff --git a/sci-libs/idlcoyote/files/idlcoyote-cgloadct.patch
b/sci-libs/idlcoyote/files/idlcoyote-cgloadct.patch
deleted file mode 100644
index ec2afd0..00000000
--- a/sci-libs/idlcoyote/files/idlcoyote-cgloadct.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Author: Ole Streicher <oleb...@debian.org>
-Description: Use loadct in cgloadct if no file is specified.
- GDL does not shipt with a color table "colors1.tbl", so in the case
- that no file name is specified, fall back to loadct instead of trying to
- load this file.
---- a/cgloadct.pro
-+++ b/cgloadct.pro
-@@ -86,8 +86,8 @@
- ; If this keyword is set to a named variable, the color table is
returned as an
- ; [NCOLORS,3] array and no colors are loaded in the display.
- ; filename: in, optional, type='string'
--; The name of a color table file to open. By default colors1.tbl in the
IDL
--; resource directory.
-+; The name of a color table file to open. By default the gdl standard
-+;color table
- ; get_names: out, optional, type='string'
- ; If set to a named variable, the names of the color tables are returned
- ; and no colors are loaded in the display. Note that RGB_TABLE cannot be
-@@ -192,9 +192,8 @@
- Catch, /CANCEL
- Help, LAST_MESSAGE=1, OUTPUT=traceback
- Help, Calls=callStack
-- callingRoutine = (StrSplit(StrCompress(callStack[1])," ", /Extract))[0]
-- Print,''
-- Print, 'Traceback Report from ' + StrUpCase(callingRoutine) + ':'
-+ Print,''+callStack
-+ Print, 'Traceback Report from:'
- Print, ''
- FOR j=0,N_Elements(traceback)-1 DO Print, " " + traceback[j]
- void = Dialog_Message(traceback[0], /Error, TITLE='Trapped Error')
-@@ -236,11 +235,9 @@
- IF N_Elements(clip) EQ 0 THEN clip = [0,255]
- IF N_Elements(clip) EQ 1 THEN clip = [clip, 255]
- clip = 0 > clip < 255
-- IF N_Elements(file) EQ 0 THEN file = Filepath('colors1.tbl',
SUBDIRECTORY=['resource', 'colors'])
--
- ; Try to locate the brewer file.
- IF Keyword_Set(brewer) THEN BEGIN
-- brewerfilepath = Filepath( ROOT_DIR=cgSourceDir(), 'fsc_brewer.tbl')
-+ brewerfilepath = Filepath(
ROOT_DIR='/usr/share/gnudatalanguage/coyote', 'fsc_brewer.tbl')
- brewerFile = File_Search(brewerfilepath, Count=count)
- IF count EQ 0 THEN BEGIN
- Message, 'Cannot find the Brewer color table file
"fsc_brewer.tbl."' + $
-@@ -257,6 +254,14 @@
- IF N_Elements(ncolors) EQ 0 THEN ncolors = !D.TABLE_SIZE - bottom
- reverse = KEYWORD_SET(reverse)
-
-+ IF N_Elements(file) EQ 0 THEN BEGIN
-+ loadct, table, get_names=get_names, ncolors=ncolors, bottom=bottom, $
-+ silent=silent, rgb_table=ltable
-+ len = N_Elements(ltable)/3
-+ r = ltable[0:len-1]
-+ g = ltable[len:2*len-1]
-+ b = ltable[2*len:3*len-1]
-+ ENDIF ELSE BEGIN
- ; Open and read the color table files.
- OPENR, lun, file, /GET_LUN
- ntables = 0B
-@@ -284,6 +289,7 @@
-
- ; Close the file.
- FREE_LUN, lun
-+ ENDELSE
-
- ; Clip the colors.
- r = r[clip[0]:clip[1]]
---- a/xcolors.pro
-+++ b/xcolors.pro
-@@ -838,7 +838,7 @@
- END
-
- 'BREWER': BEGIN
-- info.file = cgFindPathTo('fsc_brewer.tbl')
-+ info.file = '/usr/share/gnudatalanguage/fsc_brewer.tbl'
- info.brewer = 1
- END
- ENDCASE
diff --git a/sci-libs/idlcoyote/files/idlcoyote-gdl-fixes.patch
b/sci-libs/idlcoyote/files/idlcoyote-gdl-fixes.patch
deleted file mode 100644
index ba0ff2c..00000000
--- a/sci-libs/idlcoyote/files/idlcoyote-gdl-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <oleb...@debian.org>
-Description: Various small patches to fix things under GDL
---- a/convert_to_type.pro
-+++ b/convert_to_type.pro
-@@ -122,7 +122,7 @@
- (type EQ 8): Message, 'Unable to convert input to STRUCTURE data
type.'
- (type EQ 10): Message, 'Unable to convert input to POINTER data
type.'
- (type EQ 11): Message, 'Unable to convert input to OBJECT data type.'
-- (type GT 15): Message, 'Unable to convert undefined data type: ',
StrTrim(theType) + '.'
-+ (type GT 15): Message, 'Unable to convert undefined data type: ' +
StrTrim(theType) + '.'
- ELSE:
- ENDCASE
- ENDELSE
diff --git a/sci-libs/idlcoyote/idlcoyote-20161220.ebuild
b/sci-libs/idlcoyote/idlcoyote-20161220.ebuild
new file mode 120000
index 00000000..51dbdff
--- /dev/null
+++ b/sci-libs/idlcoyote/idlcoyote-20161220.ebuild
@@ -0,0 +1 @@
+idlcoyote-99999999.ebuild
\ No newline at end of file
diff --git a/sci-libs/idlcoyote/idlcoyote-20160321.ebuild
b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
similarity index 51%
rename from sci-libs/idlcoyote/idlcoyote-20160321.ebuild
rename to sci-libs/idlcoyote/idlcoyote-99999999.ebuild
index 2bcbf08..c7f60d3 100644
--- a/sci-libs/idlcoyote/idlcoyote-20160321.ebuild
+++ b/sci-libs/idlcoyote/idlcoyote-99999999.ebuild
@@ -4,29 +4,30 @@
EAPI=6
+if [[ ${PV} != 99999999 ]]; then
+ SRC_URI="http://www.idlcoyote.com/programs/zip_files/coyoteprograms.zip
-> ${P}.zip"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/coyote"
+ DEPEND="app-arch/unzip"
+else
+ inherit git-r3
+ GIT_ECLASS="git-r3"
+ EGIT_REPO_URI=( "git://github.com/idl-coyote/coyote.git" )
+ KEYWORDS=""
+fi
+
DESCRIPTION="GDL library from D. Fannings IDL courses"
HOMEPAGE="http://www.idlcoyote.com/";
-SRC_URI="http://www.idlcoyote.com/programs/zip_files/coyoteprograms.zip ->
${P}.zip"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-DEPEND="app-arch/unzip"
RDEPEND="dev-lang/gdl"
-S="${WORKDIR}/coyote"
-
-PATCHES=(
- "${FILESDIR}/${PN}-cgloadct.patch"
- "${FILESDIR}/${PN}-gdl-fixes.patch"
-)
-
src_install() {
dodoc README.txt
- newdoc public/README.txt README-public.txt
- rm README.txt public/README.txt || die
+ rm README.txt || die
insinto /usr/share/gnudatalanguage/coyote
doins -r *
}
diff --git a/sci-libs/idlcoyote/metadata.xml b/sci-libs/idlcoyote/metadata.xml
index 2359277..298edd4 100644
--- a/sci-libs/idlcoyote/metadata.xml
+++ b/sci-libs/idlcoyote/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
-<maintainer type="project">
- <email>s...@gentoo.org</email>
- <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
- The Coyote Library evolved from work David Fanning was doing teaching
- IDL courses and answering IDL questions on the IDL newsgroup. It is
- meant to be a well-documented library that demonstrates how to write
- solid IDL/GDL programs that are easy to maintain and extend.
-</longdescription>
+ <maintainer type="project">
+ <email>sci-astron...@gentoo.org</email>
+ <name>Gentoo Astronomy Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ The Coyote Library evolved from work David Fanning was doing teaching
+ IDL courses and answering IDL questions on the IDL newsgroup. It is
+ meant to be a well-documented library that demonstrates how to write
+ solid IDL/GDL programs that are easy to maintain and extend.
+ </longdescription>
</pkgmetadata>
