vapier 14/11/03 05:32:23 Modified: libtool-9999.ebuild ChangeLog Added: libtool-2.4.3-r2.ebuild Removed: libtool-1.3.5.ebuild libtool-1.5.26-r1.ebuild Log: Split libltdl out of main libtool package per upstream recommendations. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.19 sys-devel/libtool/libtool-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild?r1=1.18&r2=1.19 Index: libtool-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libtool-9999.ebuild 28 Oct 2014 01:01:00 -0000 1.18 +++ libtool-9999.ebuild 3 Nov 2014 05:32:23 -0000 1.19 @@ -1,12 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.18 2014/10/28 01:01:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.19 2014/11/03 05:32:23 vapier Exp $ EAPI="4" LIBTOOLIZE="true" #225559 WANT_LIBTOOL="none" -inherit eutils autotools multilib unpacker multilib-minimal +inherit eutils autotools multilib unpacker if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git @@ -22,17 +22,12 @@ LICENSE="GPL-2" SLOT="2" -IUSE="static-libs test vanilla" +IUSE="vanilla" RDEPEND="sys-devel/gnuconfig - >=sys-devel/autoconf-2.65 - >=sys-devel/automake-1.11.1 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + >=sys-devel/autoconf-2.69 + >=sys-devel/automake-1.13" DEPEND="${RDEPEND} - test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils" [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" @@ -57,38 +52,24 @@ epunt_cxx } -multilib_src_configure() { +src_configure() { # the libtool script uses bash code in it and at configure time, tries # to find a bash shell. if /bin/sh is bash, it uses that. this can # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. export CONFIG_SHELL=/bin/bash - ECONF_SOURCE="${S}" \ - econf $(use_enable static-libs static) + ECONF_SOURCE=${S} econf --disable-ltdl-install } -multilib_src_install_all() { - dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS - - # While the libltdl.la file is not used directly, the m4 ltdl logic - # keys off of its existence when searching for ltdl support. #293921 - #use static-libs || find "${D}" -name libltdl.la -delete - - # Building libtool with --disable-static will cause the installed - # helper to not build static objects by default. This is undesirable - # for crappy packages that utilize the system libtool, so undo that. - sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die - - local x - for x in $(find "${D}" -name config.guess -o -name config.sub) ; do - ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die - done +src_test() { + emake check } -pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libltdl.so.3 -} +src_install() { + default -pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3 + local x + while read -d $'\0' -r x ; do + ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die + done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) } 1.234 sys-devel/libtool/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.234&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?rev=1.234&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/ChangeLog?r1=1.233&r2=1.234 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- ChangeLog 1 Nov 2014 02:55:00 -0000 1.233 +++ ChangeLog 3 Nov 2014 05:32:23 -0000 1.234 @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/libtool # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.233 2014/11/01 02:55:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.234 2014/11/03 05:32:23 vapier Exp $ + +*libtool-2.4.3-r2 (03 Nov 2014) + + 03 Nov 2014; Mike Frysinger <[email protected]> +libtool-2.4.3-r2.ebuild, + -libtool-1.3.5.ebuild, -libtool-1.5.26-r1.ebuild, libtool-9999.ebuild: + Split libltdl out of main libtool package per upstream recommendations. 01 Nov 2014; Mike Frysinger <[email protected]> libtool-2.4.3-r1.ebuild: Rework the libtool hack so we do not generate static libs. 1.1 sys-devel/libtool/libtool-2.4.3-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r2.ebuild?rev=1.1&content-type=text/plain Index: libtool-2.4.3-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r2.ebuild,v 1.1 2014/11/03 05:32:23 vapier Exp $ EAPI="4" LIBTOOLIZE="true" #225559 WANT_LIBTOOL="none" inherit eutils autotools multilib unpacker if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git http://git.savannah.gnu.org/r/${PN}.git"; inherit git-2 else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" fi DESCRIPTION="A shared library tool for developers" HOMEPAGE="http://www.gnu.org/software/libtool/"; LICENSE="GPL-2" SLOT="2" IUSE="vanilla" # Pull in libltdl directly until we convert packages to the new dep. RDEPEND="sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0" DEPEND="${RDEPEND} app-arch/xz-utils" [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" src_unpack() { if [[ ${PV} == "9999" ]] ; then git-2_src_unpack cd "${S}" ./bootstrap || die else unpacker_src_unpack fi } src_prepare() { use vanilla && return 0 epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105 epatch "${FILESDIR}"/${PN}-2.4.3-no-clean-gnulib.patch #527200 epatch "${FILESDIR}"/${PN}-2.4.3-test-cmdline_wrap.patch #384731 pushd libltdl >/dev/null AT_NOELIBTOOLIZE=yes eautoreconf popd >/dev/null AT_NOELIBTOOLIZE=yes eautoreconf epunt_cxx } src_configure() { # the libtool script uses bash code in it and at configure time, tries # to find a bash shell. if /bin/sh is bash, it uses that. this can # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. export CONFIG_SHELL=/bin/bash ECONF_SOURCE=${S} econf --disable-ltdl-install } src_test() { emake check } src_install() { default local x while read -d $'\0' -r x ; do ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) }
