From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SZoqi-0002G1-HU for garchives@archives.gentoo.org; Wed, 30 May 2012 19:46:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20B68E07EE; Wed, 30 May 2012 19:46:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D8598E07EE for ; Wed, 30 May 2012 19:46:20 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16EFB1B401E for ; Wed, 30 May 2012 19:46:20 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2264) id B36EC2004B; Wed, 30 May 2012 19:46:18 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-arch/p7zip: ChangeLog p7zip-9.20.1-r1.ebuild p7zip-9.20.1-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog p7zip-9.20.1-r1.ebuild p7zip-9.20.1-r2.ebuild X-VCS-Directories: app-arch/p7zip X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Message-Id: <20120530194618.B36EC2004B@flycatcher.gentoo.org> Date: Wed, 30 May 2012 19:46:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 90f340fa-d2e7-4b6b-9701-29f4c306e749 X-Archives-Hash: e7846a88ce7cd652f1f9e951b8ea07e3 jlec 12/05/30 19:46:18 Modified: ChangeLog p7zip-9.20.1-r1.ebuild Added: p7zip-9.20.1-r2.ebuild Log: app-arch/p7zip: Give desktop files better names, #418179; drop in no ex= ecstack pacth from fedora =20 (Portage version: 2.2.0_alpha108/cvs/Linux x86_64) Revision Changes Path 1.145 app-arch/p7zip/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/Cha= ngeLog?rev=3D1.145&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/Cha= ngeLog?rev=3D1.145&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/Cha= ngeLog?r1=3D1.144&r2=3D1.145 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- ChangeLog 23 Apr 2012 10:50:24 -0000 1.144 +++ ChangeLog 30 May 2012 19:46:18 -0000 1.145 @@ -1,6 +1,13 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.144 2012= /04/23 10:50:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.145 2012= /05/30 19:46:18 jlec Exp $ + +*p7zip-9.20.1-r2 (30 May 2012) + + 30 May 2012; Justin Lecher p7zip-9.20.1-r1.ebuild, + +p7zip-9.20.1-r2.ebuild, +files/p7zip-9.20.1-execstack.patch: + Give desktop files better names, #418179; drop in no execstack pacth f= rom + fedora =20 *p7zip-9.20.1-r1 (23 Apr 2012) =20 1.2 app-arch/p7zip/p7zip-9.20.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7z= ip-9.20.1-r1.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7z= ip-9.20.1-r1.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7z= ip-9.20.1-r1.ebuild?r1=3D1.1&r2=3D1.2 Index: p7zip-9.20.1-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- p7zip-9.20.1-r1.ebuild 23 Apr 2012 10:50:24 -0000 1.1 +++ p7zip-9.20.1-r1.ebuild 30 May 2012 19:46:18 -0000 1.2 @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r1.ebuild= ,v 1.1 2012/04/23 10:50:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r1.ebuild= ,v 1.2 2012/05/30 19:46:18 jlec Exp $ =20 EAPI=3D4 =20 WX_GTK_VER=3D"2.8" =20 -inherit eutils toolchain-funcs multilib wxwidgets +inherit eutils multilib toolchain-funcs wxwidgets =20 DESCRIPTION=3D"Port of 7-Zip archiver for Unix" HOMEPAGE=3D"http://p7zip.sourceforge.net/" 1.1 app-arch/p7zip/p7zip-9.20.1-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7z= ip-9.20.1-r2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/p7zip/p7z= ip-9.20.1-r2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: p7zip-9.20.1-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r2.ebuild,= v 1.1 2012/05/30 19:46:18 jlec Exp $ EAPI=3D4 WX_GTK_VER=3D"2.8" inherit eutils multilib toolchain-funcs wxwidgets DESCRIPTION=3D"Port of 7-Zip archiver for Unix" HOMEPAGE=3D"http://p7zip.sourceforge.net/" SRC_URI=3D"mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2" LICENSE=3D"LGPL-2.1 rar? ( unRAR )" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac= os ~x86-macos ~sparc-solaris" IUSE=3D"doc kde rar +pch static wxwidgets" REQUIRED_USE=3D"kde? ( wxwidgets )" RDEPEND=3D" kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND=3D"${RDEPEND} amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )" S=3D${WORKDIR}/${PN}_${PV} pkg_setup() { use wxwidgets && wxwidgets_pkg_setup } src_prepare() { epatch \ "${FILESDIR}"/${P}-execstack.patch if ! use pch; then sed "s:PRE_COMPILED_HEADER=3DStdAfx.h.gch:PRE_COMPILED_HEADER=3D:g" -i = makefile.* || die fi sed \ -e 's:-m32 ::g' \ -e 's:-m64 ::g' \ -e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \ -e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \ -i makefile* || die # remove non-free RAR codec if use rar; then ewarn "Enabling nonfree RAR decompressor" else sed -e '/Rar/d' -i makefile* || die rm -rf CPP/7zip/Compress/Rar || die epatch "${FILESDIR}"/9.04-makefile.patch fi sed -i \ -e "/^CXX=3D/s:g++:$(tc-getCXX):" \ -e "/^CC=3D/s:gcc:$(tc-getCC):" \ -e '/ALLFLAGS/s:-s ::' \ makefile* || die "changing makefiles" if 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} =3D=3D *-darwin* ]] ; then # Mac OS X needs this special makefile, because it has a non-GNU linker [[ ${CHOST} =3D=3D *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=3D-rar # removes the Rar directory sed -i -e '/strcpy(name/s/\.so/.bundle/' \ CPP/Windows/DLL.cpp || die sed -i -e '/^PROG=3D/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 use static && sed -i -e '/^LOCAL_LIBS=3D/s/LOCAL_LIBS=3D/&-static /' mak= efile.machine 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 pa= th 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" "GTK;Utility;Archiving;Compression" make_desktop_entry 7zG "${PN} GUI" "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 DOCS/*.txt dohtml -r DOCS/MANUAL/* fi }