1 |
commit: eab6b7c3d0fc567d717fd75d2246370ad50bc816 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 27 00:38:40 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 2 19:39:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab6b7c3 |
7 |
|
8 |
sci-libs/shapelib: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/4099 |
12 |
|
13 |
sci-libs/shapelib/Manifest | 1 - |
14 |
.../files/shapelib-1.3.0-respect-user.patch | 118 --------------------- |
15 |
sci-libs/shapelib/shapelib-1.3.0-r1.ebuild | 66 ------------ |
16 |
3 files changed, 185 deletions(-) |
17 |
|
18 |
diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest |
19 |
index bb88446b8fa..f00f2f8fba7 100644 |
20 |
--- a/sci-libs/shapelib/Manifest |
21 |
+++ b/sci-libs/shapelib/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST shapelib-1.3.0.tar.gz 156301 SHA256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f SHA512 286a9faf7d7a6d88db3cceffb4e0fe335e5d754244b4e83110862ba0f88904aa10dd2814aa0c93d7531781cb318052d3f683160c9644f83f93e7d20108ac3b60 WHIRLPOOL 79b44dac05f8ca5e10809f7af1e9d0d1f1f5a2c7009698aa5dd33260a362c75b7e7f09cf535d58b6510f355ff5dfb193f2a0c7d14ef913caa4a0d5b099ef3a5b |
24 |
DIST shapelib-1.4.0.tar.gz 548990 SHA256 3eddd5f2690f2cf18d8d9798267537a2102a289020b9818f9a31eb626f91a7a1 SHA512 206b81fe859a837e821e449ab1b2dbd5a3aa7abd1871da4aec69e130b6fad6300697429884ce359c90e4b76bca90e2108f32b9fdbd3b92013fa5a39f3bedeeb1 WHIRLPOOL ac411c0a40923aede1236cc5afe77ffc83f2700b95360204f11c9fe0299512728ae8e66017ffb4baa7f9d54f20d7f7e5c0b8a30dc697c611f601fed158dc1557 |
25 |
|
26 |
diff --git a/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch b/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch |
27 |
deleted file mode 100644 |
28 |
index 04963108ec4..00000000000 |
29 |
--- a/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch |
30 |
+++ /dev/null |
31 |
@@ -1,118 +0,0 @@ |
32 |
- Makefile | 41 ++++++++++++++++++++--------------------- |
33 |
- 1 file changed, 20 insertions(+), 21 deletions(-) |
34 |
- |
35 |
-diff --git a/Makefile b/Makefile |
36 |
-index 0c41d8a..4149412 100644 |
37 |
---- a/Makefile |
38 |
-+++ b/Makefile |
39 |
-@@ -1,8 +1,9 @@ |
40 |
- |
41 |
--PREFIX = /usr/local |
42 |
--CFLAGS = -g -Wall -fPIC |
43 |
-+PREFIX ?= /usr/localxs |
44 |
-+CFLAGS ?= -g -Wall -fPIC |
45 |
- #CFLAGS = -g -DUSE_CPL |
46 |
- #CC = g++ |
47 |
-+AR ?= ar |
48 |
- |
49 |
- LIBOBJ = shpopen.o dbfopen.o safileio.o shptree.o |
50 |
- SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \ |
51 |
-@@ -10,7 +11,7 @@ SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \ |
52 |
- |
53 |
- default: all |
54 |
- |
55 |
--all: $(SHPBIN) shptest lib |
56 |
-+all: $(SHPBIN) lib |
57 |
- |
58 |
- shpopen.o: shpopen.c shapefil.h |
59 |
- $(CC) $(CFLAGS) -c shpopen.c |
60 |
-@@ -25,46 +26,46 @@ safileio.o: safileio.c shapefil.h |
61 |
- $(CC) $(CFLAGS) -c safileio.c |
62 |
- |
63 |
- shpcreate: shpcreate.c shpopen.o safileio.o |
64 |
-- $(CC) $(CFLAGS) shpcreate.c shpopen.o safileio.o $(LINKOPT) -o shpcreate |
65 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shpcreate.c shpopen.o safileio.o -o shpcreate |
66 |
- |
67 |
- shpadd: shpadd.c shpopen.o safileio.o |
68 |
-- $(CC) $(CFLAGS) shpadd.c shpopen.o safileio.o $(LINKOPT) -o shpadd |
69 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shpadd.c shpopen.o safileio.o -o shpadd |
70 |
- |
71 |
- shpdump: shpdump.c shpopen.o safileio.o |
72 |
-- $(CC) $(CFLAGS) shpdump.c shpopen.o safileio.o $(LINKOPT) -o shpdump |
73 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shpdump.c shpopen.o safileio.o -o shpdump |
74 |
- |
75 |
- shprewind: shprewind.c shpopen.o safileio.o |
76 |
-- $(CC) $(CFLAGS) shprewind.c shpopen.o safileio.o $(LINKOPT) -o shprewind |
77 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shprewind.c shpopen.o safileio.o -o shprewind |
78 |
- |
79 |
- dbfcreate: dbfcreate.c dbfopen.o safileio.o |
80 |
-- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o safileio.o $(LINKOPT) -o dbfcreate |
81 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) dbfcreate.c dbfopen.o safileio.o -o dbfcreate |
82 |
- |
83 |
- dbfadd: dbfadd.c dbfopen.o safileio.o |
84 |
-- $(CC) $(CFLAGS) dbfadd.c dbfopen.o safileio.o $(LINKOPT) -o dbfadd |
85 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) dbfadd.c dbfopen.o safileio.o -o dbfadd |
86 |
- |
87 |
- dbfdump: dbfdump.c dbfopen.o safileio.o |
88 |
-- $(CC) $(CFLAGS) dbfdump.c dbfopen.o safileio.o $(LINKOPT) -o dbfdump |
89 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) dbfdump.c dbfopen.o safileio.o -o dbfdump |
90 |
- |
91 |
- shptest: shptest.c shpopen.o safileio.o |
92 |
-- $(CC) $(CFLAGS) shptest.c shpopen.o safileio.o $(LINKOPT) -o shptest |
93 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shptest.c shpopen.o safileio.o -o shptest |
94 |
- |
95 |
- shputils: shputils.c shpopen.o safileio.o dbfopen.o |
96 |
-- $(CC) $(CFLAGS) shputils.c shpopen.o safileio.o dbfopen.o $(LINKOPT) -o shputils |
97 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shputils.c shpopen.o safileio.o dbfopen.o -o shputils |
98 |
- |
99 |
- shptreedump: shptreedump.c shptree.o shpopen.o safileio.o |
100 |
-- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o safileio.o $(LINKOPT) \ |
101 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) shptreedump.c shptree.o shpopen.o safileio.o \ |
102 |
- -o shptreedump |
103 |
- |
104 |
- clean: |
105 |
- rm -f *.o shptest $(SHPBIN) libshp.a |
106 |
- |
107 |
--test: test2 test3 |
108 |
-+test: shptest test2 test3 |
109 |
- |
110 |
- # |
111 |
- # Note this stream only works if example data is accessable. |
112 |
- # Fetch ftp://gdal.velocet.ca/pub/outgoing/shape_eg_data.zip |
113 |
- # |
114 |
--test1: |
115 |
-+test1: shptest |
116 |
- @./stream1.sh > s1.out |
117 |
- @if test "`diff s1.out stream1.out`" = '' ; then \ |
118 |
- echo "******* Stream 1 Succeeded *********"; \ |
119 |
-@@ -74,7 +75,7 @@ test1: |
120 |
- diff s1.out stream1.out; \ |
121 |
- fi |
122 |
- |
123 |
--test2: |
124 |
-+test2: shptest |
125 |
- @./stream2.sh > s2.out |
126 |
- @if test "`diff s2.out stream2.out`" = '' ; then \ |
127 |
- echo "******* Stream 2 Succeeded *********"; \ |
128 |
-@@ -85,7 +86,7 @@ test2: |
129 |
- diff s2.out stream2.out; \ |
130 |
- fi |
131 |
- |
132 |
--test3: |
133 |
-+test3: shptest |
134 |
- @./makeshape.sh > s3.out |
135 |
- @if test "`diff s3.out stream3.out`" = '' ; then \ |
136 |
- echo "******* Stream 3 Succeeded *********"; \ |
137 |
-@@ -97,10 +98,8 @@ test3: |
138 |
- fi |
139 |
- |
140 |
- |
141 |
--lib: libshp.a |
142 |
-- |
143 |
--libshp.a: $(LIBOBJ) |
144 |
-- ar r libshp.a $(LIBOBJ) |
145 |
-+lib: $(LIBOBJ) |
146 |
-+ $(AR) r libshp.a $(LIBOBJ) |
147 |
- |
148 |
- lib_install: libshp.a |
149 |
- cp libshp.a $(PREFIX)/lib |
150 |
|
151 |
diff --git a/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild |
152 |
deleted file mode 100644 |
153 |
index bfc17c6788c..00000000000 |
154 |
--- a/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild |
155 |
+++ /dev/null |
156 |
@@ -1,66 +0,0 @@ |
157 |
-# Copyright 1999-2012 Gentoo Foundation |
158 |
-# Distributed under the terms of the GNU General Public License v2 |
159 |
- |
160 |
-EAPI=4 |
161 |
-inherit eutils toolchain-funcs multilib versionator |
162 |
- |
163 |
-DESCRIPTION="Library for manipulating ESRI Shapefiles" |
164 |
-HOMEPAGE="http://shapelib.maptools.org/" |
165 |
-SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz" |
166 |
- |
167 |
-LICENSE="GPL-2 LGPL-2" |
168 |
-SLOT="0" |
169 |
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
170 |
-IUSE="static-libs" |
171 |
- |
172 |
-DEPEND="" |
173 |
-RDEPEND="" |
174 |
- |
175 |
-static_to_shared() { |
176 |
- local libstatic=${1}; shift |
177 |
- local libname=$(basename ${libstatic%.a}) |
178 |
- local soname=${libname}$(get_libname $(get_version_component_range 1-2)) |
179 |
- local libdir=$(dirname ${libstatic}) |
180 |
- |
181 |
- einfo "Making ${soname} from ${libstatic}" |
182 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
183 |
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \ |
184 |
- -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \ |
185 |
- -Wl,-all_load -Wl,${libstatic} \ |
186 |
- "$@" -o ${libdir}/${soname} || die "${soname} failed" |
187 |
- else |
188 |
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \ |
189 |
- -shared -Wl,-soname=${soname} \ |
190 |
- -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \ |
191 |
- "$@" -o ${libdir}/${soname} || die "${soname} failed" |
192 |
- [[ $(get_version_component_count) -gt 1 ]] && \ |
193 |
- ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version)) |
194 |
- ln -s ${soname} ${libdir}/${libname}$(get_libname) |
195 |
- fi |
196 |
-} |
197 |
- |
198 |
-src_prepare() { |
199 |
- epatch "${FILESDIR}"/${P}-respect-user.patch |
200 |
- tc-export CC AR |
201 |
-} |
202 |
- |
203 |
-src_compile() { |
204 |
- emake CFLAGS="${CFLAGS} -fPIC" lib |
205 |
- static_to_shared lib*.a |
206 |
- rm *.o *.a |
207 |
- emake |
208 |
-} |
209 |
- |
210 |
-src_test() { |
211 |
- emake test |
212 |
-} |
213 |
- |
214 |
-src_install() { |
215 |
- dobin shp{create,dump,add} dbf{create,dump,add} |
216 |
- insinto /usr/include/libshp |
217 |
- doins shapefil.h |
218 |
- use test && dobin shptest |
219 |
- dolib.so lib*$(get_libname)* |
220 |
- dodoc ChangeLog README* |
221 |
- use static-libs && dolib.a lib*.a |
222 |
-} |