|
Lines 104-121
Link Here
|
| 104 |
| xargs sed -i -e '/html_DATA/d' -e '/pdf_DATA/d' || die |
104 |
| xargs sed -i -e '/html_DATA/d' -e '/pdf_DATA/d' || die |
| 105 |
fi |
105 |
fi |
| 106 |
|
106 |
|
| 107 |
# This is an old version of libtool |
107 |
# Use system copy of libtool 2.x |
| 108 |
rm -rf libltdl |
108 |
epatch "${FILESDIR}"/${P}-libtool.patch |
| 109 |
sed -i -e '/libltdl/d' configure.ac || die |
109 |
rm -rf libltdl m4/{libtool,lt*}.m4 |
| 110 |
sed -i -e 's/AC_LIBLTDL_CONVENIENCE/AC_LIBLTDL_INSTALLABLE/' configure.ac || die |
|
|
| 111 |
|
110 |
|
| 112 |
# Update this file from our local libtool which is much newer than the |
111 |
# Update this file from our local libtool which is much newer than the |
| 113 |
# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD. |
112 |
# bundled one. This allows MAKEOPTS=-j2 to work on FreeBSD. |
| 114 |
if has_version ">=sys-devel/libtool-2" ; then |
113 |
cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die |
| 115 |
cp "${EPREFIX}"/usr/share/libtool/config/install-sh config || die |
|
|
| 116 |
else |
| 117 |
cp "${EPREFIX}"/usr/share/libtool/install-sh config || die |
| 118 |
fi |
| 119 |
|
114 |
|
| 120 |
# no nls, no gettext, no iconv macro, so disable it |
115 |
# no nls, no gettext, no iconv macro, so disable it |
| 121 |
use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; } |
116 |
use nls || { sed -i -e '/^AM_ICONV/d' configure.ac || die; } |
|
Lines 130-138
Link Here
|
| 130 |
} |
125 |
} |
| 131 |
|
126 |
|
| 132 |
src_configure() { |
127 |
src_configure() { |
| 133 |
# libtool file collision, bug 276609 |
|
|
| 134 |
local myconf="--disable-ltdl-install" |
| 135 |
|
| 136 |
# Core functionality: |
128 |
# Core functionality: |
| 137 |
# All of X, cairo-output, gtk need the pango+cairo functionality |
129 |
# All of X, cairo-output, gtk need the pango+cairo functionality |
| 138 |
if use gtk || use cairo; then |
130 |
if use gtk || use cairo; then |
