From: Justin Lecher <jlec@gentoo.org>
Date: Tue, 7 Apr 2015 10:10:40 +0000 (+0000)
Subject: Drop useless Desktop items, bug #465296
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fea699c62c33143e349cb135b577b293e3a6268;p=gentoo.git

Drop useless Desktop items, bug #465296

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
---

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/Manifest b/app-arch/p7zip/Manifest
index 04ea78634449..60d1194dc652 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -8,27 +8,27 @@ AUX p7zip-9.20.1-execstack.patch 785 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b
 AUX p7zip-9.20.1-long_rar_pwd.patch 805 SHA256 5c2fdd7132e5fdceac91d783b1056420537f14a1e3fc7715b75dac698704ebf8 SHA512 0895fec9ec2a0eae960e44f181d2dcac618916d4bf7a5576e234ad7d2fc9417da4eb589c115b0b4040f7c9142cd43637355d8d62e8f43201117c0ee2a6da02cb WHIRLPOOL bd2d339a7356f1b3201005fe6f05ad881b2292e5fadf46a32a28c1667d32fe8b5b555105975e7c69dfa90cc157b415b86a4e153e13dfe0b8bfc4ef095c24fb57
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
-EBUILD p7zip-9.20.1-r4.ebuild 4325 SHA256 d07ded21136afea4e04a6e8b095c25a45690a3720dbbac982d4bd95b1bdd97c5 SHA512 6e3244629d4f92acf669125002f11169efe3bf2dd5377ebfc91856d93c1fe1cd1d33eb99d53d0a4ad08d36313d68feb751cfc0fa9c2bf34b1b1c89a3ad3856b6 WHIRLPOOL a18c74d14d85621453b4dfe59588fd16e176d6a5c2c1161bb7dc4c753f5499de3c22d4df8ebcad450a38e0de5ab61416c7932188f74ebc77b747982bb8799464
-EBUILD p7zip-9.20.1-r5.ebuild 4554 SHA256 6ddaef8ed0e419dc1879fdb540ecbc4484664ecc6a493c594d8bdd8f2cf1720d SHA512 579ceedb14296409dd6bade64ca937e0ff280b69f9c060332d7877fa302606c858b29d717fa14320c67852ddc1d2d1b116e0a7abf0aa6d96a96f85f0965477b8 WHIRLPOOL 3b09742f6ef90c3bfa30426d8085a97956dfbfc422d3d2389e269bbf543ab2d98f6d19bd3174e3a4dbce6cf11177f31650fa983e9ed721a684ad527766f1afbf
-EBUILD p7zip-9.38.1.ebuild 4345 SHA256 df31210b1fc18b1351370c04fa369ce15c0ab404bcbefbf3d511462a52d8108e SHA512 5423c20207146af58a44b4c5e5672556717547c2f49dec64cda0340fbb639db869f59ad319a03287cb0e6a80a17d2f20d2b860aa6cb7d583bf31aa6c4628b8d8 WHIRLPOOL 95eadea940d262f6c3929c96dfade83aabb037627524b4de40af18ced496cdebf6d073013b2436c93eec2973664b5b2b02097b03bd1caa99f8bbc25d41383bb4
-MISC ChangeLog 21530 SHA256 22f0e460dd2f9513ed60302afb811bc2c788d2174c03a2c8d6932f2d72527d76 SHA512 dee3b10d8bf2c9afd9dfa1e3ffe24a86226229c11ecfe57fdf50e3af64a213be3fa6771dd45eadc2bf6ec8baa0364c31cad10dadec50a06f2ea7ccdec1eb90de WHIRLPOOL 6197b1c928d1b78bf19a562e7324b77e1eb88fe24d71644e24242ff4b67abbdf261e214b022357d14807189e64f4afd5560b18562e3dfd0bdc9087991d139e15
+EBUILD p7zip-9.20.1-r4.ebuild 4237 SHA256 847ac11b93c4d17cf14a43baff094044a46cfd4b48ee0d76c11966b0c42cc57c SHA512 138c20e3ebd2ae0c9b2eeec74dd58815f1f74881514eb6bb792546c499b7eaa78a2af07ca9e2c18df48ec9f005abbf8f4075aed067591ee7ab849e9580547a71 WHIRLPOOL 29bceb1b07206805e721949877ba24a37a12f98fac93af79c07830b31f4c342d237b72ab37c4de0a66cc051afa93ed8e2e75e79cfdad545789a9dc5fac7d968b
+EBUILD p7zip-9.20.1-r5.ebuild 4471 SHA256 60d3321b38d933f78e473ced4e9a8a915fb2ea903144e3eb9a606dc9a5e358e4 SHA512 092f71fa786ff9ade07b6a35696682c1944952233e58583fc1d895b78f4e7f18355afd7d7759e601c241cfd8aae4f829e72bea1b355cdac8600a7b89127b999d WHIRLPOOL 440beccba8d4f16f6c6dd64e89e4709604cc46e14c4a64f7272702d433191b4d08824993b7df8d9149700b85136edb8c448739cf2a02f771510b061839810f9e
+EBUILD p7zip-9.38.1.ebuild 4264 SHA256 e737006808db541279530d05435cdeb799e3b85e43f96065184cb2a6854fa092 SHA512 ca2bd8f89cd011115b14dc86b53810c3aad0af92c7fccd63ab14377b5b2fb3658ba436ea96ad490b710bc85f60641264ce962a2ab1d3460aca5eb6e3efe4521b WHIRLPOOL 032b9bcd5141ec1306f0dcdf2125b7b09bbba72d7f7229cd7fffc1a0680009a2f1678fcd73999c0799940fc088d71c806f087b7fe30f5d9b4a9ea378f7003dfd
+MISC ChangeLog 21691 SHA256 038ed476621c19fefafd2b48170bf795355056154c032c138c0229b2894342ba SHA512 b3c734117012a46faf90a8d0e5db0472556e6b3685939fbac31495b770d63b495ab2f5d6630df2831cf04becfd15822a844dc695a6b301641ea4e1c06a810815 WHIRLPOOL 15fe294ec98a544d30677833cf6a22bf54f05989c9742f40135a162b2244325c046b8961291e5f98254df423bf102935b39b4e40f5b1fab14576226c24ec5c3c
 MISC metadata.xml 332 SHA256 4f1520cfbd8b72e61635d58783a77d08189616c031d0288eb6c47ae20b182353 SHA512 9aee4332f10ec1b28c6f40c580adfb5d7d6220f00ed3cea73c11a5063ca3ca737761b206c1b6f926b9e2418f5db0439df108d9a99747eff1277190f0f6258d86 WHIRLPOOL 1610d8c1a4038ffe903cc16e153745ca611732813a1a0c03601aabff96d42106994a84962dda28783ea8943e3c8c8b11d45b25cd96ebe0926194df96e0e25a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVI5jTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVI60gXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVireK8P/32nTqeplO806GbsCcmF4cCN
-j/EReralOCNykCueNixPoWQnLDYvMKswPZ9sscPAb4vZD8WSRfQ70GGO1vSh9x6h
-ppmp0oQxKf1U6Qnghi/0eLzUm+VxV8dF+36a4nwwC6yYoA/CFfY5x81amaLYzzt3
-h22IB0Sy4w8rui2zhbxaf2RWL014Uw1hZKm28e/WluymEbGhfm99eazYngFXoiMX
-ddJOFoZ+3hfu+eBmkXu0myStY8Bnzo87KqwHSMAnr/9waHjfTVxmCBmgUvNUmiQk
-OZaIbWR0FHasIRctXVYAvYUn8cBmJdz8SAKpggswIhVuyxbrzd7wsdNbS8AWRMuV
-Xj0wJC2NIZnSm96kXmXO+0KUBNcVMxKitdiWfyICec97bEp5BQmiozuTFM74Y5lg
-QToFarfDvxn+t0CDVSfPMzs94SYzZJk94jHCf7SCZpqpp0ahGevYxmZGzcOPSjpH
-e5tCde3y/xJHfaYWE+Y+svFaND0XL63wAKT7zy8tHZ45JOE6rx6V59GbHgU4tJDA
-aNZDFeii7lyXq7o6eqvgf/CXFg3KRddnytpazoY0Xd6Vqar+bjPSUH7XXUVmrT2r
-QZLVv1pIVuLYypplQS04Z4JhJYDfnM9a82zMvvg/IXxzot/r4E69GuH/bwy0VAHZ
-Wg89FThUyF7CRRor+I+i
-=G0+f
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirD/sP/jzMNhLJ28R+17t0PjJptWFi
+YssTi2pGd4ZM+CoGrgiqZoEamAefGjD5v5Gs+v99Ns8MWyW15U+fUEHm0yt/GGcJ
+9Dk7Azwrk6pvKY9u8OMJ+pw6aQCsMUDQ8RQgfjg1oF7/DPaZ9u+jrf9gk0tDY6FY
+JQFEmMXUt4B1nKR5wfg2SpPtryyjOJB8f04JFxlYrLgCJMUn5R1GqOGj0W7s47bZ
+d4lIxswyKGlDPUVBxDg5223vMNAZ3eYpsZcadDp/0y2yYYnGkXTxZgUFsUs+BBRh
+ckvAVgumGgAk8GcDuTjNT+/DKODwdnXygcGmehc2KqIcAJxo9BAwXBxTE/AhIoCy
+uWCtjlqGyfaSoOrgMbmKbYfeh/bwptlws05nE+1A3Y+nAD/zBZFC0qyfE+0VjPIo
+wtzgv4e0sGxLuy4S0tDeb/vw7eYuEx+BlTYzJfq5VNnxwp5Z7kM9faExhXhBumuv
+bSk4PQJy+eFmC6rzuhX7HEZBxRh3zTGSmzZI5uZe1ismFG8C1khk6XSPx2JSznDt
+50+hgJUlrX37MxPny4t2Z30zc8wTcXC/W/9xFfDTUjtiY6aCWdH6qPqRHBxmUE7E
+MDl2jeHjpXmQs/ysxQBfd1GiEl5/iIaNd6u02CTx37M96qz8VsBXCMdJdJ8B6CTT
+4Ig+2MdFrmw8kLNQBtEZ
+=AFhp
 -----END PGP SIGNATURE-----
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}