From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-906418-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0447E138332 for <garchives@archives.gentoo.org>; Fri, 14 Oct 2016 17:48:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC8A7E0BD2; Fri, 14 Oct 2016 17:48:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95821E0BD2 for <gentoo-commits@lists.gentoo.org>; Fri, 14 Oct 2016 17:48:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4251634114A for <gentoo-commits@lists.gentoo.org>; Fri, 14 Oct 2016 17:48:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C60F1305 for <gentoo-commits@lists.gentoo.org>; Fri, 14 Oct 2016 17:48:32 +0000 (UTC) From: "Amy Winston" <amynka@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" <amynka@gentoo.org> Message-ID: <1476466454.0839dedf4fee4bfb03fe13daf793dc2b52e1e476.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tcltk/itk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch X-VCS-Directories: dev-tcltk/itk/files/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: 0839dedf4fee4bfb03fe13daf793dc2b52e1e476 X-VCS-Branch: master Date: Fri, 14 Oct 2016 17:48:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9004e6ee-cef2-4ab5-83b7-b8cc5f17963c X-Archives-Hash: 766ba49329bdd94170321fa2c662ca07 commit: 0839dedf4fee4bfb03fe13daf793dc2b52e1e476 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Sep 29 16:50:01 2016 +0000 Commit: Amy Winston <amynka <AT> gentoo <DOT> org> CommitDate: Fri Oct 14 17:34:14 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0839dedf dev-tcltk/itk: remove unused patch .../itk/files/itk-3.4_pre20090417-install.patch | 103 --------------------- 1 file changed, 103 deletions(-) diff --git a/dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch b/dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch deleted file mode 100644 index 721bf91..00000000 --- a/dev-tcltk/itk/files/itk-3.4_pre20090417-install.patch +++ /dev/null @@ -1,103 +0,0 @@ - itk/Makefile.in | 2 +- - itk/configure.in | 23 +++++++++++++++++++++++ - itk/itkConfig.sh.in | 28 +++++++++++----------------- - 3 files changed, 35 insertions(+), 18 deletions(-) ---- a/itk/Makefile.in -+++ a/itk/Makefile.in -@@ -395,7 +395,7 @@ install-lib-binaries: - fi; \ - done - $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir) -- : $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(libdir) -+ $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(libdir) - - #======================================================================== - # Install binary executables (e.g. .exe files) ---- a/itk/configure.in -+++ a/itk/configure.in -@@ -219,6 +219,7 @@ fi - # library. - #-------------------------------------------------------------------- - -+itk_LIB_FILE=${PKG_LIB_FILE} - AC_SUBST(itkstub_LIB_FILE) - AC_SUBST(itk_LIB_FILE) - -@@ -234,6 +235,28 @@ TEA_PROG_TCLSH - TEA_PROG_WISH - - #-------------------------------------------------------------------- -+# These are for itkConfig.sh -+#-------------------------------------------------------------------- -+ -+# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib) -+eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}" -+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then -+ eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}" -+else -+ eval itk_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}" -+fi -+itk_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}" -+itk_LIB_SPEC="-L${pkglibdir} ${itk_LIB_FLAG}" -+ -+AC_SUBST(itk_BUILD_LIB_SPEC) -+AC_SUBST(itk_LIB_SPEC) -+ -+# itk_SRC_DIR must be a fully qualified path -+eval itk_SRC_DIR="$srcdir" -+itk_SRC_DIR=`cd "${itk_SRC_DIR}"; pwd` -+AC_SUBST(itk_SRC_DIR) -+ -+#-------------------------------------------------------------------- - # Finally, substitute all of the various values into the Makefile. - #-------------------------------------------------------------------- - ---- a/itk/itkConfig.sh.in -+++ a/itk/itkConfig.sh.in -@@ -11,30 +11,23 @@ - # - # The information in this file is specific to a single platform. - --# Itcl's version number. --ITCL_VERSION='@ITCL_VERSION@' -+# Itk's version number. -+itk_VERSION='@PACKAGE_VERSION@' -+ITK_VERSION='@PACKAGE_VERSION@' - - # The name of the Itk library (may be either a .a file or a shared library): --ITK_LIB_FILE=@ITK_LIB_FILE@ -+itk_LIB_FILE=@itk_LIB_FILE@ -+ITK_LIB_FILE=@itk_LIB_FILE@ - - # String to pass to linker to pick up the Itk library from its - # build directory. --ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@' -+itk_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@' -+ITK_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@' - - # String to pass to linker to pick up the Itk library from its - # installed directory. --ITK_LIB_SPEC='@ITK_LIB_SPEC@' -- --# The name of the Itk stub library (a .a file): --ITK_STUB_LIB_FILE=@ITK_STUB_LIB_FILE@ -- --# String to pass to linker to pick up the Itk stub library from its --# build directory. --ITK_BUILD_STUB_LIB_SPEC='@ITK_BUILD_STUB_LIB_SPEC@' -- --# String to pass to linker to pick up the Itk stub library from its --# installed directory. --ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@' -+itk_LIB_SPEC='@itk_LIB_SPEC@' -+ITK_LIB_SPEC='@itk_LIB_SPEC@' - - # Location of the top-level source directories from which [incr Tk] - # was built. This is the directory that contains a README file as well -@@ -42,4 +35,5 @@ ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@' - # compiled in a different place than the directory containing the source - # files, this points to the location of the sources, not the location - # where [incr Tk] was compiled. --ITK_SRC_DIR='@ITK_SRC_DIR@' -+itk_SRC_DIR='@itk_SRC_DIR@' -+ITK_SRC_DIR='@itk_SRC_DIR@'