jlec        15/04/07 08:44:03

  Modified:             ChangeLog
  Added:                p7zip-9.38.1.ebuild
  Log:
  Version BUmp, bug #545202
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.163                app-arch/p7zip/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- ChangeLog   10 May 2014 17:09:55 -0000      1.162
+++ ChangeLog   7 Apr 2015 08:44:03 -0000       1.163
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/p7zip
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.162 2014/05/10 
17:09:55 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.163 2015/04/07 
08:44:03 jlec Exp $
+
+*p7zip-9.38.1 (07 Apr 2015)
+
+  07 Apr 2015; Justin Lecher <j...@gentoo.org> +p7zip-9.38.1.ebuild:
+  Version BUmp, bug #545202
 
   10 May 2014; Justin Lecher <j...@gentoo.org> p7zip-9.20.1-r5.ebuild:
   Add support for x32, #506602, patch by Luke-Jr



1.1                  app-arch/p7zip/p7zip-9.38.1.ebuild

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

Index: p7zip-9.38.1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.1 
2015/04/07 08:44:03 jlec Exp $

EAPI=5

WX_GTK_VER="2.8"

inherit eutils multilib toolchain-funcs wxwidgets

DESCRIPTION="Port of 7-Zip archiver for Unix"
HOMEPAGE="http://p7zip.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"

LICENSE="LGPL-2.1 rar? ( unRAR )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris"
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"

REQUIRED_USE="kde? ( wxwidgets )"

RDEPEND="
        kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
        wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
DEPEND="${RDEPEND}
        amd64? ( dev-lang/yasm )
        abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
        x86? ( dev-lang/nasm )"

S=${WORKDIR}/${PN}_${PV}

src_prepare() {
        if ! use pch; then
                sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" 
-i makefile.* || die
        fi

        sed \
                -e 's:-m32 ::g' \
                -e 's:-m64 ::g' \
                -e 's:-O::g' \
                -e 's:-pipe::g' \
                -e "/^CXX=/s:g++:$(tc-getCXX):" \
                -e "/^CC=/s:gcc:$(tc-getCC):" \
                -e '/ALLFLAGS/s:-s ::' \
                -e "/OPTFLAGS=/s:=.*:=${CFLAGS}:" \
                -i makefile* || die

        # remove non-free RAR codec
        if use rar; then
                ewarn "Enabling nonfree RAR decompressor"
        else
                sed \
                        -e '/Rar/d' \
                        -e '/RAR/d' \
                        -i makefile* CPP/7zip/Bundles/Format7zFree/makefile || 
die
                rm -rf CPP/7zip/Compress/Rar || die
        fi

        if use abi_x86_x32; then
                sed -i -e "/^ASM=/s:amd64:x32:" makefile*
                cp -f makefile.linux_amd64_asm makefile.machine || die
        elif use amd64; then
                cp -f makefile.linux_amd64_asm makefile.machine || die
        elif use x86; then
                cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
        elif [[ ${CHOST} == *-darwin* ]] ; then
                # Mac OS X needs this special makefile, because it has a 
non-GNU linker
                [[ ${CHOST} == *64-* ]] \
                        && cp -f makefile.macosx_64bits makefile.machine \
                        || cp -f makefile.macosx_32bits makefile.machine
                # bundles have extension .bundle but don't die because USE=-rar
                # removes the Rar directory
                sed -i -e '/strcpy(name/s/\.so/.bundle/' \
                        CPP/Windows/DLL.cpp || die
                sed -i -e '/^PROG=/s/\.so/.bundle/' \
                        CPP/7zip/Bundles/Format7zFree/makefile \
                        $(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
        elif use x86-fbsd; then
                # FreeBSD needs this special makefile, because it hasn't -ldl
                sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
        fi

        if use static; then
                sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' 
makefile.machine || die
        fi

        if use kde || use wxwidgets; then
                einfo "Preparing dependency list"
                emake depend
        fi
}

src_compile() {
        emake all3
        if use kde || use wxwidgets; then
                emake -- 7zG
                emake -- 7zFM
        fi
}

src_test() {
        emake test test_7z test_7zr
}

src_install() {
        # this wrappers can not be symlinks, p7zip should be called with full 
path
        make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
        make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
        make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"

        if use kde || use wxwidgets; then
                make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
                make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"

                make_desktop_entry 7zFM "${PN} FM" ${PN} 
"GTK;Utility;Archiving;Compression"
                make_desktop_entry 7zG "${PN} GUI" ${PN} 
"GTK;Utility;Archiving;Compression"

                dobin GUI/p7zipForFilemanager
                exeinto /usr/$(get_libdir)/${PN}
                doexe bin/7z{G,FM}

                insinto /usr/$(get_libdir)/${PN}
                doins -r GUI/{Lang,help}

                insinto /usr/share/icons/hicolor/16x16/apps/
                newins GUI/p7zip_16_ok.png p7zip.png

                if use kde; then

                        rm GUI/kde4/p7zip_compress.desktop
                        insinto  /usr/share/kde4/services/ServiceMenus
                        doins GUI/kde4/*.desktop
                fi
        fi

        dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
        doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1

        exeinto /usr/$(get_libdir)/${PN}
        doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
        doexe bin/*$(get_modname)
        if use rar; then
                exeinto /usr/$(get_libdir)/${PN}/Codecs/
                doexe bin/Codecs/*$(get_modname)
        fi

        doman man1/7z.1 man1/7za.1 man1/7zr.1
        dodoc ChangeLog README TODO

        if use doc; then
                dodoc DOC/*.txt
                dohtml -r DOC/MANUAL/*
        fi
}




Reply via email to