Backport updates to transform_libtool_scripts.sh.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 3aff6276eaf3c53370842ccf0d41b75065a73409..7e5feeba12f4de4c2817fc81202cf5688a5cfa86 100644 (file)
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,6 +1,6 @@
 AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
-AUX subversion-1.6.2-local_library_preloading.patch 5568 RMD160 63540a8a391254fbda520a88d7349012b054224f SHA1 22d46ab395802fba515659cd0445b9361ea1817d SHA256 98d58df902e101cd9477db1d3635085586b16ef85392041c872cf500a06614c3
+AUX subversion-1.6.2-local_library_preloading.patch 6412 RMD160 3b072c5f9d3c1f43e3be20959a24632db0c9f82c SHA1 85a3d394861a53e3919ef6fc243542af7df17b46 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d
 AUX subversion-1.6.3-kwallet_window.patch 10012 RMD160 d469e0fc8d9fd2ef8c857e5e303eeb24309e7f0d SHA1 9c99b63bc5abf54f642e447af1aa2f814cecb8ab SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de
 AUX svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 SHA1 39e922bc777ba847eb85d421d92f560f84b895b5 SHA256 90d3e2532715a6230ebf65023566a6591eed4b3fc12abbca0d2fb7949e146006
 AUX svnserve.confd2 320 RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb SHA1 557191219c3afa90126b8a2bfe7dd62b8a09eb82 SHA256 c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00

diff --git a/dev-util/subversion/files/subversion-1.6.2-local_library_preloading.patch b/dev-util/subversion/files/subversion-1.6.2-local_library_preloading.patch
index 5f0c870d4ca640c61e0ccc5694804f181fc25fb3..704b30026fb34bffd1d03ecbc6e920fe777ce120 100644 (file)
--- a/dev-util/subversion/files/subversion-1.6.2-local_library_preloading.patch
+++ b/dev-util/subversion/files/subversion-1.6.2-local_library_preloading.patch
@@ -41,8 +41,28 @@
        cd $(abs_srcdir) && XGETTEXT="$(XGETTEXT)" MSGMERGE="$(MSGMERGE)" \
 --- build/transform_libtool_scripts.sh
 +++ build/transform_libtool_scripts.sh
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,121 @@
 +#!/bin/sh
++#
++#
++# Licensed to the Apache Software Foundation (ASF) under one
++# or more contributor license agreements.  See the NOTICE file
++# distributed with this work for additional information
++# regarding copyright ownership.  The ASF licenses this file
++# to you under the Apache License, Version 2.0 (the
++# "License"); you may not use this file except in compliance
++# with the License.  You may obtain a copy of the License at
++#
++#   http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing,
++# software distributed under the License is distributed on an
++# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++# KIND, either express or implied.  See the License for the
++# specific language governing permissions and limitations
++# under the License.
++#
++#
 +
 +# Dependencies of libraries
 +subr="subr"
@@ -126,6 +146,7 @@
 +current_directory="$(pwd)"
 +for libtool_script in $executables $tests; do
 +  eval "libtool_script_path=\$${libtool_script}_path"
++  libtool_script_libraries=""
 +  if [ -f "$libtool_script_path" ]; then
 +    if { grep LD_LIBRARY_PATH "$libtool_script_path" && ! grep LD_PRELOAD "$libtool_script_path"; } > /dev/null; then
 +      echo "Transforming $libtool_script_path"