commit:     2bb995dc126901d9ba8276f18a1483278476d664
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun Apr  8 21:09:00 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 14:22:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bb995dc

dev-lang/tcl: remove duplicate patches

Closes: https://github.com/gentoo/gentoo/pull/7901

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-lang/tcl/files/tcl-8.5.13-multilib.patch |  5 ++---
 dev-lang/tcl/files/tcl-8.5.14-conf.patch     |  4 ++--
 dev-lang/tcl/files/tcl-8.6.1-conf.patch      | 11 -----------
 dev-lang/tcl/tcl-8.6.5.ebuild                |  2 +-
 dev-lang/tcl/tcl-8.6.6.ebuild                |  2 +-
 dev-lang/tcl/tcl-8.6.7.ebuild                |  2 +-
 6 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/dev-lang/tcl/files/tcl-8.5.13-multilib.patch 
b/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
index de1580ce55b..8c4bc748218 100644
--- a/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
+++ b/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
@@ -1,6 +1,5 @@
-diff -Naur tcl8.5a6.orig/unix/configure.in tcl8.5a6/unix/configure.in
---- tcl8.5a6.orig/unix/configure.in    2007-04-27 02:33:51.000000000 +0900
-+++ tcl8.5a6/unix/configure.in 2007-05-16 10:27:25.000000000 +0900
+--- a/unix/configure.in
++++ b/unix/configure.in
 @@ -645,7 +645,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"

diff --git a/dev-lang/tcl/files/tcl-8.5.14-conf.patch 
b/dev-lang/tcl/files/tcl-8.5.14-conf.patch
index be303e9f3ef..a8b3aa02101 100644
--- a/dev-lang/tcl/files/tcl-8.5.14-conf.patch
+++ b/dev-lang/tcl/files/tcl-8.5.14-conf.patch
@@ -1,5 +1,5 @@
---- tcl8.5.0/unix/tcl.m4.conf  2007-12-20 10:48:05.000000000 +0100
-+++ tcl8.5.0/unix/tcl.m4       2007-12-20 10:48:52.000000000 +0100
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
 @@ -1427,7 +1427,7 @@ dnl AC_CHECK_TOOL(AR, ar)
            # get rid of the warnings.
            #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES 
-D__NO_MATH_INLINES"

diff --git a/dev-lang/tcl/files/tcl-8.6.1-conf.patch 
b/dev-lang/tcl/files/tcl-8.6.1-conf.patch
deleted file mode 100644
index be303e9f3ef..00000000000
--- a/dev-lang/tcl/files/tcl-8.6.1-conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcl8.5.0/unix/tcl.m4.conf  2007-12-20 10:48:05.000000000 +0100
-+++ tcl8.5.0/unix/tcl.m4       2007-12-20 10:48:52.000000000 +0100
-@@ -1427,7 +1427,7 @@ dnl AC_CHECK_TOOL(AR, ar)
-           # get rid of the warnings.
-           #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES 
-D__NO_MATH_INLINES"
- 
--          SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
-+          SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
-           DL_OBJS="tclLoadDl.o"
-           DL_LIBS="-ldl"
-           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

diff --git a/dev-lang/tcl/tcl-8.6.5.ebuild b/dev-lang/tcl/tcl-8.6.5.ebuild
index 714a452ad86..3639ae997f5 100644
--- a/dev-lang/tcl/tcl-8.6.5.ebuild
+++ b/dev-lang/tcl/tcl-8.6.5.ebuild
@@ -26,7 +26,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
        # Bug 125971
-       "${FILESDIR}"/${PN}-8.6.1-conf.patch
+       "${FILESDIR}"/${PN}-8.5.14-conf.patch
 )
 
 src_prepare() {

diff --git a/dev-lang/tcl/tcl-8.6.6.ebuild b/dev-lang/tcl/tcl-8.6.6.ebuild
index c13faf4b0c5..013773c8fd8 100644
--- a/dev-lang/tcl/tcl-8.6.6.ebuild
+++ b/dev-lang/tcl/tcl-8.6.6.ebuild
@@ -28,7 +28,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
        # Bug 125971
-       "${FILESDIR}"/${PN}-8.6.1-conf.patch
+       "${FILESDIR}"/${PN}-8.5.14-conf.patch
 )
 
 src_prepare() {

diff --git a/dev-lang/tcl/tcl-8.6.7.ebuild b/dev-lang/tcl/tcl-8.6.7.ebuild
index 5195bafb235..de2ab7c8cdc 100644
--- a/dev-lang/tcl/tcl-8.6.7.ebuild
+++ b/dev-lang/tcl/tcl-8.6.7.ebuild
@@ -26,7 +26,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-8.5.13-multilib.patch
 
        # Bug 125971
-       "${FILESDIR}"/${PN}-8.6.1-conf.patch
+       "${FILESDIR}"/${PN}-8.5.14-conf.patch
 )
 
 src_prepare() {

Reply via email to