From 9899bc1fe1f7b523d5d87974101c415599976241 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 4 Nov 2010 17:39:47 +0000 Subject: Cleaned old versions (Portage version: 2.1.9.24/cvs/Linux x86_64) --- app-arch/p7zip/ChangeLog | 7 +- app-arch/p7zip/files/4.65-hardlink.patch | 13 --- app-arch/p7zip/files/4.65-kde4.patch | 81 ----------------- app-arch/p7zip/files/4.65-makefile.patch | 20 ----- app-arch/p7zip/p7zip-4.58.ebuild | 77 ---------------- app-arch/p7zip/p7zip-4.65-r1.ebuild | 133 ---------------------------- app-arch/p7zip/p7zip-9.13-r1.ebuild | 145 ------------------------------- 7 files changed, 6 insertions(+), 470 deletions(-) delete mode 100644 app-arch/p7zip/files/4.65-hardlink.patch delete mode 100644 app-arch/p7zip/files/4.65-kde4.patch delete mode 100644 app-arch/p7zip/files/4.65-makefile.patch delete mode 100644 app-arch/p7zip/p7zip-4.58.ebuild delete mode 100644 app-arch/p7zip/p7zip-4.65-r1.ebuild delete mode 100644 app-arch/p7zip/p7zip-9.13-r1.ebuild (limited to 'app-arch/p7zip') diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog index e0b0c3401a58..5ec22c3ae888 100644 --- a/app-arch/p7zip/ChangeLog +++ b/app-arch/p7zip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/p7zip # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.133 2010/11/04 17:31:04 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.134 2010/11/04 17:39:47 jlec Exp $ + + 04 Nov 2010; Justin Lecher -files/4.65-hardlink.patch, + -p7zip-4.65-r1.ebuild, -files/4.65-kde4.patch, -p7zip-9.13-r1.ebuild, + -files/4.65-makefile.patch, -p7zip-4.58.ebuild: + Cleaned old versions *p7zip-9.13-r2 (04 Nov 2010) diff --git a/app-arch/p7zip/files/4.65-hardlink.patch b/app-arch/p7zip/files/4.65-hardlink.patch deleted file mode 100644 index 05d9e71c8e65..000000000000 --- a/app-arch/p7zip/files/4.65-hardlink.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- makefile 2009-02-25 16:03:33.000000000 +0100 -+++ makefile.new 2009-02-25 16:03:17.000000000 +0100 -@@ -55,8 +55,8 @@ - $(MAKE) -C CPP/7zip/UI/Console all - - 7zG: common7z -- cd bin ; rm -f Lang ; ln ../GUI/Lang . -- cd bin ; rm -f help ; ln ../GUI/help . -+ cd bin ; rm -f Lang ; ln -sf ../GUI/Lang . -+ cd bin ; rm -f help ; ln -sf ../GUI/help . - $(MAKE) -C CPP/7zip/UI/GUI all - - clean: diff --git a/app-arch/p7zip/files/4.65-kde4.patch b/app-arch/p7zip/files/4.65-kde4.patch deleted file mode 100644 index dad8cfaf1ef4..000000000000 --- a/app-arch/p7zip/files/4.65-kde4.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop -index 9010fbd..eec41dd 100644 ---- a/GUI/kde/p7zip_compress.desktop -+++ b/GUI/kde/p7zip_compress.desktop -@@ -1,6 +1,8 @@ - [Desktop Entry] --ServiceTypes=inode/directory --Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark -+Type=Service -+ServiceTypes=KonqPopupMenu/Plugin -+MimeType=all/all; -+Actions=CompressDialog;Compress7z;CompressZip;Benchmark - X-KDE-Priority=TopLevel - X-KDE-Submenu=7-Zip - X-KDE-Icon=p7zip -@@ -20,26 +22,6 @@ Name=Add to Zip Archive - Icon=p7zip - Exec=p7zipForFilemanager a -tzip %U - --[Desktop Action extractHere] --Name=Extract Here --Exec=p7zipForFilemanager x %U --Icon=p7zip -- --[Desktop Action ExtractSubdir] --Name=Extract to subdirectory --Icon=p7zip --Exec=p7zipForFilemanager xs %U -- --[Desktop Action ExtractTo] --Name=Extract to ... --Icon=p7zip --Exec=p7zipForFilemanager xd %U -- --[Desktop Action test] --Name=Test Archive --Exec=p7zipForFilemanager t %U --Icon=p7zip -- - [Desktop Action Benchmark] - Name=Benchmark - Icon=p7zip -diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop -index 9038c76..217788c 100644 ---- a/GUI/kde/p7zip_extract.desktop -+++ b/GUI/kde/p7zip_extract.desktop -@@ -1,10 +1,29 @@ - [Desktop Entry] --X-SuSE-translate=true --Encoding=UTF-8 --ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak --Actions=extractHere -+Type=Service -+ServiceTypes=KonqPopupMenu/Plugin -+MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-java-archive;application/x-deb;application/x-ace;application/x-7z-compressed;application/x-arc;application/x-arj;application/x-compress;application/x-zip-compressed;application/x-cpio;application/x-pak; -+#MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-rar-compressed;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak; -+Actions=extractHere;ExtractSubdir;ExtractTo;test; -+X-KDE-Priority=TopLevel -+X-KDE-Submenu=7-Zip -+X-KDE-Icon=p7zip - - [Desktop Action extractHere] --Name=Extract Here with 7-zip -+Name=Extract Here - Exec=p7zipForFilemanager x %U - Icon=p7zip -+ -+[Desktop Action ExtractSubdir] -+Name=Extract to subdirectory -+Icon=p7zip -+Exec=p7zipForFilemanager xs %U -+ -+[Desktop Action ExtractTo] -+Name=Extract to ... -+Icon=p7zip -+Exec=p7zipForFilemanager xd %U -+ -+[Desktop Action test] -+Name=Test Archive -+Exec=p7zipForFilemanager t %U -+Icon=p7zip diff --git a/app-arch/p7zip/files/4.65-makefile.patch b/app-arch/p7zip/files/4.65-makefile.patch deleted file mode 100644 index b0297f8d2014..000000000000 --- a/app-arch/p7zip/files/4.65-makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 -+++ CPP/7zip/Bundles/Format7zFree/makefile.new 2009-02-25 14:18:31.000000000 +0100 -@@ -271,8 +271,6 @@ - MyAes.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- RarAes.o \ - Sha1.o \ - WzAes.o \ - ZipCrypto.o \ -@@ -313,7 +313,6 @@ - $(LZH_OBJS) \ - $(LZM_OBJS) \ - $(NSIS_OBJS) \ -- $(RAR_OBJS) \ - $(SPLIT_OBJS) \ - $(TAR_OBJS) \ - $(UDF_OBJS) \ - diff --git a/app-arch/p7zip/p7zip-4.58.ebuild b/app-arch/p7zip/p7zip-4.58.ebuild deleted file mode 100644 index ee38832991e8..000000000000 --- a/app-arch/p7zip/p7zip-4.58.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# 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.58.ebuild,v 1.9 2009/01/25 19:29:15 radek Exp $ - -inherit eutils toolchain-funcs multilib - -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" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="static doc" - -DEPEND="" - -S=${WORKDIR}/${PN}_${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e "/^CXX=/s:g++:$(tc-getCXX):" \ - -e "/^CC=/s:gcc:$(tc-getCC):" \ - -e "s:OPTFLAGS=-O:OPTFLAGS=${CXXFLAGS}:" \ - -e 's:-s ::' \ - -e '/Rar/d' \ - 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 - - # patching to not included nonfree RAR decompression code is higher a sed call - # But we're removing nonfree code just in case sed wasnt enough - rm -rf CPP/7zip/Compress/Rar -} - -src_compile() { - emake all3 || die "compilation error" -} - -src_install() { - # this wrappers can not be symlinks, p7zip should be called with full path - make_wrapper 7zr "/usr/lib/${PN}/7zr" - make_wrapper 7za "/usr/lib/${PN}/7za" - make_wrapper 7z "/usr/lib/${PN}/7z" - - 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" - exeinto /usr/$(get_libdir)/${PN} - doexe bin/*.so || die "doexe *.so files" - - 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 - - einfo "Please be aware that rar support was removed (it's nonfree)" - einfo "You can use app-arch/rar for rar support" -} diff --git a/app-arch/p7zip/p7zip-4.65-r1.ebuild b/app-arch/p7zip/p7zip-4.65-r1.ebuild deleted file mode 100644 index 4b07f0cd48e8..000000000000 --- a/app-arch/p7zip/p7zip-4.65-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-4.65-r1.ebuild,v 1.5 2010/06/26 14:55:39 nixnut 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="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="doc kde rar static wxwidgets" - -RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror ) - wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN}_${PV} - -pkg_setup() { - use wxwidgets && wxwidgets_pkg_setup -} - -src_prepare() { - if use kde && ! use wxwidgets ; then - einfo "USE-flag kde needs wxwidgets flag" - einfo "silently enabling wxwidgets flag" - fi - - # remove non-free RAR codec - if use rar; then - ewarn "Enabling 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 - # bundles have extension .bundle - sed -i -e '/^PROG=/s/\.so/.bundle/' \ - CPP/7zip/Bundles/Format7zFree/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=/s/LOCAL_LIBS=/&-static /' makefile.machine - - # We can be more parallel - cp -f makefile.parallel_jobs makefile - - epatch "${FILESDIR}"/${PV}-hardlink.patch - epatch "${FILESDIR}"/${PV}-kde4.patch - - if use kde || use wxwidgets; then - einfo "Preparing dependency list" - emake depend || die - fi -} - -src_compile() { - emake all3 || die "compilation error" - if use kde || use wxwidgets; then - emake 7zG || die "error building GUI" - fi -} - -src_test() { - emake test_7z test_7zr || die "test failed" -} - -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" - - 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/kde4/services/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/*$(get_modname) || die "doexe *$(get_modname) files" - if use rar; then - exeinto /usr/$(get_libdir)/${PN}/Codecs/ - doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) 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 -} diff --git a/app-arch/p7zip/p7zip-9.13-r1.ebuild b/app-arch/p7zip/p7zip-9.13-r1.ebuild deleted file mode 100644 index 834b8ccfe945..000000000000 --- a/app-arch/p7zip/p7zip-9.13-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r1.ebuild,v 1.4 2010/10/02 12:37:57 grobian 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc kde rar +pch static wxwidgets" - -RDEPEND="kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/konqueror ) - wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN}_${PV} - -pkg_setup() { - use wxwidgets && wxwidgets_pkg_setup -} - -src_prepare() { - if ! use pch; then - sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die - fi - - sed \ - -e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \ - -e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \ - -i makefile* || die - if use kde && ! use wxwidgets ; then - einfo "USE-flag kde needs wxwidgets flag" - einfo "silently enabling wxwidgets flag" - fi - - # remove non-free RAR codec - if use rar; then - ewarn "Enabling nonfree RAR decompressor" - else - sed -e '/Rar/d' -i makefile* - rm -rf CPP/7zip/Compress/Rar - epatch "${FILESDIR}"/9.04-makefile.patch - fi - - sed -i \ - -e "/^CXX=/s:g++:$(tc-getCXX):" \ - -e "/^CC=/s:gcc:$(tc-getCC):" \ - -e '/ALLFLAGS/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 - [[ ${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 - 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}"/9.04-kde4.patch - - if use kde || use wxwidgets; then - einfo "Preparing dependency list" - emake depend || die - fi -} - -src_compile() { - emake all3 || die "compilation error" - if use kde || use wxwidgets; then - emake 7zG || die "error building GUI" - fi -} - -src_test() { - emake test_7z test_7zr || die "test failed" -} - -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" - - 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/kde4/services/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/*$(get_modname) || die "doexe *$(get_modname) files" - if use rar; then - exeinto /usr/$(get_libdir)/${PN}/Codecs/ - doexe bin/Codecs/*$(get_modname) || die "doexe Codecs/*$(get_modname) 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 -} -- cgit v1.2.3-65-gdbad