vapier      14/03/18 01:21:06

  Modified:             ChangeLog
  Added:                bzip2-1.0.6-r7.ebuild
  Log:
  Link bzip2 against the shared lib #504648 by Nikoli.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.117                app-arch/bzip2/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?rev=1.117&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?rev=1.117&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?r1=1.116&r2=1.117

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog   14 Mar 2014 22:36:49 -0000      1.116
+++ ChangeLog   18 Mar 2014 01:21:06 -0000      1.117
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.116 2014/03/14 
22:36:49 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.117 2014/03/18 
01:21:06 vapier Exp $
+
+*bzip2-1.0.6-r7 (18 Mar 2014)
+
+  18 Mar 2014; Mike Frysinger <[email protected]> +bzip2-1.0.6-r7.ebuild:
+  Link bzip2 against the shared lib #504648 by Nikoli.
 
   14 Mar 2014; Johannes Huber <[email protected]> bzip2-1.0.6-r6.ebuild:
   x86 stable, bug #504004



1.1                  app-arch/bzip2/bzip2-1.0.6-r7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r7.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r7.ebuild?rev=1.1&content-type=text/plain

Index: bzip2-1.0.6-r7.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r7.ebuild,v 1.1 
2014/03/18 01:21:06 vapier Exp $

# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
#      (since we're building shared libs) ...

EAPI=4

inherit eutils toolchain-funcs multilib multilib-minimal

DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
HOMEPAGE="http://www.bzip.org/";
SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz";

LICENSE="BZIP2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="static static-libs"

RDEPEND="abi_x86_32? (
                !<=app-emulation/emul-linux-x86-baselibs-20130224
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"

src_prepare() {
        epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
        epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
        epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
        epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
        epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
        epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
        epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
        epatch "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch

        # - Use right man path
        # - Generate symlinks instead of hardlinks
        # - pass custom variables to control libdir
        sed -i \
                -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
                -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
                -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
                Makefile || die
}

bemake() {
        emake \
                VPATH="${S}" \
                CC="$(tc-getCC)" \
                AR="$(tc-getAR)" \
                RANLIB="$(tc-getRANLIB)" \
                "$@"
}

multilib_src_compile() {
        bemake -f "${S}"/Makefile-libbz2_so all
        # Make sure we link against the shared lib #504648
        ln -sf libbz2.so.${PV} libbz2.so
        bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
}

multilib_src_install() {
        into /usr

        # Install the shared lib manually.  We install:
        #  .x.x.x - standard shared lib behavior
        #  .x.x   - SONAME some distros use #338321
        #  .x     - SONAME Gentoo uses
        dolib.so libbz2.so.${PV}
        local v
        for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
                dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
        done
        use static-libs && dolib.a libbz2.a

        if multilib_build_binaries ; then
                gen_usr_ldscript -a bz2

                dobin bzip2recover
                into /
                dobin bzip2
        fi
}

multilib_src_install_all() {
        # `make install` doesn't cope with out-of-tree builds, nor with
        # installing just non-binaries, so handle things ourselves.
        insinto /usr/include
        doins bzlib.h
        into /usr
        dobin bz{diff,grep,more}
        doman *.1

        dosym bzdiff /usr/bin/bzcmp
        dosym bzdiff.1 /usr/share/man/man1/bzcmp.1

        dosym bzmore /usr/bin/bzless
        dosym bzmore.1 /usr/share/man/man1/bzless.1

        local x
        for x in bunzip2 bzcat bzip2recover ; do
                dosym bzip2.1 /usr/share/man/man1/${x}.1
        done
        for x in bz{e,f}grep ; do
                dosym bzgrep /usr/bin/${x}
                dosym bzgrep.1 /usr/share/man/man1/${x}.1
        done

        dodoc README* CHANGES manual.pdf
        dohtml manual.html

        # move "important" bzip2 binaries to /bin and use the shared libbz2.so
        dosym bzip2 /bin/bzcat
        dosym bzip2 /bin/bunzip2
}




Reply via email to