summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Granberg <zorry@gentoo.org>2013-05-19 13:40:32 +0000
committerMagnus Granberg <zorry@gentoo.org>2013-05-19 13:40:32 +0000
commitb1d6a9118d73c8c601ecb1cab81a7113d4024f7e (patch)
treea72115ab7c6b5685b5c64a6bb09a43f8cec71fa3 /gnome-extra
parentStable for amd64, wrt bug #470262 (diff)
downloadhistorical-b1d6a9118d73c8c601ecb1cab81a7113d4024f7e.tar.gz
historical-b1d6a9118d73c8c601ecb1cab81a7113d4024f7e.tar.bz2
historical-b1d6a9118d73c8c601ecb1cab81a7113d4024f7e.zip
Add new pax mark bug #457194
Package-Manager: portage-2.1.12/cvs/Linux x86_64 Manifest-Sign-Key: 0xFD79807F
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/cinnamon/ChangeLog5
-rw-r--r--gnome-extra/cinnamon/Manifest10
-rw-r--r--gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild7
3 files changed, 13 insertions, 9 deletions
diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 3c4285b7e477..941933649143 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-extra/cinnamon
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.22 2013/03/29 20:09:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.23 2013/05/19 13:40:14 zorry Exp $
+
+ 19 May 2013; Magnus Granberg <zorry@gentoo.org> cinnamon-1.6.7-r1.ebuild:
+ Add new pax mark bug #457194
29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -cinnamon-1.6.1.ebuild,
-cinnamon-1.6.7.ebuild:
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 2cef592422c6..fafaa06eefc8 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
AUX cinnamon-1.6.1-automagic-gnome-bluetooth.patch 1725 SHA256 788176a82802b45ebff7db3c8540dc4621c09f5e57f37ebeddc34771ca512847 SHA512 c2f7ae82074c98318026a651042bab40183339db4c4f9a48615487bec02a39398f19713af3ff7989632d3d415942ddfb7bb46c540ce73d7a74809d5b3625001d WHIRLPOOL 5ef7e830aff3df3dc0cda5abd0f37296c2b0ae35877fa911548eaa189d435b6ba1df66430a4b423f3a311b419ab8f72b146a330cf06b41ecf431867b4cd798ac
AUX cinnamon-1.6.1-optional-networkmanager.patch 6418 SHA256 d5fc4f1be5a4b9f8c7e9a18c42a1179e111e8d28f01f8d8d4142d9a9fb44108a SHA512 863a2a7ada2dae38a474bc651094595bf9d0fb64a8523161605977bbfc7522946b93ecf73b4d73061e31390bc0df886e8f299dacbfdc4f076576c3e5c2094a5e WHIRLPOOL 151271653b2f6c30a1dafae93a790e4947581ec37ed8af3713dd4839e404b5b81c74d02267c8f8841c0fafdf5b8cde048cac74197ce5df843166b44e6a1e7999
DIST cinnamon-1.6.7.tar.gz 3748727 SHA256 283d8ec894831df5c062e88196c5f0191daa99b1da1cbfada1547a700f50ab24 SHA512 73a774af74ad9223f16cf5082f7507322471f9d329b402f9d5ebba28f5c620234a9e28ffcdd8810c0ca4944b2aa7e3b82e59c445f8d64c0a8c5cd7a036f5c633 WHIRLPOOL 424201aca9d40fd64e8327ade88e662d73ed7a8ba551406a705afd8d2a386321b48b9decae8c3b39939d638b0fcc08198f1ecc415d3d9af38d67fe638e9cce70
-EBUILD cinnamon-1.6.7-r1.ebuild 8193 SHA256 3dfcc701a3a248c836660150c22100f5388ee9438126f78bf649af77c335e270 SHA512 61d73b7224c31b713cf596e62dd30c1e02ae6ecf5e3faac9ac1a5a87208c8ba96a929fed047cc195b88a14f8f67e52b3d3a7ed49f749f8b2093d58655c83af1e WHIRLPOOL a9b6da0285a7565bf987a6dbf5ab182e06aa3e7f4d37b83b5cc3b1180294353eb96ef43e47b3df4dbf1c8927989e73b39a1be6b7b030145076eba9ef4e567010
-MISC ChangeLog 5756 SHA256 9ed23f693cb59df562ae5eb46e77e42aa8a3b574e82923227cf23c279847a07e SHA512 5be2f03286dcf0f5f5ed535286d889df02f7ad09d47fc9dbaa6e9b1aa22c00655afcd1a9b343c3908c7d035c6e1fd08d756fe9b9f5b3e328560520fa64138332 WHIRLPOOL 3adecf4b95f86d2c8a336ed7fc3fb19c651a96326eba07936fb3ca0abfe1c92e2a218fa63d73eff3a67e1da6c92a2f00735e204b1fa738bdf0ad4babbe727e5d
+EBUILD cinnamon-1.6.7-r1.ebuild 8232 SHA256 e355f4615132326e903853601476e4feab9dd098c9d006a6048ee1cbf948b9a8 SHA512 c03c0af30d765f72fd8802dbca62e61ace2b178c6fb2c67a381645fcaeb85e37c2ff0d15cca758e99aeef365ada487e381cfd3e7a2ebc5bdda512a8f8da59f45 WHIRLPOOL c2a22820b68943231a2c380350dbf5f2cebfc5fcc5785dd6fbfc362222df0203c01de5d01c01d231e6d39533406eac7cebdbb6096022a55ea6609900e09fa6f4
+MISC ChangeLog 5866 SHA256 445f94c204e6f12313d96ef5fcc3e5e1c4517aefce0b5ee49bf9858c3c0108d1 SHA512 01bbbbc5fe2ad3ec74c8d8d61ce801a8bd24a97880207d31aa3edfae289640de485128591e1e735bee4d2ffec76c1a7fdba8c01a7c2c5dd05ba0d11059e70f60 WHIRLPOOL a0842b89384bde708e15be6908ae9fcfc1dbaee9fbe840f0bf87e7967d3ab54d5ad2698e40601d0e0c86534ca9b0896fe2e5d794a680eb8c69ca9bbfd38a8213
MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlFV9OAACgkQ1fmVwcYIWAa9RACgxHjtP06cvBVWDxdukRxA+chf
-7bIAoMCfdKgWn9rZ9iL+TiDpnKZ3+Ea/
-=DdKL
+iEYEAREIAAYFAlGY1f0ACgkQe6JQqv15gH/n3ACdH25QKmwqwveDw6vI0lRGtnYE
+qJkAoJIDpFptM9XfbK8rpzPLWofnmT83
+=sqLy
-----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
index 3e85af9e553b..1bd1c8521dda 100644
--- a/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild,v 1.1 2013/01/07 05:13:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.6.7-r1.ebuild,v 1.2 2013/05/19 13:40:14 zorry Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -191,8 +191,9 @@ src_install() {
-i "${ED}usr/bin/cinnamon-"{launcher,menu-editor,settings} \
-i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
- # Required for gnome-shell on hardened/PaX, bug #398941
- pax-mark mr "${ED}usr/bin/cinnamon"
+ # Required for gnome-shell on hardened/PaX, bug #398941 and #457194
+ # PaX EMUTRAMP need to be on
+ pax-mark mrE "${ED}usr/bin/cinnamon"
}
pkg_postinst() {