From 116cafcd878f3c8674f85cf15c0a85d0fd474c70 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sat, 21 Feb 2015 13:34:25 +0000 Subject: [PATCH] Follow QA policy for game state directory, bug 537580. Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8! --- app-editors/emacs-vcs/ChangeLog | 9 ++++--- app-editors/emacs-vcs/Manifest | 25 ++++++++++--------- ....90.ebuild => emacs-vcs-24.4.90-r1.ebuild} | 12 +++++---- 3 files changed, 26 insertions(+), 20 deletions(-) rename app-editors/emacs-vcs/{emacs-vcs-24.4.90.ebuild => emacs-vcs-24.4.90-r1.ebuild} (97%) diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 1fa6950fe689..643c0bbcb9e1 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.185 2015/02/21 08:48:20 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.186 2015/02/21 13:34:10 ulm Exp $ - 21 Feb 2015; Ulrich Müller - emacs-vcs-25.0.50_pre20150131.ebuild, emacs-vcs-25.0.9999-r1.ebuild: +*emacs-vcs-24.4.90-r1 (21 Feb 2015) + + 21 Feb 2015; Ulrich Müller -emacs-vcs-24.4.90.ebuild, + +emacs-vcs-24.4.90-r1.ebuild, emacs-vcs-25.0.50_pre20150131.ebuild, + emacs-vcs-25.0.9999-r1.ebuild: Follow QA policy for game state directory, bug 537580. *emacs-vcs-24.4.90 (17 Feb 2015) diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 5030e054c784..8b0cc6f9109c 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,29 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +DIST emacs-24.4-patches-4.tar.xz 4652 SHA256 8b97fe775ed120df42e6f3afbe3ce503c0fedd8957caa759649323ac340f2922 SHA512 b8f8aea92472b5c074fc4cb2198b329e7b0496a70ba04d76eea4f420e398f3882b89d848020750659f60828217ea3155f4d53078edc8dc715b2946b8a239157a WHIRLPOOL e5e92ce3fba0e62ba3135e89ab8de9b6196f9a342048dbe679e06c3530a305311a1b300b72abdee50416d989cb55ca053ea1e0b259e63cc56260bfd58d43894a DIST emacs-24.4.90.tar.xz 39752368 SHA256 cec2204ec0134dfac9987dde3aff95e4a02538d4ce63e8d7c55b6a409aa04b36 SHA512 c7fe2ab40b1a28a97342753afb7fd5c24751ad51a144c723c6c1be517b81006b4641f1f4e833b8424ac00107992934f4e4520dd7aa92074e44ab98a148a17eed WHIRLPOOL b20c133381617f15ee2babca36164a104f18da0f38ae310db4cbc539fa988832a4b7d78acc0e023e4b8c92a877decbce44d45028c8b8ecee708c092dfe27e39d DIST emacs-25.0.50_pre20141110.tar.xz 24564108 SHA256 ed5a3600a2434fa6c43fbbb711c9ad682f76bcaeba5632031a0053d1fa7c0020 SHA512 db2add52e31be1d696e3634c92f993db124eaa8f3a727d04603cf47ed4c581643594571177d812d6c86584dce357eec6c86a7c9df1b07b09cb6faac4c699daf2 WHIRLPOOL 91cdba50d7ad9f41859d3247b1b839d1a42cb8004e209b1afe8d86f3c27abdfd3f2b1cf767b480f2ea271871b79886c878a899918056c1abb100bfa0eab87668 DIST emacs-25.0.50_pre20141231.tar.xz 24688612 SHA256 15bc6b8e1923bb6c1e18e3a8d89652c6594d72fbd1e3c15898ab9df03d19ad77 SHA512 b544f3530c707927c8ef4614b0804505e6cb32d8d6cef45f7aff56f67d632906d447d381a374ef37c6c46660cba1bb53dc7adead308bd902951abcc475593c75 WHIRLPOOL 0f373c4ef413a88e91e41b707686413a93661121453f3a80bff1cba75a17271dd30cd8dc64037487d2dcb2e3f4681af3bc989668c931b006a1bb2742eb5a9d5b DIST emacs-25.0.50_pre20150131.tar.xz 24719944 SHA256 fa21415c14d724c6cbd92ea8b76bfbc157757baf1446492b5f72062ff0017076 SHA512 85629851ba93d25050e0590b8c00ea9417e2c6839d306276ec3f02ce4d6bba14fe407f32eb07dcc2d42c79fade0678e9e5c098cf1562831a0a715373629a9d40 WHIRLPOOL e58589ac54577800e971232e814212b2954c93c42d701c137283590833420680968f71b46c6e087c4b3d900f96fb1c99edc6420ffbd336740e9b079e01e9ef4a -EBUILD emacs-vcs-24.4.90.ebuild 11429 SHA256 f55dbd728e0b877b4d146985f6a312aa3d2b61e5e3635c1f074e2e9627567778 SHA512 7db3abcfa2223b39800f626d7ebfb567ae19f58cdb12758641086d527a821ef74542f8bb79fa93551af95f2650fd23a72bede89eb43e2dfd2228de98d133115d WHIRLPOOL 5d1f83d3732011572e5a4e9582c105edb5f96638fc144f13e527342c91ee78da73deae3eb25a34ccc6e27bc5e4b9eb8af3c76162378a08ac1fd587e5f50dc1f8 +EBUILD emacs-vcs-24.4.90-r1.ebuild 11530 SHA256 4b0181071c4ecd9255327cd65e1376bb015e649564f58e3187a22f8f0a1fd8b3 SHA512 79728811be2b99bddd3d72ac2a6d708afc777a2703ebf7d2d3cc820017bd0e62acab404a2d1c10487c3d628ce92072f09382431ccf250dacc0db462b9d471fa1 WHIRLPOOL d8595b3006624dfacaaa37469f73bb04eaa440ecf98a6b9a3c0301068fb9ba9b0b95ecd1f0023ca76b362b2f8e24f8e2b8941cc2c23706fb8c8e2e0722b44bf1 EBUILD emacs-vcs-24.4.9999-r2.ebuild 11456 SHA256 d506a7c926f276a4c1da9b3370b9819e1a98b36c10f1212b68224638c5babb12 SHA512 1e7f6541525d6f794f5f65f2eee3b035b08b664ac2d03ecd80fb09f1bb0399caca4c192fd0396159fe0616548954aa48839daa5dbe0ca212c557fcfe84ae4b9a WHIRLPOOL e6f8a303aad8c2874b795e1ac9510389b9fdcc7b74caf9db803f9c8838b4322573fb67a42f9b972b4dce04eecf1656de429f39a2fb48d78011b530bb833285ef EBUILD emacs-vcs-25.0.50_pre20141110.ebuild 11646 SHA256 f15d77e96a3e2a6fc89232bab924c48e500c1b4915dab9d2008aff5f041dc7b1 SHA512 7862776776d9eac9140b46986784004b947138bb644349cd43513111abab2316f1f1eb1085c46423605cd342a57081e4514897dae3e0e93fab4aa6e86710285f WHIRLPOOL 83cecd399eba34c71ea127b3dbfb417cc2e3204304fe8f90f506fd4b79708d773569feefabc339f4d70c4de8bd207c77eb1144f36d0a92c92c580e7112ca8c71 EBUILD emacs-vcs-25.0.50_pre20141231.ebuild 11480 SHA256 b3fb6853c5582c0169628bd1b1170f7cec437c71d58579efc8daf526bce290f8 SHA512 e7cf64c2ecd757d88689996a047a0297732e2c7970bcc08342dadb58a6bc0244cfde587f4b78018db2d5d17a9a2a13ad68ba7e6a89fb76b276aff0f541608693 WHIRLPOOL cf3cdd3d45155c49330820f47235a3ccdda1a71c432afad960bcb612d8f75a61a2526ee641346cb50c93cd425e3754c607d2975950264f033c039e10d99d326c EBUILD emacs-vcs-25.0.50_pre20150131.ebuild 11465 SHA256 6abf1e36c9fc4a7e8f72db6e321e087c487dd6c17c8532a6ec5838abab71c5ec SHA512 4f4777ccdd95dd60f2746213125187b5bec061507d2d88d00224624481a8239913ebbdf82832e6017d27ea5ddfb30288a5c15379c99ecb73f6392e0f19805157 WHIRLPOOL 4fe258fb0eb69f35e5a3368993da52623ff76c0725b3c2ff43bb91344447fddf712ff6aacadeda540e8b607b4f60ae176a12d125137bd20c213c78a5cb6a730b EBUILD emacs-vcs-25.0.9999-r1.ebuild 11458 SHA256 e04d791eea1b5b36e5bf3e25cec43e6290e622315dc1477a4528fe275efbc687 SHA512 4f279707d682b97214eba2e7a95f377de1dd955d637d2d877c87ea9358eee28d302fcb33566b3a2fe8b846eb02ac7f9bbf7118e142c2f002c6099df389fbee94 WHIRLPOOL 289228850d7379630cdb9a9943aea7dbcf886fe47626234b150258397565d9e72e1a1138bddbd42ca15768d865114ae18bb86c0c823870977f328decf2a63b39 -MISC ChangeLog 83278 SHA256 fe1bae4e44ff92f8dd6ecdf1ac3d5cd3c113196f918d2f8fd4c07466935a58ce SHA512 e4e7148c03126fadfeba4efa44bb578406040f15b2f9670d0e21ccbf827a60ac1e5acabb1c5600a312cb626ffd8eacc2983935ba32700488a8c2de61015a7bf6 WHIRLPOOL e9a0f62bb5e9fb9de5cee3dddf874cf43b0c7a0f722c5906df849675692dfc9a8e8e64b9d212a6e9687b0760668fec9ffdf72182252a70bd872caa5d48855bf8 +MISC ChangeLog 83374 SHA256 3802018248dda1cfff1d858cf239e2fcf284655d1dd25b9b9d8ebce5e001bbb9 SHA512 6a1f24284d11932c4b11fc5aac914edb074ddf20c1e521a1108fd4b38f928de55b53648bfce33214837024d8f46e7c164c6b143d973f80d4f16fc74e85b81190 WHIRLPOOL 2ec9d58783ff12c40216d4d4edd14a30146c5e8a2ae61ef19a7b9b07a560e96943ce55abe453c813a74d8b6d5b02ef29ba4e55fee33bcb20aa8792ddab7cb13f MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGcBAEBCAAGBQJU6EZfAAoJEJQzkH1pP7W4VrAL/R0KMG+UHujpbl6MRzG6VmsV -Z987gyQogSVsyQUBCYQJoS2flNzLyglq6sULg7FKgLWtve6Pg5UN9Ay0ITW/Ys24 -BFs64d9dyt1q8KZx08PhxTiGvOjc0Fo/iHtJfeEj9ORGyfei+gHVfvSlCW8G5kTi -Dtj4gTMHigBXOjcPBrqrd8+E5ebfflaUU7N0zte/sLQc0SDV2kbOx7/Dgbjdb8db -UzjmZUCWGabII/AftVv3wmZV+7ZzNU0HKm8pXBftiw6FELP3gcpidZSO25tXrxdR -h5/y4pBFGUfiSOw9BBXKebv2FyNF9dUrctKhIVn06EJm+RS+N2ZFde3p3f6pqpJ+ -Q3ImFb6P9Bcq37W/eaqorzn4D0XBpZZigvdbsTpB7q8XRDIgBQZUrGORHlcG7XY2 -KGiM+Po8vtxSxsrmoK7apjYtsLft40LjefCijA+o3KCLZ2I13gX4tztcqT+1eRLJ -zf0R9j4gdzzf2JupwtGz+X0EeCNNpvaFoVAxTf1g2A== -=4ZC0 +iQGcBAEBCAAGBQJU6IlqAAoJEJQzkH1pP7W4QEIL/3fO9cnpOgFg/mOS6Ywszk43 +zMLLFKC5j7R+Sc9avYun/Gui+hEU418iMGY+4xHsfbYqmH3laUD0LXG25ip8NERM +zzMKhLoSWbT/tXT6Hq0rEXTasYXDIZnwJ15quAJne4i+8+W9z7DM46djWqUyYy74 +Uck8F11GdD68E0BbVEtdAUHhS6St24xZqxLmKTvG9ddd40ACqpgV/XQ72ukySKgn +38Jg2ZN0jTJR3Z5A5oTCKdBjbAVyW2gUSPCG/EKcTaM1viPsZqkmSbgGNhyb6fIp +krVhilJddj+SvhOXu7asfwtJSixoYtKc030rHrITIbP6WtE95YLevyosH9MLRVKy +3Ddb93AhpBMn5ILP6Tg6zKy2AmB72wqiqg6ZKOOtGtv+LfOpOBMPFk4Z+1qATTqN +NkomGt5fBXT/zpQ+gElJ5QXJcCWxkUTRPkG+/W/22B5nvqxOrfKLhCLn/ZM/Y5fc +8npzhvnpveZYD4YK0wO8/33nHmp/FvI3OOClm1pbUg== +=eid0 -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.90-r1.ebuild similarity index 97% rename from app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild rename to app-editors/emacs-vcs/emacs-vcs-24.4.90-r1.ebuild index 4864007bb88a..797e1d401e99 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.4.90-r1.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-editors/emacs-vcs/emacs-vcs-24.4.90.ebuild,v 1.1 2015/02/17 16:42:14 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.90-r1.ebuild,v 1.1 2015/02/21 13:34:10 ulm Exp $ EAPI=5 @@ -14,7 +14,8 @@ if [[ ${PV##*.} = 9999 ]]; then S="${EGIT_CHECKOUT_DIR}" else SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz - mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" + mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz + http://dev.gentoo.org/~ulm/emacs/emacs-24.4-patches-4.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move @@ -33,7 +34,7 @@ REQUIRED_USE="?? ( aqua X )" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] + >=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -109,13 +110,14 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi + epatch "${WORKDIR}"/patch/04_all_games-sgid.patch epatch_user # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ || die "unable to sed ctags.1" - #AT_M4DIR=m4 eautoreconf + AT_M4DIR=m4 eautoreconf } src_configure() { @@ -206,7 +208,7 @@ src_configure() { --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --localstatedir="${EPREFIX}"/var \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser="${GAMES_USER_DED:-games}" \ + --with-gameuser=":gamestat" \ --without-compress-install \ --with-file-notification=$(usev gfile || usev inotify || echo no) \ $(use_enable acl) \ -- 2.26.2