diff options
| author |   Marty E. Plummer <hanetzer@startmail.com> | 2018-04-08 16:09:00 -0500 |
|---|---|---|
| committer |   Amy Liffey <amynka@gentoo.org> | 2018-04-15 16:22:44 +0200 |
| commit | 2bb995dc126901d9ba8276f18a1483278476d664 (patch) | |
| tree | 9bcfb9de14f4ed677429b873e422ca8ad7483328 /dev-lang/tcl | |
| parent | media-libs/opus: stable 1.2.1 for ppc, bug #648072 (diff) | |
| download | gentoo-2bb995dc126901d9ba8276f18a1483278476d664.tar.gz gentoo-2bb995dc126901d9ba8276f18a1483278476d664.tar.bz2 gentoo-2bb995dc126901d9ba8276f18a1483278476d664.zip | |
dev-lang/tcl: remove duplicate patches
Closes: https://github.com/gentoo/gentoo/pull/7901
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'dev-lang/tcl')
| -rw-r--r-- | dev-lang/tcl/files/tcl-8.5.13-multilib.patch | 5 | ||||
| -rw-r--r-- | dev-lang/tcl/files/tcl-8.5.14-conf.patch | 4 | ||||
| -rw-r--r-- | dev-lang/tcl/files/tcl-8.6.1-conf.patch | 11 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.6.5.ebuild | 2 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.6.6.ebuild | 2 | ||||
| -rw-r--r-- | 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 de1580ce55bd..8c4bc7482189 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 be303e9f3ef8..a8b3aa021014 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 be303e9f3ef8..000000000000 --- 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 714a452ad868..3639ae997f53 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 c13faf4b0c59..013773c8fd85 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 5195bafb2350..de2ab7c8cdc4 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() { |