[gentoo-commits] gentoo-x86 commit in app-arch/p7zip: metadata.xml ChangeLog p7zip-4.65.ebuild

[gentoo-commits] gentoo-x86 commit in app-arch/p7zip: metadata.xml ChangeLog p7zip-4.65.ebuild

[Patrick Lauer (patrick)]

patrick     09/04/26 20:59:25

  Modified:             metadata.xml ChangeLog
  Added:                p7zip-4.65.ebuild
  Log:
  Bump to 4.65, closes #249780. Based on the ebuild by jlec, incorporating changes from Flameeyes, Sergey Dryabzhinsky, Ilya Kashirin, A.C.Heron and Chi-Thanh Christopher Nguyen.
  (Portage version: 2.2_rc31/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-arch/p7zip/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	26 Sep 2004 19:15:53 -0000	1.1
+++ metadata.xml	26 Apr 2009 20:59:25 -0000	1.2
@@ -5,4 +5,7 @@
 <maintainer>
   <email>radek@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name="rar">Enable support for non-free rar decoder</flag>
+</use>	
 </pkgmetadata>



1.105                app-arch/p7zip/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/p7zip/ChangeLog?r1=1.104&r2=1.105

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog	25 Jan 2009 19:29:15 -0000	1.104
+++ ChangeLog	26 Apr 2009 20:59:25 -0000	1.105
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/p7zip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.104 2009/01/25 19:29:15 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.105 2009/04/26 20:59:25 patrick Exp $
+
+*p7zip-4.65 (26 Apr 2009)
+
+  26 Apr 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/4.65-hardlink.patch, +files/4.65-makefile.patch, metadata.xml,
+  +p7zip-4.65.ebuild:
+  Bump to 4.65, closes #249780. Based on the ebuild by jlec, incorporating
+  changes from Flameeyes, Sergey Dryabzhinsky, Ilya Kashirin, A.C.Heron and
+  Chi-Thanh Christopher Nguyen.
 
   25 Jan 2009; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.58.ebuild:
   Removed unnecesary warning as per bug #126722



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

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

Index: p7zip-4.65.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65.ebuild,v 1.1 2009/04/26 20:59:25 patrick Exp $

EAPI="2"
WX_GTK_VER="2.8"

inherit eutils toolchain-funcs multilib 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="~amd64 ~x86"
IUSE="wxwindows doc kde rar static"

RDEPEND="wxwindows? ( x11-libs/wxGTK[X] )
	kde? ( || ( kde-base/konqueror:3.5 kde-base/kdebase-meta:3.5 kde-base/kdebase:3.5 ) )"
DEPEND="${RDEPEND}"

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

src_prepare() {
	if use kde && ! use wxwindows ; then
		eerror "USE-flag kde needs wxwindows flag"
		die "do USE=\"kde wxwindows\" emerge p7zip"
	fi

	# remove non-free RAR codec
	if use rar; then
		ewarn "Adding nonfree RAR decompressor"
	else
		sed -e '/Rar/d' -i makefile*
		rm -rf CPP/7zip/Compress/Rar
		epatch "${FILESDIR}"/${PV}-makefile.patch
	fi

	sed -i \
		-e "/^CXX=/s:g++:$(tc-getCXX):" \
		-e "/^CC=/s:gcc:$(tc-getCC):" \
		-e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \
		-e 's:-s ::' \
		makefile* || die "changing makefiles"

	if use amd64; then
		cp -f makefile.linux_amd64 makefile.machine
	elif [[ ${CHOST} == *-darwin* ]] ; then
		# Mac OS X needs this special makefile, because it has a non-GNU linker
		cp -f makefile.macosx makefile.machine
	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=/s/LOCAL_LIBS=/&-static /' makefile.machine

	# We can be more parallel
	cp -f makefile.parallel_jobs makefile

	epatch "${FILESDIR}"/${PV}-hardlink.patch
}

src_compile() {
	emake all3 || die "compilation error"
	if use wxwindows; then
		emake 7zG || die "error building GUI"
	fi
}

src_test() {
	emake test_7z test_7zr || die "test failed"
	if use wxwindows; then
		emake test_7zG || die "GUI test failed"
	fi
}

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 wxwindows; then
		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"

		dobin GUI/p7zipForFilemanager
		exeinto /usr/$(get_libdir)/${PN}
		doexe bin/7zG

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

		if use kde; then
			insinto /usr/share/icons/hicolor/16x16/apps/
			newins GUI/p7zip_16_ok.png p7zip.png

			insinto  /usr/share/apps/konqueror/servicemenus/
			doins GUI/kde/*.desktop
		fi
	fi

	dobin "${FILESDIR}/p7zip" || die

	# gzip introduced in 4.42, so beware :)
	newbin contrib/gzip-like_CLI_wrapper_for_7z/p7zip 7zg || die

	exeinto /usr/$(get_libdir)/${PN}
	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx || die "doexe bins"
	doexe bin/*.so || die "doexe *.so files"
	if use rar; then
		exeinto /usr/$(get_libdir)/${PN}/Codecs/
		doexe bin/Codecs/*.so || die "doexe Codecs/*.so files"
	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
}