summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-04-07 10:10:39 +0000
committerJustin Lecher <jlec@gentoo.org>2015-04-07 10:10:39 +0000
commit3bba249fad2f3834b4f676adb94c8978f814450c (patch)
tree947a2157782a874d51c9d41efaea06caa1e97174 /app-arch
parentVersion Bump (diff)
downloadgentoo-2-3bba249fad2f3834b4f676adb94c8978f814450c.tar.gz
gentoo-2-3bba249fad2f3834b4f676adb94c8978f814450c.tar.bz2
gentoo-2-3bba249fad2f3834b4f676adb94c8978f814450c.zip
Drop useless Desktop items, bug #465296
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/p7zip/ChangeLog6
-rw-r--r--app-arch/p7zip/p7zip-9.20.1-r4.ebuild7
-rw-r--r--app-arch/p7zip/p7zip-9.20.1-r5.ebuild7
-rw-r--r--app-arch/p7zip/p7zip-9.38.1.ebuild7
4 files changed, 14 insertions, 13 deletions
diff --git a/app-arch/p7zip/ChangeLog b/app-arch/p7zip/ChangeLog
index 584faee1a23b..f2f4d4949bce 100644
--- a/app-arch/p7zip/ChangeLog
+++ b/app-arch/p7zip/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/p7zip
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.164 2015/04/07 10:10:39 jlec Exp $
+
+ 07 Apr 2015; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r4.ebuild,
+ p7zip-9.20.1-r5.ebuild, p7zip-9.38.1.ebuild:
+ Drop useless Desktop items, bug #465296
*p7zip-9.38.1 (07 Apr 2015)
diff --git a/app-arch/p7zip/p7zip-9.20.1-r4.ebuild b/app-arch/p7zip/p7zip-9.20.1-r4.ebuild
index 65f7f346eae4..aaf0cfe528ea 100644
--- a/app-arch/p7zip/p7zip-9.20.1-r4.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.20.1-r4.ebuild,v 1.5 2013/11/16 07:49:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r4.ebuild,v 1.6 2015/04/07 10:10:39 jlec Exp $
EAPI=4
@@ -113,11 +113,10 @@ src_install() {
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}
+ doexe bin/7zFM
insinto /usr/$(get_libdir)/${PN}
doins -r GUI/{Lang,help}
diff --git a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
index 292f4a14dcbc..e2403ce7dddc 100644
--- a/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
+++ b/app-arch/p7zip/p7zip-9.20.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.20.1-r5.ebuild,v 1.4 2014/05/10 17:09:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.20.1-r5.ebuild,v 1.5 2015/04/07 10:10:39 jlec Exp $
EAPI=5
@@ -118,11 +118,10 @@ src_install() {
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}
+ doexe bin/7zFM
insinto /usr/$(get_libdir)/${PN}
doins -r GUI/{Lang,help}
diff --git a/app-arch/p7zip/p7zip-9.38.1.ebuild b/app-arch/p7zip/p7zip-9.38.1.ebuild
index 66df95434385..c3dfaa2ad039 100644
--- a/app-arch/p7zip/p7zip-9.38.1.ebuild
+++ b/app-arch/p7zip/p7zip-9.38.1.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/p7zip-9.38.1.ebuild,v 1.2 2015/04/07 10:10:39 jlec Exp $
EAPI=5
@@ -42,7 +42,7 @@ src_prepare() {
-e "/^CXX=/s:g++:$(tc-getCXX):" \
-e "/^CC=/s:gcc:$(tc-getCC):" \
-e '/ALLFLAGS/s:-s ::' \
- -e "/OPTFLAGS=/s:=.*:=${CFLAGS}:" \
+ -e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
-i makefile* || die
# remove non-free RAR codec
@@ -113,11 +113,10 @@ src_install() {
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}
+ doexe bin/7zFM
insinto /usr/$(get_libdir)/${PN}
doins -r GUI/{Lang,help}