summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-04-26 23:08:19 +0000
committerMike Frysinger <vapier@gentoo.org>2005-04-26 23:08:19 +0000
commita8c3d9102a64db2656ea73d18fa2bda53960afd5 (patch)
tree1641c56d786cbd6d27dfc1674260a0486032964c /sys-devel
parentalpha stable (diff)
downloadgentoo-2-a8c3d9102a64db2656ea73d18fa2bda53960afd5.tar.gz
gentoo-2-a8c3d9102a64db2656ea73d18fa2bda53960afd5.tar.bz2
gentoo-2-a8c3d9102a64db2656ea73d18fa2bda53960afd5.zip
old
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4-nonneg.patch29
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch13
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch66
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4.2-s390_x86_64.patch11
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch12
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch372
-rw-r--r--sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch192
-rw-r--r--sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch34
-rw-r--r--sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch35
-rw-r--r--sys-devel/libtool/files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch33
-rw-r--r--sys-devel/libtool/files/digest-libtool-1.5.10-r41
-rw-r--r--sys-devel/libtool/files/digest-libtool-1.5.10-r51
-rw-r--r--sys-devel/libtool/files/digest-libtool-1.5.2-r72
-rw-r--r--sys-devel/libtool/libtool-1.5.10-r4.ebuild156
-rw-r--r--sys-devel/libtool/libtool-1.5.10-r5.ebuild153
-rw-r--r--sys-devel/libtool/libtool-1.5.2-r7.ebuild212
16 files changed, 0 insertions, 1322 deletions
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4-nonneg.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4-nonneg.patch
deleted file mode 100644
index 5c1d243996b1..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4-nonneg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libtool-1.4/ltmain.in.nonneg Wed May 9 10:29:55 2001
-+++ libtool-1.4/ltmain.in Wed May 9 10:30:48 2001
-@@ -2191,7 +2191,7 @@
-
- # Check that each of the things are valid numbers.
- case $current in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ [0-9]*) ;;
- *)
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2200,7 +2200,7 @@
- esac
-
- case $revision in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ [0-9]*) ;;
- *)
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2209,7 +2209,7 @@
- esac
-
- case $age in
-- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+ [0-9]*) ;;
- *)
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- $echo "$modename: \`$vinfo' is not valid version information" 1>&2
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
deleted file mode 100644
index 7cfba32afb5c..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-add-x11r6-lib-in-ignores-for-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./libtool.m4.gege Tue Sep 11 05:16:01 2001
-+++ ./libtool.m4 Sat Oct 20 00:05:20 2001
-@@ -1932,8 +1932,8 @@
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
-+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
-
- case $host_os in
- aix3*)
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
deleted file mode 100644
index 8212add90a74..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-portage.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ltmain.in.orig Wed Apr 3 01:19:37 2002
-+++ ltmain.in Sun May 26 19:50:52 2002
-@@ -3940,9 +3940,50 @@
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit 1
- fi
-- newdependency_libs="$newdependency_libs $libdir/$name"
-+ # We do not want portage's install root ($D) present. Check only for
-+ # this if the .la is being installed.
-+ if test "$installed" = yes && test "$D"; then
-+ eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`
-+ else
-+ mynewdependency_lib="$libdir/$name"
-+ fi
-+ # Do not add duplicates
-+ if test "$mynewdependency_lib"; then
-+ my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-+ if test -z "$my_little_ninja_foo_1"; then
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
-+ fi
-+ fi
-+ ;;
-+ *)
-+ if test "$installed" = yes; then
-+ # Rather use S=WORKDIR if our version of portage supports it.
-+ # This is because some ebuild (gcc) do not use $S as buildroot.
-+ if test "$PWORKDIR"; then
-+ S="$PWORKDIR"
-+ fi
-+ # We do not want portage's build root ($S) present.
-+ my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
-+ if test -n "$my_little_ninja_foo_2" && test "$S"; then
-+ mynewdependency_lib=""
-+ # We do not want portage's install root ($D) present.
-+ my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
-+ elif test -n "$my_little_ninja_foo_3" && test "$D"; then
-+ eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`
-+ else
-+ mynewdependency_lib="$deplib"
-+ fi
-+ else
-+ mynewdependency_lib="$deplib"
-+ fi
-+ # Do not add duplicates
-+ if test "$mynewdependency_lib"; then
-+ my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
-+ if test -z "$my_little_ninja_foo_4"; then
-+ newdependency_libs="$newdependency_libs $mynewdependency_lib"
-+ fi
-+ fi
- ;;
-- *) newdependency_libs="$newdependency_libs $deplib" ;;
- esac
- done
- dependency_libs="$newdependency_libs"
-@@ -3975,6 +4005,10 @@
- case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- esac
-+ # Do not add duplicates
-+ if test "$installed" = yes && test "$D"; then
-+ install_libdir=`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`
-+ fi
- $echo > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-s390_x86_64.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.2-s390_x86_64.patch
deleted file mode 100644
index 0fd3b90f3754..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.2-s390_x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-1.4.2/libtool.m4.s390 Tue Sep 18 10:47:23 2001
-+++ libtool-1.4.2/libtool.m4 Tue Sep 18 10:47:49 2001
-@@ -3372,7 +3372,7 @@
- # This must be Linux ELF.
- linux-gnu*)
- case $host_cpu in
-- alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*)
-+ alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*)
- lt_cv_deplibs_check_method=pass_all ;;
- *)
- # glibc up to 2.1.1 does not perform some relocations on ARM
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch
deleted file mode 100644
index f0f907205b55..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-ltmain-SED.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libtool-1.4.3/ltmain.in.ltmain-SED 2003-02-13 14:54:24.000000000 +0100
-+++ libtool-1.4.3/ltmain.in 2003-02-13 15:24:49.000000000 +0100
-@@ -48,6 +48,9 @@ EOF
- exit 0
- fi
-
-+# define SED for historic ltconfig's generated by Libtool 1.3
-+test -z "$SED" && SED=sed
-+
- # The name of this program.
- progname=`$echo "$0" | ${SED} 's%^.*/%%'`
- modename="$progname"
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch
deleted file mode 100644
index 4e63b10af008..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-quotes.patch
+++ /dev/null
@@ -1,372 +0,0 @@
---- libtool-1.4.3/ltmain.in.quotes 2003-07-31 18:08:10.000000000 +0200
-+++ libtool-1.4.3/ltmain.in 2003-07-31 18:11:19.000000000 +0200
-@@ -1409,7 +1409,7 @@ compiler."
- ;;
- esac
- for pass in $passes; do
-- if test $linkmode = prog; then
-+ if test "$linkmode" = prog; then
- # Determine which files to process
- case $pass in
- dlopen)
-@@ -1426,11 +1426,11 @@ compiler."
- found=no
- case $deplib in
- -l*)
-- if test $linkmode = oldlib && test $linkmode = obj; then
-+ if test "$linkmode" = oldlib && test "$linkmode" = obj; then
- $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
- continue
- fi
-- if test $pass = conv; then
-+ if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
-@@ -1450,7 +1450,7 @@ compiler."
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
-- test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- fi
-@@ -1459,16 +1459,16 @@ compiler."
- case $linkmode in
- lib)
- deplibs="$deplib $deplibs"
-- test $pass = conv && continue
-+ test "$pass" = conv && continue
- newdependency_libs="$deplib $newdependency_libs"
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- ;;
- prog)
-- if test $pass = conv; then
-+ if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
-- if test $pass = scan; then
-+ if test "$pass" = scan; then
- deplibs="$deplib $deplibs"
- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- else
-@@ -1483,7 +1483,7 @@ compiler."
- continue
- ;; # -L
- -R*)
-- if test $pass = link; then
-+ if test "$pass" = link; then
- dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
- # Make sure the xrpath contains only unique directories.
- case "$xrpath " in
-@@ -1496,7 +1496,7 @@ compiler."
- ;;
- *.la) lib="$deplib" ;;
- *.$libext)
-- if test $pass = conv; then
-+ if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- continue
- fi
-@@ -1519,7 +1519,7 @@ compiler."
- continue
- ;;
- prog)
-- if test $pass != link; then
-+ if test "$pass" != link; then
- deplibs="$deplib $deplibs"
- else
- compile_deplibs="$deplib $compile_deplibs"
-@@ -1530,7 +1530,7 @@ compiler."
- esac # linkmode
- ;; # *.$libext
- *.lo | *.$objext)
-- if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- # If there is no dlopen support or we're linking statically,
- # we need to preload.
- newdlprefiles="$newdlprefiles $deplib"
-@@ -1546,7 +1546,7 @@ compiler."
- continue
- ;;
- esac # case $deplib
-- if test $found = yes || test -f "$lib"; then :
-+ if test "$found" = yes || test -f "$lib"; then :
- else
- $echo "$modename: cannot find the library \`$lib'" 1>&2
- exit 1
-@@ -1580,13 +1580,13 @@ compiler."
-
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
-- { test $linkmode = oldlib && test $linkmode = obj; }; then
-+ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
- # Add dl[pre]opened files of deplib
- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
- fi
-
-- if test $pass = conv; then
-+ if test "$pass" = conv; then
- # Only check for convenience libraries
- deplibs="$lib $deplibs"
- if test -z "$libdir"; then
-@@ -1607,7 +1607,7 @@ compiler."
- fi
- tmp_libs="$tmp_libs $deplib"
- done
-- elif test $linkmode != prog && test $linkmode != lib; then
-+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
- $echo "$modename: \`$lib' is not a convenience library" 1>&2
- exit 1
- fi
-@@ -1625,7 +1625,7 @@ compiler."
- fi
-
- # This library was specified with -dlopen.
-- if test $pass = dlopen; then
-+ if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
- exit 1
-@@ -1674,7 +1674,7 @@ compiler."
- name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
- # This library was specified with -dlpreopen.
-- if test $pass = dlpreopen; then
-+ if test "$pass" = dlpreopen; then
- if test -z "$libdir"; then
- $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
- exit 1
-@@ -1693,7 +1693,7 @@ compiler."
-
- if test -z "$libdir"; then
- # Link the convenience library
-- if test $linkmode = lib; then
-+ if test "$linkmode" = lib; then
- deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$dir/$old_library $compile_deplibs"
-@@ -1704,7 +1704,7 @@ compiler."
- continue
- fi
-
-- if test $linkmode = prog && test $pass != link; then
-+ if test "$linkmode" = prog && test "$pass" != link; then
- newlib_search_path="$newlib_search_path $ladir"
- deplibs="$lib $deplibs"
-
-@@ -1720,7 +1720,7 @@ compiler."
- -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
- esac
- # Need to link against all dependency_libs?
-- if test $linkalldeplibs = yes; then
-+ if test "$linkalldeplibs" = yes; then
- deplibs="$deplib $deplibs"
- else
- # Need to hardcode shared library paths
-@@ -1743,7 +1743,7 @@ compiler."
- # Link against this shared library
-
- if test "$linkmode,$pass" = "prog,link" ||
-- { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
-+ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
- # Hardcode the library path.
- # Skip directories that are in the system default run-time
- # search path.
-@@ -1765,7 +1765,7 @@ compiler."
- esac
- ;;
- esac
-- if test $linkmode = prog; then
-+ if test "$linkmode" = prog; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var"; then
- # Make sure the rpath contains only unique directories.
-@@ -1849,7 +1849,7 @@ compiler."
- linklib=$newlib
- fi # test -n $old_archive_from_expsyms_cmds
-
-- if test $linkmode = prog || test "$mode" != relink; then
-+ if test "$linkmode" = prog || test "$mode" != relink; then
- add_shlibpath=
- add_dir=
- add=
-@@ -1898,7 +1898,7 @@ compiler."
- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
- esac
- fi
-- if test $linkmode = prog; then
-+ if test "$linkmode" = prog; then
- test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
- test -n "$add" && compile_deplibs="$add $compile_deplibs"
- else
-@@ -1915,7 +1915,7 @@ compiler."
- fi
- fi
-
-- if test $linkmode = prog || test "$mode" = relink; then
-+ if test "$linkmode" = prog || test "$mode" = relink; then
- add_shlibpath=
- add_dir=
- add=
-@@ -1953,7 +1953,7 @@ compiler."
- add="-l$name"
- fi
-
-- if test $linkmode = prog; then
-+ if test "$linkmode" = prog; then
- test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
- test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
- else
-@@ -1961,7 +1961,7 @@ compiler."
- test -n "$add" && deplibs="$add $deplibs"
- fi
- fi
-- elif test $linkmode = prog; then
-+ elif test "$linkmode" = prog; then
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
-@@ -2021,10 +2021,10 @@ compiler."
- fi
- fi # link shared/static library?
-
-- if test $linkmode = lib; then
-+ if test "$linkmode" = lib; then
- if test -n "$dependency_libs" &&
-- { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
-- test $link_static = yes; }; then
-+ { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-+ test "$link_static" = yes; }; then
- # Extract -R from dependency_libs
- temp_deplibs=
- for libdir in $dependency_libs; do
-@@ -2055,7 +2055,7 @@ compiler."
- tmp_libs="$tmp_libs $deplib"
- done
-
-- if test $link_all_deplibs != no; then
-+ if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
- case $deplib in
-@@ -2098,15 +2098,15 @@ compiler."
- fi # link_all_deplibs != no
- fi # linkmode = lib
- done # for deplib in $libs
-- if test $pass = dlpreopen; then
-+ if test "$pass" = dlpreopen; then
- # Link the dlpreopened libraries before other libraries
- for deplib in $save_deplibs; do
- deplibs="$deplib $deplibs"
- done
- fi
-- if test $pass != dlopen; then
-- test $pass != scan && dependency_libs="$newdependency_libs"
-- if test $pass != conv; then
-+ if test "$pass" != dlopen; then
-+ test "$pass" != scan && dependency_libs="$newdependency_libs"
-+ if test "$pass" != conv; then
- # Make sure lib_search_path contains only unique directories.
- lib_search_path=
- for dir in $newlib_search_path; do
-@@ -2164,7 +2164,7 @@ compiler."
- deplibs=
- fi
- done # for pass
-- if test $linkmode = prog; then
-+ if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
- dlprefiles="$newdlprefiles"
- fi
-@@ -2476,7 +2476,7 @@ compiler."
- *) finalize_rpath="$finalize_rpath $libdir" ;;
- esac
- done
-- if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
-+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- dependency_libs="$temp_xrpath $dependency_libs"
- fi
- fi
-@@ -2519,7 +2519,7 @@ compiler."
- ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
-- if test $build_libtool_need_lc = "yes"; then
-+ if test "$build_libtool_need_lc" = "yes"; then
- deplibs="$deplibs -lc"
- fi
- ;;
-@@ -2791,7 +2791,7 @@ EOF
- echo "*** automatically added whenever a program is linked with this library"
- echo "*** or is declared to -dlopen it."
-
-- if test $allow_undefined = no; then
-+ if test "$allow_undefined" = no; then
- echo
- echo "*** Since this library must not contain undefined symbols,"
- echo "*** because either the platform does not support them or"
-@@ -2818,7 +2818,7 @@ EOF
-
- # Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
-- if test $hardcode_into_libs = yes; then
-+ if test "$hardcode_into_libs" = yes; then
- # Hardcode the library paths
- hardcode_libdirs=
- dep_rpath=
-@@ -3526,7 +3526,7 @@ static const void *lt_preloaded_setup()
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
- fi
-
-- if test $need_relink = no || test "$build_libtool_libs" != yes; then
-+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
-@@ -4071,7 +4071,7 @@ dlpreopen='$dlprefiles'
-
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
-- if test "$installed" = no && test $need_relink = yes; then
-+ if test "$installed" = no && test "$need_relink" = yes; then
- $echo >> $output "\
- relink_command=\"$relink_command\""
- fi
-@@ -4813,10 +4813,10 @@ relink_command=\"$relink_command\""
- objdir="$dir/$objdir"
- fi
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-- test $mode = uninstall && objdir="$dir"
-+ test "$mode" = uninstall && objdir="$dir"
-
- # Remember objdir for removal later, being careful to avoid duplicates
-- if test $mode = clean; then
-+ if test "$mode" = clean; then
- case " $rmdirs " in
- *" $objdir "*) ;;
- *) rmdirs="$rmdirs $objdir" ;;
-@@ -4848,9 +4848,9 @@ relink_command=\"$relink_command\""
- rmfiles="$rmfiles $objdir/$n"
- done
- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-- test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+ test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-- if test $mode = uninstall; then
-+ if test "$mode" = uninstall; then
- if test -n "$library_names"; then
- # Do each command in the postuninstall commands.
- eval cmds=\"$postuninstall_cmds\"
-@@ -4894,7 +4894,7 @@ relink_command=\"$relink_command\""
-
- *)
- # Do a test to see if this is a libtool program.
-- if test $mode = clean &&
-+ if test "$mode" = clean &&
- (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- relink_command=
- . $dir/$file
diff --git a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch b/sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch
deleted file mode 100644
index c0f23f51b4a8..000000000000
--- a/sys-devel/libtool/files/1.4.3/libtool-1.4.3-uclibc.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- ./configure.ltconfig~ Wed Oct 23 04:26:05 2002
-+++ ./configure Fri Jun 11 08:50:54 2004
-@@ -1832,6 +1832,11 @@
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-+
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+ ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-@@ -2885,7 +2890,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -4359,6 +4364,24 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ # Note: copied from linux-gnu, and may not be appropriate.
-+ hardcode_into_libs=yes
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
---- ./aclocal.m4.ltconfig~ Wed Oct 23 04:26:04 2002
-+++ ./aclocal.m4 Fri Jun 11 08:51:37 2004
-@@ -767,7 +767,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -2144,6 +2144,24 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ # Note: copied from linux-gnu, and may not be appropriate.
-+ hardcode_into_libs=yes
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3343,6 +3361,11 @@
- esac
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-+
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+ ;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
---- ./acinclude.m4.ltconfig~ Fri Jun 11 08:44:11 2004
-+++ ./acinclude.m4 Fri Jun 11 08:52:10 2004
-@@ -777,7 +777,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -2192,6 +2192,24 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ # Note: copied from linux-gnu, and may not be appropriate.
-+ hardcode_into_libs=yes
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3414,6 +3432,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+ ;;
-+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
---- ./libtool.m4.ltconfig~ Fri Jun 11 08:48:53 2004
-+++ ./libtool.m4 Fri Jun 11 08:50:06 2004
-@@ -791,7 +791,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -2257,6 +2257,24 @@
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- ;;
-
-+linux-uclibc*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ # Note: copied from linux-gnu, and may not be appropriate.
-+ hardcode_into_libs=yes
-+ # Assume using the uClibc dynamic linker.
-+ dynamic_linker="uClibc ld.so"
-+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -3479,6 +3497,11 @@
- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
- ;;
-
-+linux-uclibc*)
-+ lt_cv_deplibs_check_method=pass_all
-+ lt_cv_file_magic_test_file=`echo /lib/libuClibc*.so`
-+ ;;
-+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch
deleted file mode 100644
index 26cd0a953444..000000000000
--- a/sys-devel/libtool/files/1.5.2/libtool-1.5-filter-host-tags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- libtool-1.5.2/ltmain.in.orig 2004-11-04 04:20:50.608823576 +0000
-+++ libtool-1.5.2/ltmain.in 2004-11-04 04:23:25.151329544 +0000
-@@ -560,8 +560,14 @@
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-+ # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-+ trimedcc="${CC/${host}-}"
- case "$base_compile " in
-- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
-+ tagname=CC
-+ break ;;
-+ "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\
-+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
-@@ -947,8 +950,14 @@
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-+ # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
-+ trimedcc="${CC/${host}-}"
- case $base_compile in
-- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-+ "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
-+ tagname=CC
-+ break ;;
-+ "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*|\
-+ "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*)
- # The compiler in $compile_command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch
deleted file mode 100644
index 27460b33c67e..000000000000
--- a/sys-devel/libtool/files/1.5.2/libtool-1.5.2-libtool_m4-shared_ext.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- libtool-1.5.2/libtool.m4 2004-02-10 00:23:58.000000000 +0200
-+++ libtool-1.5.2.shared_ext/libtool.m4 2004-02-10 23:32:08.364266152 +0200
-@@ -229,6 +229,7 @@
- tagname=
- AC_LIBTOOL_LANG_C_CONFIG
- _LT_AC_TAGCONFIG
-+_LT_AC_SHARED_EXT
- ])# AC_LIBTOOL_SETUP
-
-
-@@ -1788,6 +1789,24 @@
- fi
- ])# _LT_AC_TAGCONFIG
-
-+# _LT_AC_SHARED_EXT
-+# ----------------
-+AC_DEFUN([_LT_AC_SHARED_EXT],[
-+ if test ! -f "${ofile}"; then
-+ AC_MSG_WARN([output file `$ofile' does not exist])
-+ fi
-+ if test -z "`grep -e 'shared_ext.*shrext' $ofile`"; then
-+ # Make sure $shared_ext gets set to $shrext
-+ if sed -e 's/shared_ext/shrext/g' "$ofile" > "${ofile}T"; then
-+ mv "${ofile}T" "$ofile"
-+ chmod +x "$ofile"
-+ else
-+ rm -f "${ofile}T"
-+ AC_MSG_ERROR([unable to update shared_ext.])
-+ fi
-+ fi
-+])# _LT_AC_SHARED_EXT
-+
-
- # AC_LIBTOOL_DLOPEN
- # -----------------
diff --git a/sys-devel/libtool/files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch b/sys-devel/libtool/files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch
deleted file mode 100644
index 404be67fe435..000000000000
--- a/sys-devel/libtool/files/1.5.2/libtool-1.5.2-ltmain_sh-max_cmd_len.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- libtool-1.5.2/ltmain.in 2004-02-11 20:55:14.587581248 +0200
-+++ libtool-1.5.2.max_cmd_len/ltmain.in 2004-02-11 21:15:33.467283368 +0200
-@@ -117,6 +117,30 @@
- execute_dlfiles=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+
-+if test -z "$max_cmd_len"; then
-+ i=0
-+ testring="ABCD"
-+ new_result=
-+
-+ # If test is not a shell built-in, we'll probably end up computing a
-+ # maximum length that is only half of the actual maximum length, but
-+ # we can't tell.
-+ while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-+ = "XX$testring") >/dev/null 2>&1 &&
-+ new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ max_cmd_len="$new_result" &&
-+ test "$i" != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ testring="$testring$testring"
-+ done
-+ testring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ max_cmd_len=`expr $max_cmd_len \/ 2`
-+fi
-
- #####################################
- # Shell function definitions:
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.10-r4 b/sys-devel/libtool/files/digest-libtool-1.5.10-r4
deleted file mode 100644
index cab20e0c9462..000000000000
--- a/sys-devel/libtool/files/digest-libtool-1.5.10-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2093a85f6d48f1562c36920087502d6 libtool-1.5.10.tar.gz 2699923
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.10-r5 b/sys-devel/libtool/files/digest-libtool-1.5.10-r5
deleted file mode 100644
index cab20e0c9462..000000000000
--- a/sys-devel/libtool/files/digest-libtool-1.5.10-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2093a85f6d48f1562c36920087502d6 libtool-1.5.10.tar.gz 2699923
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.2-r7 b/sys-devel/libtool/files/digest-libtool-1.5.2-r7
deleted file mode 100644
index 301451dc934e..000000000000
--- a/sys-devel/libtool/files/digest-libtool-1.5.2-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db66ba05502f533ad0cfd84dc0e03bd5 libtool-1.5.2.tar.gz 2653072
-MD5 fa26a07c978ad05d1f88ed7a472daa49 libtool-1.3.5.tar.gz 538884
diff --git a/sys-devel/libtool/libtool-1.5.10-r4.ebuild b/sys-devel/libtool/libtool-1.5.10-r4.ebuild
deleted file mode 100644
index 1b20a4934f84..000000000000
--- a/sys-devel/libtool/libtool-1.5.10-r4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.10-r4.ebuild,v 1.7 2005/03/31 17:22:57 kloeri Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
-
-inherit eutils gnuconfig libtool
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="uclibc"
-
-DEPEND="sys-devel/gnuconfig
- >=sys-devel/autoconf-2.59
- >=sys-devel/automake-1.9"
-# the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
-# the automake dep is due to Bug #46037
-
-lt_setup() {
- export WANT_AUTOCONF=2.5
- export WANT_AUTOMAKE=1.9
-}
-
-gen_ltmain_sh() {
- local date=
- local PACKAGE=
- local VERSION=
-
- rm -f ltmain.shT
- date=`./mkstamp < ./ChangeLog` && \
- eval `egrep '^[[:space:]]*PACKAGE' configure` && \
- eval `egrep '^[[:space:]]*VERSION' configure` && \
- sed -e "s/@PACKAGE@/${PACKAGE}/" -e "s/@VERSION@/${VERSION}/" \
- -e "s%@TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT || return 1
-
- mv -f ltmain.shT ltmain.sh || {
- (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
- return 1
- }
-
- return 0
-}
-
-src_unpack() {
- lt_setup
- unpack ${A}
- cd ${S}
-
- # Make sure non of the patches touch ltmain.sh, but rather ltmain.in
- rm -f ltmain.sh*
-
- # Redhat patches
- epatch ${FILESDIR}/1.4.3/${PN}-1.4-nonneg.patch
- # Fix the relink problem where the relinked libs do not get
- # installed. It is *VERY* important that you get a updated
- # 'libtool-1.4.3-relink.patch' if you update this, as it
- # fixes a very serious bug. Please not that this patch is
- # included in 'libtool-1.4.3-gentoo.patch' for this ebuild.
- #
- # NOTE: all affected apps should get a 'libtoolize --copy --force'
- # added to update libtool
- #
-# Seems to be included in shipped tarball ...
-# epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-relink-58664.patch
-
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-multilib.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-demo.patch
-# Seems to be included in shipped tarball ...
-# epatch ${FILESDIR}/1.5.2/${PN}-1.5-libtool.m4-x86_64.patch
- epatch ${FILESDIR}/1.5.2/${PN}-1.5-testfailure.patch
- # Mandrake patches
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-lib64.patch
-# Fix bug #43244
-# epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-archive-shared.patch
- epatch ${FILESDIR}/1.5.6/${PN}-1.5.6-ltmain-SED.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-libtoolize--config-only.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
-
- # Gentoo Patches
- # Do not create bogus entries in $dependency_libs or $libdir
- # with ${D} or ${S} in them.
- # <azarah@gentoo.org> - (07 April 2002)
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-portage.patch
- # If a package use an older libtool, and libtool.m4 for that
- # package is updated, but not libtool, then we may run into an
- # issue where internal variables are named differently. Often
- # this shows up as libs being built without '.so' extension #73140
- epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-version-checking.patch
- sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4"
- # For older autoconf setups's that do not support libtool.m4,
- # $max_cmd_len are never set, causing all tests against it to
- # fail, resulting in 'integer expression expected' errors and
- # possible misbehaviour.
- # <azarah@gentoo.org> - (11 Feb 2004)
- epatch ${FILESDIR}/1.5.2/${PN}-1.5.2-ltmain_sh-max_cmd_len.patch
-
- # Libtool's autoguessing at tag's sucks ... it get's confused
- # if the tag's CC says '<CHOST>-gcc' and the env CC says 'gcc'
- # or vice versa ... newer automakes specify the tag so no
- # guessing is needed #67692
- epatch ${FILESDIR}/1.5.6/libtool-1.5-filter-host-tags.patch
-
- # Libtool uses links to handle locking object files with
- # dependencies. Hard links can't cross filesystems though,
- # so we have to use a diff source for the link. #40992
- epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
-
- ebegin "Generating ltmain.sh"
- gen_ltmain_sh || die "Failed to generate ltmain.sh!"
- eend 0
-
- # Now let's run all our autotool stuff so that files we patch
- # below don't get regenerated on us later
- cp libtool.m4 acinclude.m4
- local d p
- for d in . libltdl ; do
- ebegin "Running autotools in '${d}'"
- cd ${S}/${d}
- touch acinclude.m4
- for p in aclocal "automake -c -a" autoconf ; do
- ${p} || die "${p}"
- done
- eend 0
- done
- cd ${S}
-
- uclibctoolize
- gnuconfig_update ${WORKDIR}
- epunt_cxx
-}
-
-src_compile() {
- lt_setup
- econf || die
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
-
- if use uclibc ; then
- for x in $(find ${D} -name config.guess -o -name config.sub) ; do
- rm -f ${x}; ln -sf ../gnuconfig/$(basename ${x}) ${x}
- done
- cd ${D}/usr/share/libtool/libltdl
- for x in config.guess config.sub ; do
- rm -f ${x} ; ln -sfn ../${x} ${x}
- done
- fi
-}
diff --git a/sys-devel/libtool/libtool-1.5.10-r5.ebuild b/sys-devel/libtool/libtool-1.5.10-r5.ebuild
deleted file mode 100644
index d42a0728e11a..000000000000
--- a/sys-devel/libtool/libtool-1.5.10-r5.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.10-r5.ebuild,v 1.2 2005/03/09 02:13:41 vapier Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gnuconfig
- >=sys-devel/autoconf-2.59
- >=sys-devel/automake-1.9"
-# the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
-# the automake dep is due to Bug #46037
-
-lt_setup() {
- export WANT_AUTOCONF=2.5
- export WANT_AUTOMAKE=1.9
-}
-
-gen_ltmain_sh() {
- local date=
- local PACKAGE=
- local VERSION=
-
- rm -f ltmain.shT
- date=`./mkstamp < ./ChangeLog` && \
- eval `egrep '^[[:space:]]*PACKAGE' configure` && \
- eval `egrep '^[[:space:]]*VERSION' configure` && \
- sed -e "s/@PACKAGE@/${PACKAGE}/" -e "s/@VERSION@/${VERSION}/" \
- -e "s%@TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT || return 1
-
- mv -f ltmain.shT ltmain.sh || {
- (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
- return 1
- }
-
- return 0
-}
-
-src_unpack() {
- lt_setup
- unpack ${A}
- cd ${S}
-
- # Make sure non of the patches touch ltmain.sh, but rather ltmain.in
- rm -f ltmain.sh*
-
- # Redhat patches
- epatch ${FILESDIR}/1.4.3/${PN}-1.4-nonneg.patch
- # Fix the relink problem where the relinked libs do not get
- # installed. It is *VERY* important that you get a updated
- # 'libtool-1.4.3-relink.patch' if you update this, as it
- # fixes a very serious bug. Please not that this patch is
- # included in 'libtool-1.4.3-gentoo.patch' for this ebuild.
- #
- # NOTE: all affected apps should get a 'libtoolize --copy --force'
- # added to update libtool
- #
-# Seems to be included in shipped tarball ...
-# epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-relink-58664.patch
-
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-multilib.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-demo.patch
-# Seems to be included in shipped tarball ...
-# epatch ${FILESDIR}/1.5.2/${PN}-1.5-libtool.m4-x86_64.patch
- epatch ${FILESDIR}/1.5.2/${PN}-1.5-testfailure.patch
- # Mandrake patches
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-lib64.patch
-# Fix bug #43244
-# epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-archive-shared.patch
- epatch ${FILESDIR}/1.5.6/${PN}-1.5.6-ltmain-SED.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-libtoolize--config-only.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
-
- # Gentoo Patches
- # Do not create bogus entries in $dependency_libs or $libdir
- # with ${D} or ${S} in them.
- # <azarah@gentoo.org> - (07 April 2002)
- epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-portage.patch
- # If a package use an older libtool, and libtool.m4 for that
- # package is updated, but not libtool, then we may run into an
- # issue where internal variables are named differently. Often
- # this shows up as libs being built without '.so' extension #73140
- epatch ${FILESDIR}/1.5.10/${PN}-1.5.10-version-checking.patch
- sed -i "s:@_LT_VERSION@:${PV}:" libtool.m4 || die "sed libtool.m4"
- # For older autoconf setups's that do not support libtool.m4,
- # $max_cmd_len are never set, causing all tests against it to
- # fail, resulting in 'integer expression expected' errors and
- # possible misbehaviour.
- # <azarah@gentoo.org> - (11 Feb 2004)
- epatch ${FILESDIR}/1.5.2/${PN}-1.5.2-ltmain_sh-max_cmd_len.patch
-
- # Libtool's autoguessing at tag's sucks ... it get's confused
- # if the tag's CC says '<CHOST>-gcc' and the env CC says 'gcc'
- # or vice versa ... newer automakes specify the tag so no
- # guessing is needed #67692
- epatch ${FILESDIR}/1.5.6/libtool-1.5-filter-host-tags.patch
-
- # Libtool uses links to handle locking object files with
- # dependencies. Hard links can't cross filesystems though,
- # so we have to use a diff source for the link. #40992
- epatch ${FILESDIR}/1.5.10/libtool-1.5.10-locking.patch
-
- ebegin "Generating ltmain.sh"
- gen_ltmain_sh || die "Failed to generate ltmain.sh!"
- eend 0
-
- # Now let's run all our autotool stuff so that files we patch
- # below don't get regenerated on us later
- cp libtool.m4 acinclude.m4
- local d p
- for d in . libltdl ; do
- ebegin "Running autotools in '${d}'"
- cd ${S}/${d}
- touch acinclude.m4
- for p in aclocal "automake -c -a" autoconf ; do
- ${p} || die "${p}"
- done
- eend 0
- done
- cd "${S}"
-
- uclibctoolize
- epunt_cxx
-}
-
-src_compile() {
- lt_setup
- econf || die
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
-
- for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
- rm -f "${x}" ; ln -sf ../gnuconfig/$(basename "${x}") "${x}"
- done
- cd "${D}"/usr/share/libtool/libltdl
- for x in config.guess config.sub ; do
- rm -f ${x} ; ln -sfn ../${x} ${x}
- done
-}
diff --git a/sys-devel/libtool/libtool-1.5.2-r7.ebuild b/sys-devel/libtool/libtool-1.5.2-r7.ebuild
deleted file mode 100644
index 2a0a8ec81041..000000000000
--- a/sys-devel/libtool/libtool-1.5.2-r7.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-1.5.2-r7.ebuild,v 1.7 2005/01/23 00:36:23 eradicator Exp ${P}-r1.ebuild,v 1.8 2002/10/04 06:34:42 kloeri Exp $
-
-inherit eutils gnuconfig multilib
-
-# NOTE: We install libltdl of libtool-1.3x for compat reasons ...
-
-OLD_PV="1.3.5"
-OLD_S="${WORKDIR}/${PN}-${OLD_PV}"
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="http://www.gnu.org/software/libtool/libtool.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
- mirror://gnu/${PN}/${PN}-${OLD_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="uclibc"
-
-DEPEND="virtual/libc
- >=sys-devel/autoconf-2.58
- >=sys-devel/automake-1.8.3"
-# the autoconf dep is due to it complaining 'configure.ac:55: error: Autoconf version 2.58 or higher is required'
-# the automake dep is due to Bug #46037
-
-lt_setup() {
- export WANT_AUTOCONF=2.5
- export WANT_AUTOMAKE=1.5
-}
-
-gen_ltmain_sh() {
- local date=
- local PACKAGE=
- local VERSION=
-
- rm -f ltmain.shT
- date=`./mkstamp < ./ChangeLog` && \
- eval `egrep '^[[:space:]]*PACKAGE' configure` && \
- eval `egrep '^[[:space:]]*VERSION' configure` && \
- sed -e "s/@PACKAGE@/${PACKAGE}/" -e "s/@VERSION@/${VERSION}/" \
- -e "s%@TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT || return 1
-
- mv -f ltmain.shT ltmain.sh || {
- (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT)
- return 1
- }
-
- return 0
-}
-
-src_unpack() {
- lt_setup
-
- unpack ${A}
-
- cd ${OLD_S}
- echo
- # Install updated missing script
- portageq has_version / "sys-devel/automake" && {
- rm -f missing
- automake --add-missing
- }
-
- einfo "Patching ${OLD_S##*/} ..."
- epatch ${FILESDIR}/1.4.3/${PN}-1.2f-cache.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-nonneg.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.3.5-mktemp.patch
- epatch ${FILESDIR}/ltconfig-uclibc.patch
-
- cd ${S}
- echo
- # Install updated missing script
-# portageq has_version / "sys-devel/automake" && {
-# rm -f missing
-# automake --add-missing
-# }
-
- # Make sure non of the patches touch ltmain.sh, but rather ltmain.in
- rm -f ltmain.sh*
-
- einfo "Patching ${S##*/} ..."
- # Redhat patches
- epatch ${FILESDIR}/1.4.3/${PN}-1.4-nonneg.patch
- # Fix the relink problem where the relinked libs do not get
- # installed. It is *VERY* important that you get a updated
- # 'libtool-1.4.3-relink.patch' if you update this, as it
- # fixes a very serious bug. Please not that this patch is
- # included in 'libtool-1.4.3-gentoo.patch' for this ebuild.
- #
- # NOTE: all affected apps should get a 'libtoolize --copy --force'
- # added to update libtool
- #
-# Seems to be included in shipped tarball ...
-# epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-relink-58664.patch
-
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-multilib.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-demo.patch
- epatch ${FILESDIR}/${PV}/${PN}-1.5-libtool.m4-x86_64.patch
- epatch ${FILESDIR}/${PV}/${PN}-1.5-testfailure.patch
- # Mandrake patches
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-lib64.patch
-# Fix bug #43244
-# epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-fix-linkage-of-cxx-code-with-gcc.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-archive-shared.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-ltmain-SED.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-expsym-linux.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-libtoolize--config-only.patch
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.3-pass-thread-flags.patch
-
- # Gentoo Patches
- # Do not create bogus entries in $dependency_libs or $libdir
- # with ${D} or ${S} in them.
- # <azarah@gentoo.org> - (07 April 2002)
- epatch ${FILESDIR}/1.4.3/${PN}-1.4.2-portage.patch
- # If a package use an older libtool, and libtool.m4 for that
- # package is updated, but not libtool, then we run into an
- # issue where $shared_ext is not set. This results in libraries
- # being built without '.so' extension, bug #40901
- # <azarah@gentoo.org> - (11 Feb 2004)
- epatch ${FILESDIR}/${PV}/${PN}-1.5.2-libtool_m4-shared_ext.patch
- # For older autoconf setups's that do not support libtool.m4,
- # $max_cmd_len are never set, causing all tests against it to
- # fail, resulting in 'integer expression expected' errors and
- # possible misbehaviour.
- # <azarah@gentoo.org> - (11 Feb 2004)
- epatch ${FILESDIR}/${PV}/${PN}-1.5.2-ltmain_sh-max_cmd_len.patch
-
- # Libtool's autoguessing at tag's sucks ... it get's confused
- # if the tag's CC says '<CHOST>-gcc' and the env CC says 'gcc'
- # or vice versa ... newer automakes specify the tag so no
- # guessing is needed #67692
- epatch ${FILESDIR}/${PV}/libtool-1.5-filter-host-tags.patch
-
- einfo "Generate ltmain.sh ..."
- gen_ltmain_sh || die "Failed to generate ltmain.sh!"
-
- # Run gnuconfig_update for both old and new versions *after* patches so we
- # don't screw them up
- gnuconfig_update ${WORKDIR}
-}
-
-src_compile() {
- lt_setup
-
- local myconf=
- has_multilib_profile && myconf="--libdir=/usr/$(get_libdir)"
-
- #
- # ************ libtool-1.3x ************
- #
-
- cd ${OLD_S}
-
- einfo "Configuring ${OLD_S##*/} ..."
- ./configure ${myconf} --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info || die
-
- einfo "Building ${OLD_S##*/} ..."
- emake || die
-
- #
- # ************ libtool-1.5x ************
- #
-
- cd ${S}
-
- einfo "Configuring ${S##*/} ..."
- ./configure ${myconf} --host=${CHOST} \
- --prefix=/usr \
- --infodir=/usr/share/info || die
-
- einfo "Building ${S##*/} ..."
- emake || die
-}
-
-src_install() {
- #
- # ************ libtool-1.3x ************
- #
-
- einfo "Installing ${OLD_S##*/} ..."
- cd ${OLD_S}/libltdl; make DESTDIR=${D} install || die
-
- # Remove stuff we are not going to use ...
- for x in libltdl.a libltdl.la libltdl.so
- do
- [ -f ${x} ] && rm -f ${D}/usr/lib/${x}
- done
- rm -rf ${D}/usr/include
-
- #
- # ************ libtool-1.5x ************
- #
-
- einfo "Installing ${S##*/} ..."
- cd ${S}; make DESTDIR=${D} install || die
-
- if use uclibc ; then
- for x in $(find ${D} -name config.guess -o -name config.sub) ; do
- rm -f ${x}; ln -sf ../gnuconfig/$(basename ${x}) ${x}
- done
- cd ${D}/usr/share/libtool/libltdl
- for x in config.guess config.sub ; do
- rm -f ${x} ; ln -sfn ../${x} ${x}
- done
- cd ${S}
- fi
-
- dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
-}