summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-03-26 19:48:13 +0000
committerJustin Lecher <jlec@gentoo.org>2011-03-26 19:48:13 +0000
commit01a3d80d7923b2271e22341b756df1fb2aa3654b (patch)
tree710d4c76f2e11715cdd451697cb3bbfc4b3b68d9 /app-arch
parentUpdate dependencies. (diff)
downloadgentoo-2-01a3d80d7923b2271e22341b756df1fb2aa3654b.tar.gz
gentoo-2-01a3d80d7923b2271e22341b756df1fb2aa3654b.tar.bz2
gentoo-2-01a3d80d7923b2271e22341b756df1fb2aa3654b.zip
Version Bump, #360201
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/p7zip/ChangeLog8
-rw-r--r--app-arch/p7zip/p7zip-9.13-r3.ebuild7
-rw-r--r--app-arch/p7zip/p7zip-9.13.ebuild7
-rw-r--r--app-arch/p7zip/p7zip-9.20.1.ebuild (renamed from app-arch/p7zip/p7zip-9.13-r2.ebuild)24
4 files changed, 28 insertions, 18 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 51a517a42692..b58392599515 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-arch/p7zip
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.137 2011/03/21 07:46:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.138 2011/03/26 19:48:13 jlec Exp $
+
+*p7zip-9.20.1 (26 Mar 2011)
+
+ 26 Mar 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.13.ebuild,
+ -p7zip-9.13-r2.ebuild, p7zip-9.13-r3.ebuild, +p7zip-9.20.1.ebuild:
+ Version Bump, #360201
21 Mar 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.13.ebuild,
p7zip-9.13-r2.ebuild, p7zip-9.13-r3.ebuild, metadata.xml:
diff --git a/app-arch/p7zip/p7zip-9.13-r3.ebuild b/app-arch/p7zip/p7zip-9.13-r3.ebuild
index 08a35f65c562..0ebef4a99130 100644
--- a/app-arch/p7zip/p7zip-9.13-r3.ebuild
+++ b/app-arch/p7zip/p7zip-9.13-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r3.ebuild,v 1.2 2011/03/21 07:46:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r3.ebuild,v 1.3 2011/03/26 19:48:13 jlec Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~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/kdelibs )
+RDEPEND="
+ kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
DEPEND="${RDEPEND}"
@@ -142,7 +143,7 @@ src_install() {
doman man1/7z.1 man1/7za.1 man1/7zr.1 || die
dodoc ChangeLog README TODO || die
- if use doc ; then
+ if use doc; then
dodoc DOCS/*.txt
dohtml -r DOCS/MANUAL/*
fi
diff --git a/app-arch/p7zip/p7zip-9.13.ebuild b/app-arch/p7zip/p7zip-9.13.ebuild
index adfb2b9f1ff0..b8106d827ecf 100644
--- a/app-arch/p7zip/p7zip-9.13.ebuild
+++ b/app-arch/p7zip/p7zip-9.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13.ebuild,v 1.9 2011/03/21 07:46:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13.ebuild,v 1.10 2011/03/26 19:48:13 jlec Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="alpha amd64 ~arm 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/kdelibs )
+RDEPEND="
+ kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
DEPEND="${RDEPEND}"
@@ -129,7 +130,7 @@ src_install() {
doman man1/7z.1 man1/7za.1 man1/7zr.1
dodoc ChangeLog README TODO
- if use doc ; then
+ if use doc; then
dodoc DOCS/*.txt
dohtml -r DOCS/MANUAL/*
fi
diff --git a/app-arch/p7zip/p7zip-9.13-r2.ebuild b/app-arch/p7zip/p7zip-9.20.1.ebuild
index 140606e7001e..253381a24f17 100644
--- a/app-arch/p7zip/p7zip-9.13-r2.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.13-r2.ebuild,v 1.3 2011/03/21 07:46:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1.ebuild,v 1.1 2011/03/26 19:48:13 jlec Exp $
EAPI="2"
WX_GTK_VER="2.8"
@@ -16,7 +16,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~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/kdelibs )
+RDEPEND="
+ kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
DEPEND="${RDEPEND}"
@@ -32,9 +33,12 @@ src_prepare() {
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
+
if use kde && ! use wxwidgets ; then
einfo "USE-flag kde needs wxwidgets flag"
einfo "silently enabling wxwidgets flag"
@@ -56,7 +60,9 @@ src_prepare() {
makefile* || die "changing makefiles"
if use amd64; then
- cp -f makefile.linux_amd64 makefile.machine
+ cp -f makefile.linux_amd64_asm makefile.machine
+ elif use x86; then
+ cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine
elif [[ ${CHOST} == *-darwin* ]] ; then
# Mac OS X needs this special makefile, because it has a non-GNU linker
[[ ${CHOST} == *64-* ]] \
@@ -73,12 +79,8 @@ src_prepare() {
# 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
+ use static && sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine
if use kde || use wxwidgets; then
einfo "Preparing dependency list"
@@ -94,7 +96,7 @@ src_compile() {
}
src_test() {
- emake test_7z test_7zr || die "test failed"
+ emake test test_7z test_7zr || die "test failed"
}
src_install() {
@@ -118,7 +120,7 @@ src_install() {
newins GUI/p7zip_16_ok.png p7zip.png
insinto /usr/share/kde4/services/ServiceMenus
- doins GUI/kde/*.desktop
+ doins GUI/kde4/*.desktop
fi
fi
@@ -136,7 +138,7 @@ src_install() {
doman man1/7z.1 man1/7za.1 man1/7zr.1 || die
dodoc ChangeLog README TODO || die
- if use doc ; then
+ if use doc; then
dodoc DOCS/*.txt
dohtml -r DOCS/MANUAL/*
fi