Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/clipper/files/
Date: Tue, 31 Jan 2017 08:42:33
Message-Id: 1485852114.41d94c12a1182e0b3d1065206b324069de910695.soap@gentoo
1 commit: 41d94c12a1182e0b3d1065206b324069de910695
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 17:59:52 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:41:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d94c12
7
8 sci-libs/clipper: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 sci-libs/clipper/files/2.1_p100511-makefile.patch | 23 ----------------------
13 sci-libs/clipper/files/20091215-missing-var.patch | 13 ------------
14 .../clipper-2.1_p100511-outofsourcebuild.patch | 16 ---------------
15 3 files changed, 52 deletions(-)
16
17 diff --git a/sci-libs/clipper/files/2.1_p100511-makefile.patch b/sci-libs/clipper/files/2.1_p100511-makefile.patch
18 deleted file mode 100644
19 index d933e88..00000000
20 --- a/sci-libs/clipper/files/2.1_p100511-makefile.patch
21 +++ /dev/null
22 @@ -1,23 +0,0 @@
23 - Makefile.am | 6 +++---
24 - 1 files changed, 3 insertions(+), 3 deletions(-)
25 -
26 -diff --git a/Makefile.am b/Makefile.am
27 -index 745824d..0da0ddd 100644
28 ---- a/Makefile.am
29 -+++ b/Makefile.am
30 -@@ -1,12 +1,12 @@
31 - # -*- mode: Makefile; mode: font-lock -*-
32 - AUTOMAKE_OPTIONS = foreign
33 --SUBDIRS = config clipper examples dox
34 --DIST_SUBDIRS = config clipper examples dox
35 -+SUBDIRS = config clipper dox
36 -+DIST_SUBDIRS = config clipper dox
37 - EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL NEWS README
38 - bin_SCRIPTS = clipper-config
39 - # pkgconfigdir = $(libdir)/pkgconfig
40 - # pkgconfig_DATA = clipper.pc
41 - if DEBUG
42 --AM_CXXFLAGS = -g -DDEBUG
43 -+AM_CXXFLAGS = -DDEBUG
44 - endif
45 - ACLOCAL_AMFLAGS = -I config
46
47 diff --git a/sci-libs/clipper/files/20091215-missing-var.patch b/sci-libs/clipper/files/20091215-missing-var.patch
48 deleted file mode 100644
49 index 9ba4b00..00000000
50 --- a/sci-libs/clipper/files/20091215-missing-var.patch
51 +++ /dev/null
52 @@ -1,13 +0,0 @@
53 -diff --git a/clipper-config.in b/clipper-config.in
54 -index df0b77b..3ae536e 100644
55 ---- a/clipper-config.in
56 -+++ b/clipper-config.in
57 -@@ -84,7 +84,7 @@ fi
58 -
59 - if test "$echo_libs" = "yes" ; then
60 - # note BOOST_LIBS should be part of CCTBX_LIBS
61 -- libs="-lclipper-minimol -lclipper-mmdb -lclipper-cns -lclipper-cif -lclipper-contrib -lclipper-ccp4 -lclipper-phs -lclipper-core @CCP4_LIBS@ @MMDB_LIBS@ @FFTW_LIBS@ @CCTBX_LIBS@"
62 -+ libs="-lclipper-minimol -lclipper-mmdb -lclipper-cns -lclipper-cif -lclipper-contrib -lclipper-ccp4 -lclipper-phs -lclipper-core @CCP4_LIBS@ @MMDB_LIBS@ @FFTW_LIBS@"
63 - if test "${libdir}" != "/usr/lib" ; then
64 - echo -L${libdir} $libs
65 - else
66
67 diff --git a/sci-libs/clipper/files/clipper-2.1_p100511-outofsourcebuild.patch b/sci-libs/clipper/files/clipper-2.1_p100511-outofsourcebuild.patch
68 deleted file mode 100644
69 index 2db566b..00000000
70 --- a/sci-libs/clipper/files/clipper-2.1_p100511-outofsourcebuild.patch
71 +++ /dev/null
72 @@ -1,16 +0,0 @@
73 - examples/Makefile.am | 2 +-
74 - 1 files changed, 1 insertions(+), 1 deletions(-)
75 -
76 -diff --git a/examples/Makefile.am b/examples/Makefile.am
77 -index 203ce96..2b65f1c 100644
78 ---- a/examples/Makefile.am
79 -+++ b/examples/Makefile.am
80 -@@ -27,7 +27,7 @@ maketestdata_SOURCES = maketestdata.cpp
81 -
82 - TESTS = maketestdata
83 -
84 --INCLUDES = -I.. $(FFTW_CXXFLAGS) $(MMDB_CXXFLAGS) $(CCP4_CXXFLAGS) $(CCTBX_CXXFLAGS) $(BOOST_CXXFLAGS)
85 -+INCLUDES = -I$(top_srcdir) $(FFTW_CXXFLAGS) $(MMDB_CXXFLAGS) $(CCP4_CXXFLAGS) $(CCTBX_CXXFLAGS) $(BOOST_CXXFLAGS)
86 -
87 - LIBS = $(FFTW_LIBS) $(CCP4_LIBS) $(MMDB_LIBS) $(CCTBX_LIBS)
88 -