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-chemistry/openbabel-perl/files/
Date: Tue, 31 Jan 2017 08:42:45
Message-Id: 1485852084.652debbe65794b3525fc6f51a2e63e0f908e4ea3.soap@gentoo
1 commit: 652debbe65794b3525fc6f51a2e63e0f908e4ea3
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 17:52:25 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:41:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652debbe
7
8 sci-chemistry/openbabel-perl: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 .../files/openbabel-perl-2.3.0-makefile.patch | 28 ----------------------
13 .../files/openbabel-perl-2.3.0-swig.patch | 25 -------------------
14 .../files/openbabel-perl-2.3.1-makefile.patch | 9 -------
15 3 files changed, 62 deletions(-)
16
17 diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch
18 deleted file mode 100644
19 index 597c9a7..00000000
20 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-makefile.patch
21 +++ /dev/null
22 @@ -1,28 +0,0 @@
23 - scripts/CMakeLists.txt | 2 +-
24 - scripts/perl/Makefile.PL | 1 +
25 - 2 files changed, 2 insertions(+), 1 deletions(-)
26 -
27 -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
28 -index bf2527b..3c45111 100644
29 ---- a/scripts/CMakeLists.txt
30 -+++ b/scripts/CMakeLists.txt
31 -@@ -223,7 +223,7 @@ if (DO_PERL_BINDINGS)
32 - COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl
33 - COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl
34 - COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl
35 -- COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT}
36 -+ COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL INSTALLDIRS=vendor ${PERL_PREFIX_TEXT}
37 - COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make
38 - DEPENDS ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp
39 - WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl
40 -diff --git a/scripts/perl/Makefile.PL b/scripts/perl/Makefile.PL
41 -index a3a2116..44ad27d 100644
42 ---- a/scripts/perl/Makefile.PL
43 -+++ b/scripts/perl/Makefile.PL
44 -@@ -32,5 +32,6 @@ WriteMakefile(
45 - 'CC' => $CC,
46 - 'LD' => '$(CC)',
47 - 'INC' => '-I../../include -I'.$cmakesrcdir.'/include',
48 -+ 'DESTDIR' => @ENV{"D"},
49 - 'OBJECT' => 'openbabel-perl.o'
50 - );
51
52 diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch
53 deleted file mode 100644
54 index 6beacf7..00000000
55 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.0-swig.patch
56 +++ /dev/null
57 @@ -1,25 +0,0 @@
58 - scripts/CMakeLists.txt | 6 +-----
59 - 1 files changed, 1 insertions(+), 5 deletions(-)
60 -
61 -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
62 -index bf2527b..16feeb4 100644
63 ---- a/scripts/CMakeLists.txt
64 -+++ b/scripts/CMakeLists.txt
65 -@@ -8,16 +8,12 @@ if (RUN_SWIG)
66 - # SWIG_EXECUTABLE - the path to the swig executable
67 - # SWIG_VERSION - the version number of the swig executable
68 -
69 -- find_package(SWIG)
70 -+ find_package(SWIG 2.0.0)
71 - if (NOT SWIG_FOUND)
72 - message(STATUS "SWIG NOT found")
73 - return()
74 - endif (NOT SWIG_FOUND)
75 - message(STATUS "SWIG version is ${SWIG_VERSION}")
76 -- if (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1")
77 -- message(STATUS "SWIG version 2.0.0 exactly is required")
78 -- return()
79 -- endif (NOT ${SWIG_VERSION} STREQUAL "2.0.0" AND NOT ${SWIG_VERSION} STREQUAL "2.0.1")
80 - endif (RUN_SWIG)
81 -
82 - ###################
83
84 diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch
85 deleted file mode 100644
86 index 88248b4..00000000
87 --- a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch
88 +++ /dev/null
89 @@ -1,9 +0,0 @@
90 ---- scripts/perl/Makefile.PL
91 -+++ scripts/perl/Makefile.PL
92 -@@ -37,5 +37,6 @@ 'LDFROM' => $ldfrom,
93 - 'CC' => $CC,
94 - 'LD' => '$(CC)',
95 - 'INC' => '-I../../include -I'.$cmakesrcdir.'/include',
96 -+ 'DESTDIR' => @ENV{"D"},
97 - 'OBJECT' => 'openbabel-perl.o'
98 - );