Gentoo Archives: gentoo-commits

From: Aisha Tammy <gentoo@×××××.cc>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/chooch/, sci-chemistry/chooch/files/
Date: Sat, 26 Sep 2020 16:51:13
Message-Id: 1601139048.3792b37e0fdba3818ea50198be53d5efb0a9dc57.epsilon-0@gentoo
1 commit: 3792b37e0fdba3818ea50198be53d5efb0a9dc57
2 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
3 AuthorDate: Sat Sep 26 16:50:48 2020 +0000
4 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
5 CommitDate: Sat Sep 26 16:50:48 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3792b37e
7
8 sci-chemistry/chooch: drop dead package
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
12
13 sci-chemistry/chooch/chooch-5.0.2-r1.ebuild | 53 ----------------------
14 sci-chemistry/chooch/files/5.0.2-Makefile.am.patch | 30 ------------
15 sci-chemistry/chooch/files/5.0.2-Makefile.patch | 45 ------------------
16 sci-chemistry/chooch/files/5.0.2-aclocal.patch | 11 -----
17 sci-chemistry/chooch/metadata.xml | 8 ----
18 5 files changed, 147 deletions(-)
19
20 diff --git a/sci-chemistry/chooch/chooch-5.0.2-r1.ebuild b/sci-chemistry/chooch/chooch-5.0.2-r1.ebuild
21 deleted file mode 100644
22 index 227e947d5..000000000
23 --- a/sci-chemistry/chooch/chooch-5.0.2-r1.ebuild
24 +++ /dev/null
25 @@ -1,53 +0,0 @@
26 -# Copyright 1999-2014 Gentoo Foundation
27 -# Distributed under the terms of the GNU General Public License v2
28 -
29 -EAPI=5
30 -
31 -AUTOTOOLS_AUTORECONF=true
32 -
33 -inherit autotools-utils multilib toolchain-funcs
34 -
35 -DESCRIPTION="Automatically determine values of the anomalous scattering factors"
36 -HOMEPAGE="http://www.gwyndafevans.co.uk/id2.html"
37 -SRC_URI="ftp://ftp.ccp4.ac.uk/${PN}/${PV}/packed/${P}.tar.gz"
38 -
39 -SLOT="0"
40 -LICENSE="GPL-2"
41 -KEYWORDS="~amd64 ~x86"
42 -IUSE="examples"
43 -
44 -RDEPEND="
45 - sci-libs/gsl
46 - sci-libs/Cgraph
47 - sci-libs/pgplot"
48 -DEPEND="${RDEPEND}"
49 -
50 -S="${WORKDIR}"/${PN}/${P}
51 -
52 -PATCHES=(
53 - "${FILESDIR}"/${PV}-Makefile.am.patch
54 - "${FILESDIR}"/${PV}-aclocal.patch
55 -)
56 -
57 -AT_M4DIR="${S}"
58 -
59 -DOCS=( doc/${PN}.pdf )
60 -
61 -src_configure() {
62 - local myeconfargs=(
63 - --with-pgplot-prefix="${EPREFIX}/usr"
64 - --with-cgraph-prefix="${EPREFIX}/usr"
65 - --with-gsl-prefix="${EPREFIX}/usr"
66 - --disable-gsltest
67 - )
68 - autotools-utils_src_configure
69 -}
70 -
71 -src_install() {
72 - autotools-utils_src_install
73 -
74 - if use examples; then
75 - insinto /usr/share/${PN}
76 - doins -r examples
77 - fi
78 -}
79
80 diff --git a/sci-chemistry/chooch/files/5.0.2-Makefile.am.patch b/sci-chemistry/chooch/files/5.0.2-Makefile.am.patch
81 deleted file mode 100644
82 index ca6bcafb1..000000000
83 --- a/sci-chemistry/chooch/files/5.0.2-Makefile.am.patch
84 +++ /dev/null
85 @@ -1,30 +0,0 @@
86 ---- Makefile.am 2004-10-20 14:47:12.000000000 +0200
87 -+++ Makefile.am.new 2009-05-13 12:14:09.000000000 +0200
88 -@@ -1,4 +1,4 @@
89 --bin_PROGRAMS = chooch
90 -+bin_PROGRAMS = chooch chooch-pg
91 -
92 - chooch_SOURCES = main.c fluread.c printbanner.c minmax.c spline.c \
93 - mucal.c fdprime.c smooth.c fits.c normalize.c \
94 -@@ -12,4 +12,8 @@
95 -
96 - chooch_LDADD = $(GSL_LIBS) $(PGPLOT_LIBS) $(CGRAPH_LIBS)
97 -
98 -+chooch_pg_CFLAGS = -DPGPLOT $(GSL_CFLAGS) $(PGPLOT_CFLAGS) $(CGRAPH_CFLAGS)
99 -+
100 -+chooch_pg_LDADD = $(GSL_LIBS) $(PGPLOT_LIBS) $(CGRAPH_LIBS)
101 -+
102 - man_MANS = man/chooch.1
103 ---- Makefile.am 2009-05-13 12:16:05.000000000 +0200
104 -+++ Makefile.am.new 2009-05-13 12:18:33.000000000 +0200
105 -@@ -1,5 +1,10 @@
106 - bin_PROGRAMS = chooch chooch-pg
107 -
108 -+chooch_pg_SOURCES = main.c fluread.c printbanner.c minmax.c spline.c \
109 -+ mucal.c fdprime.c smooth.c fits.c normalize.c \
110 -+ checks.c usage.c integrate.c psplot.c selwavel.c \
111 -+ copyright.c toplot.c license.c
112 -+
113 - chooch_SOURCES = main.c fluread.c printbanner.c minmax.c spline.c \
114 - mucal.c fdprime.c smooth.c fits.c normalize.c \
115 - checks.c usage.c integrate.c psplot.c selwavel.c \
116
117 diff --git a/sci-chemistry/chooch/files/5.0.2-Makefile.patch b/sci-chemistry/chooch/files/5.0.2-Makefile.patch
118 deleted file mode 100644
119 index 89eaf95ef..000000000
120 --- a/sci-chemistry/chooch/files/5.0.2-Makefile.patch
121 +++ /dev/null
122 @@ -1,45 +0,0 @@
123 ---- Makefile 2004-10-13 15:17:38.000000000 +0200
124 -+++ Makefile.new 2009-05-12 21:24:48.000000000 +0200
125 -@@ -21,21 +21,21 @@
126 - #INCLUDE = /users/opd14/Gwyndaf/include
127 - GSLDIR = /usr/local/lib
128 - CGRAPHDIR = /usr/local/lib
129 --BINDIR = /home/ge73/bin
130 -+BINDIR = /usr/bin
131 - INCLUDE = /usr/local/pgplot
132 - #PGPLOTDIR = /home/sci/software/misc/pgplot
133 - X11LIBDIR = /usr/X11R6/lib
134 - ######################################
135 - #
136 - CGRAPH = -lcgraph
137 --LIBS = -lgsl -lgslcblas -lX11
138 -+LIBS = -lgsl -lgslcblas -lX11 -L/usr/GENTOO_LIBDIR $(PGLIBS) $(CGRAPH) -lm -ldl -lpthread
139 - PGLIBS = -lcpgplot -lpgplot
140 --EXE = chooch-5.0.2.$(ARCH)
141 --EXEPG = chooch-5.0.2-pg.$(ARCH)
142 -+EXE = chooch
143 -+EXEPG = chooch-pg
144 - #
145 - # How to compile and link
146 - #
147 --include Makefile.$(ARCH)
148 -+#include Makefile.$(ARCH)
149 - #
150 - # Basic definitions
151 - #
152 -@@ -51,13 +51,13 @@
153 - #
154 - #
155 - chooch : clean ${OBJECTS} Makefile
156 -- $(CC) -o ${EXE} ${OBJECTS} $(LDFLAGS)
157 -+ $(CC) $(LDFLAGS) -o ${EXE} ${OBJECTS} $(LIBS)
158 -
159 - chooch-pg :
160 - make chooch-with-pgplot "CFLAGS = $(CFLAGS) -DPGPLOT"
161 -
162 - chooch-with-pgplot : clean ${OBJECTS} Makefile
163 -- $(FC) -v $(CFLAGS) -o ${EXEPG} ${OBJECTS} $(LDFLAGS)
164 -+ $(CC) $(CFLAGS) $(LDFLAGS) -o ${EXEPG} ${OBJECTS} $(LIBS)
165 - #
166 - all: chooch chooch-pg
167 - #
168
169 diff --git a/sci-chemistry/chooch/files/5.0.2-aclocal.patch b/sci-chemistry/chooch/files/5.0.2-aclocal.patch
170 deleted file mode 100644
171 index 84dbaed9b..000000000
172 --- a/sci-chemistry/chooch/files/5.0.2-aclocal.patch
173 +++ /dev/null
174 @@ -1,11 +0,0 @@
175 ---- pgplot.m4 2004-10-18 13:13:21.000000000 +0200
176 -+++ pgplot.m4.new 2009-05-13 11:52:43.000000000 +0200
177 -@@ -15,7 +15,7 @@
178 -
179 - if test "x$pgplot_prefix" != x ; then
180 - PGPLOT_CFLAGS="-I$pgplot_prefix/include"
181 -- PGPLOT_LIBS="-L$pgplot_prefix/lib -lpgplot"
182 -+ PGPLOT_LIBS="-L$pgplot_prefix/lib -lpgplot -lcpgplot"
183 - fi
184 -
185 - AC_MSG_CHECKING([for libpgplot])
186
187 diff --git a/sci-chemistry/chooch/metadata.xml b/sci-chemistry/chooch/metadata.xml
188 deleted file mode 100644
189 index da36ecbfc..000000000
190 --- a/sci-chemistry/chooch/metadata.xml
191 +++ /dev/null
192 @@ -1,8 +0,0 @@
193 -<?xml version="1.0" encoding="UTF-8"?>
194 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
195 -<pkgmetadata>
196 - <maintainer type="project">
197 - <email>sci-chemistry@g.o</email>
198 - <name>Gentoo Chemistry Project</name>
199 - </maintainer>
200 -</pkgmetadata>