commit:     7fc4c80c4ebf9440cb57a261c241ae8b66bc0b22
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 16:13:27 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 16:13:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc4c80c

sci-biology/mira: Removed unused patches.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-biology/mira/files/mira-3.0.0-asneeded.patch   | 56 ----------------------
 sci-biology/mira/files/mira-3.2.1-boost-1.50.patch | 52 --------------------
 .../mira/files/mira-3.4.0.2-boost-1.50.patch       | 24 ----------
 3 files changed, 132 deletions(-)

diff --git a/sci-biology/mira/files/mira-3.0.0-asneeded.patch 
b/sci-biology/mira/files/mira-3.0.0-asneeded.patch
deleted file mode 100644
index 9bbd267..00000000
--- a/sci-biology/mira/files/mira-3.0.0-asneeded.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=305547
-
---- config/m4/ax_lib_expat.m4
-+++ config/m4/ax_lib_expat.m4
-@@ -96,6 +99,7 @@
- 
-     EXPAT_CFLAGS=""
-     EXPAT_LDFLAGS=""
-+    EXPAT_LIBS=""
-     EXPAT_VERSION=""
- 
-     dnl
-@@ -105,7 +109,8 @@
- 
-     if test -n "$expat_prefix"; then
-         expat_include_dir="$expat_prefix/include"
--        expat_lib_flags="-L$expat_prefix/lib -lexpat"
-+        expat_lib_flags="-L$expat_prefix/lib"
-+        expat_libs="-lexpat"
-         run_expat_test="yes"
-     elif test "$expat_requested" = "yes"; then
-         if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then
-@@ -126,6 +131,8 @@
-         saved_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS $expat_lib_flags"
- 
-+        saved_LIBS="$LIBS"
-+        LIBS="$LIBS $expat_libs"
-         dnl
-         dnl Check Expat headers
-         dnl
-@@ -171,7 +178,8 @@
-                     ]]
-                 )],
-                 [
-                 EXPAT_LDFLAGS="$expat_lib_flags"
-+                EXPAT_LIBS="$expat_libs"
-                 expat_lib_found="yes"
-                 AC_MSG_RESULT([found])
-                 ],
-@@ -185,6 +193,7 @@
- 
-         CPPFLAGS="$saved_CPPFLAGS"
-         LDFLAGS="$saved_LDFLAGS"
-+        LIBS="$saved_LIBS"
-     fi
- 
-     AC_MSG_CHECKING([for Expat XML Parser])
-@@ -194,6 +203,7 @@
- 
-             AC_SUBST([EXPAT_CFLAGS])
-             AC_SUBST([EXPAT_LDFLAGS])
-+            AC_SUBST([EXPAT_LIBS])
- 
-             HAVE_EXPAT="yes"
-         else

diff --git a/sci-biology/mira/files/mira-3.2.1-boost-1.50.patch 
b/sci-biology/mira/files/mira-3.2.1-boost-1.50.patch
deleted file mode 100644
index 27fb364..00000000
--- a/sci-biology/mira/files/mira-3.2.1-boost-1.50.patch
+++ /dev/null
@@ -1,52 +0,0 @@
- config/m4/ax_boost_regex.m4          | 4 ++--
- src/examples_programming/Makefile.am | 2 +-
- src/examples_programming/Makefile.in | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/config/m4/ax_boost_regex.m4 b/config/m4/ax_boost_regex.m4
-index 3c4a999..a3bb19b 100644
---- a/config/m4/ax_boost_regex.m4
-+++ b/config/m4/ax_boost_regex.m4
-@@ -78,14 +78,14 @@ AC_DEFUN([AX_BOOST_REGEX],
-                 for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 
's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
-                      ax_lib=${libextension}
-                                   AC_CHECK_LIB($ax_lib, exit,
--                                 [BOOST_REGEX_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-+                                 [BOOST_REGEX_LIB="-l$ax_lib -lboost_system"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
-                               done
-                 if test "x$link_regex" != "xyes"; then
-                 for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 
's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-                      ax_lib=${libextension}
-                                   AC_CHECK_LIB($ax_lib, exit,
--                                 [BOOST_REGEX_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-+                                 [BOOST_REGEX_LIB="-l$ax_lib -lboost_system"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
-                               done
-                 fi
-diff --git a/src/examples_programming/Makefile.am 
b/src/examples_programming/Makefile.am
-index d77daaf..09c9965 100644
---- a/src/examples_programming/Makefile.am
-+++ b/src/examples_programming/Makefile.am
-@@ -11,7 +11,7 @@ AM_LDFLAGS= -L../io/ -L../util/ -L../errorhandling/ 
-L../mira -L../examine/ -L..
- 
- mira_101.C: 
- mira_101_SOURCES= mira_101.C
--mira_101_LDADD= -lmira  -lmiraEdIt -lmiraExamine -lmirasupport -lmiraestass 
-lmiraerrorhandling  -lmirautil -lmiradptools -lmirafio -lmiracaf 
-lmiraKNN_abi373 -lm -lexpat -lz $(BOOST_THREAD_LIB)  $(BOOST_REGEX_LIB) 
$(BLOODYDARWINHACK)
-+mira_101_LDADD= -lmira  -lmiraEdIt -lmiraExamine -lmirasupport -lmiraestass 
-lmiraerrorhandling  -lmirautil -lmiradptools -lmirafio -lmiracaf 
-lmiraKNN_abi373 -lm -lexpat -lz $(BOOST_THREAD_LIB)  $(BOOST_REGEX_LIB) 
$(BLOODYDARWINHACK) -lboost_system
- 
- read_101.C: 
- read_101_SOURCES= read_101.C
-diff --git a/src/examples_programming/Makefile.in 
b/src/examples_programming/Makefile.in
-index 27e6515..7dae4c4 100644
---- a/src/examples_programming/Makefile.in
-+++ b/src/examples_programming/Makefile.in
-@@ -222,7 +222,7 @@ AM_CXXFLAGS = $(BOOST_CPPFLAGS)
- INCLUDES = -I$(top_srcdir)/src $(all_includes)
- AM_LDFLAGS = -L../io/ -L../util/ -L../errorhandling/ -L../mira -L../examine/ 
-L../EdIt/ -L../caf/ -L../knn_abi373 -L../knn_alf $(BOOST_LDFLAGS)
- mira_101_SOURCES = mira_101.C
--mira_101_LDADD = -lmira  -lmiraEdIt -lmiraExamine -lmirasupport -lmiraestass 
-lmiraerrorhandling  -lmirautil -lmiradptools -lmirafio -lmiracaf 
-lmiraKNN_abi373 -lm -lexpat -lz $(BOOST_THREAD_LIB)  $(BOOST_REGEX_LIB) 
$(BLOODYDARWINHACK)
-+mira_101_LDADD = -lmira  -lmiraEdIt -lmiraExamine -lmirasupport -lmiraestass 
-lmiraerrorhandling  -lmirautil -lmiradptools -lmirafio -lmiracaf 
-lmiraKNN_abi373 -lm -lexpat -lz $(BOOST_THREAD_LIB)  $(BOOST_REGEX_LIB) 
$(BLOODYDARWINHACK) -lboost_system
- read_101_SOURCES = read_101.C
- read_101_LDADD = -lmirasupport -lmiraerrorhandling  -lmirautil -lmiradptools 
-lmirafio -lm -lz
- readpool_101_SOURCES = readpool_101.C

diff --git a/sci-biology/mira/files/mira-3.4.0.2-boost-1.50.patch 
b/sci-biology/mira/files/mira-3.4.0.2-boost-1.50.patch
deleted file mode 100644
index 4271922..00000000
--- a/sci-biology/mira/files/mira-3.4.0.2-boost-1.50.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- config/m4/ax_boost_regex.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/m4/ax_boost_regex.m4 b/config/m4/ax_boost_regex.m4
-index 1ac06af..5b7be93 100644
---- a/config/m4/ax_boost_regex.m4
-+++ b/config/m4/ax_boost_regex.m4
-@@ -78,14 +78,14 @@ AC_DEFUN([AX_BOOST_REGEX],
-                 for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* 
$BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 
's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.a*$;\1;'` ; do
-                      ax_lib=${libextension}
-                                   AC_CHECK_LIB($ax_lib, exit,
--                                 [BOOST_REGEX_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-+                                 [BOOST_REGEX_LIB="-l$ax_lib -lboost_system"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
-                               done
-                 if test "x$link_regex" != "xyes"; then
-                 for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 
's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-                      ax_lib=${libextension}
-                                   AC_CHECK_LIB($ax_lib, exit,
--                                 [BOOST_REGEX_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-+                                 [BOOST_REGEX_LIB="-l$ax_lib -lboost_system"; 
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
-                               done
-                 fi

Reply via email to