Version bump. Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

5 files changed, 31 insertions, 167 deletions

diff --git a/app-emacs/popwin/ChangeLog b/app-emacs/popwin/ChangeLog
index 2173d179b392..046051866462 100644
--- a/app-emacs/popwin/ChangeLog
+++ b/app-emacs/popwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/popwin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/ChangeLog,v 1.5 2012/09/08 08:59:28 ulm Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/ChangeLog,v 1.6 2014/02/27 18:00:00 ulm Exp $
+
+*popwin-0.6.2 (27 Feb 2014)
+
+  27 Feb 2014; Ulrich Müller <ulm@gentoo.org> -popwin-0.3-r1.ebuild,
+  +popwin-0.6.2.ebuild, -files/popwin-0.3-emacs24.patch:
+  Version bump. Remove old.
 
 *popwin-0.5.1 (08 Sep 2012)
 
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
index dc3ac3aa4bc4..4bada39fa3e2 100644
--- a/app-emacs/popwin/Manifest
+++ b/app-emacs/popwin/Manifest
@@ -2,27 +2,23 @@
 Hash: SHA256
 
 AUX 50popwin-gentoo.el 336 SHA256 83b93e883091c14a5dacda9fad6352e2bf23377c52f498cb2e8acce21ac65bd8 SHA512 a9b72edf953d67a16aad44186d3f0f3deead224ce57342d73ba43abe15c0c2b170311380926d1195d98884b6e64fbeca23b74c3dd9a67b13015ec0b491861905 WHIRLPOOL 32195f8a12705ee4eb62a3e85db254949d190f14fbda06768950a41d6827689e65f1a9ef4561975b99078cc0c2b1e62b566be4fce043a98d6b7df3c1d58667b1
-AUX popwin-0.3-emacs24.patch 5227 SHA256 abc32a358a5ddd382635384a339677c8ae87b089b37246e1bf90aed540aebe57 SHA512 8dbba1e6a7303b52390142acd59e593ed2314dfe010911761f35562df045eb3618a38701c2aae4aa5ab40d57bf68c6b115824dd47aa19c29a77dfdd7b190f7ce WHIRLPOOL ae44536e09defa5fea76969239cd11c56bd081151e861b7ef3746cb865ad2b37f77c69e4c34dd23e3756b5346461e076ae4cb3c878cbffa8c3bacc2c3072e7b3
-DIST popwin-0.3.tar.gz 10394 SHA256 bdeea5f66cd8b0b842347ee1127fc18ec88eb7b6e1c2cc1eac7c8588bdcc50de SHA512 8e672788459406d50cd5d77810ffb5fff7dc0d8d305dc9564054424962931abec65204131561bc4b8a160f7fe05066f946d57949dc300189787f8ff471447558 WHIRLPOOL bfb6900594660af1f910bcc863d8e4b4ff26d6d86d52aa130f55aaca2fe9441740de6476021fb929bf095443c2d8e3df6257efdd4255ce7e36fe09b84b9d08cd
 DIST popwin-0.5.1.tar.gz 15700 SHA256 2f3033052d15538049b21c19b7a7114986599ab94a5234038b704e930956b474 SHA512 401dbcf1ee84014f24972facef4ccd9f2b80eb318e6bbdb3c51278d4fc86711b60a2d29a1c8d481ec01172b225981bccd7bcbd136c9c5a49e63bf03f617cbf16 WHIRLPOOL 81c6fe7aa01d3950abbb368a0a160bc00f6a5a8e455f462ffbfc42174ffcc5300b192ead80ed1be471426c4ea144845e4f7a8607ebe982c1d1e424818fea9bc8
-EBUILD popwin-0.3-r1.ebuild 635 SHA256 59679c17f8c023ad2711ce3b43a88fa0548d415b25731823eee6fa6bc3044b03 SHA512 c3fa24204b673d4bf5d97387277da2b738313a6c84d0cca53fe629a68c7c3754f320841d91e50ef2c712028ba644e9be2d05bfa242f49e90ee8b895900143be7 WHIRLPOOL 5bb3493be2268e20dd2b1c14aca86dc0fff3c7ff9a22e79417f3e05f3a71ff6e98c2280a8d6d0e7c90b033f685ef8959789454380e0ebdf2adaebefca44a15cb
-EBUILD popwin-0.5.1.ebuild 601 SHA256 04012761735ca0132d8f0c90652997168c922eac32df95eed2e057728928c618 SHA512 ddc32544014cd232396cc8c1734eeba1b6929daad915a7f1f9ff54b303d0f207bb87041cb779414dc444df0d71d9defb26168e40b73fb417fe22ade78ff388d6 WHIRLPOOL c63b593c3648af934990c9ffef4d7add68c0ac019c219b31a21f61868e6dfb2df3255eece7fe6772c0adfbbb42ca9feae5fc498a3affc5e50c81d75a3953eff6
-MISC ChangeLog 1017 SHA256 a4dba5b9ee736f859995619650bd641ca1b42d29f00b27a0e6bf58e7fbe64767 SHA512 3786f72a5f16a0e9b351223d4deec266e4bceacd7de1d593fdf08aa56e7e8433db48285e0bb55d568a1ac3d70a7436282e1abb25e8e1860b25a89a8857e3c612 WHIRLPOOL f2179ca3dc014c3fe120bd651031f47d79e21b673287f2f0e0a17668bba777ecf89713a4db244b14307cda071e33ca44b932769439b499da972e574853707c5e
+DIST popwin-0.6.2.tar.gz 16821 SHA256 77069e5c642ccee21788f462dc2bdc30ac4789d658585da950cf7097fa41d6e9 SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108 WHIRLPOOL 2739efa75f9e88296f28ab2df93990dac5630a4e6b3a7d094fed1b0ee23066c51f2ff42301cbefec9dff132ec2ddbdab2c532bd49b6f7e20903f382d9f4aa208
+EBUILD popwin-0.5.1.ebuild 594 SHA256 46914021381c537e5eb4b0aa7259f788a98579610df752543d8c9f18fbdc6525 SHA512 a968c2550caf33f6cce847e42a5ca77a2524dec33acdf86cfc87dc7baec7d260ad6ecdc04760f5eb581fe34607d139f147a2779b61dd900373c910017d5bdbb1 WHIRLPOOL 16cbc240aa6df19c8e922d095ca0f8a65b044ed0b3652ef099b54866795961ef60e4225f3ab6632ea4d6dab306164e87f0a297af22773fd2b1bcfb30a5281375
+EBUILD popwin-0.6.2.ebuild 593 SHA256 ed547ca84ed50088c2d5e5cc5ede7b22088349c702f6b6c5523dbeecafa38ea6 SHA512 ce9231aff63cfc8c19b9247f2e957206fb65d7d047a1ae4c8e383b3ff844e6c9dfcc39d053593cff3ab27ca9a41b3242a072e4866e74fae763c2592016c1f4a4 WHIRLPOOL 64e04b3a89930f4baaf362bbc7263df09ddacc704c0be862456bac6ec6c58c00f84fc95be04438a4ccf239bd92e7caa644b22d8398b6ab8f793e938a47160983
+MISC ChangeLog 1202 SHA256 dc86f198b43b7313d831cce42e1134cacd416cee623c39170734a2f1313c82d1 SHA512 32c3671b9754c2476e71047304c2ee22ad28d8fde086fe386c33a0e8a2e9a8c611c57536b1886d96b9af98eec2adfddd292f43db5d7e60785f43eb0443cc1415 WHIRLPOOL 706e9a1b9ebe731967585732f35ea23b5505e1275a67bbb1dc27e8a7f2c7f60a42ae48a02e244c58852988b48a1d0ed314f5bf4928aca53d6c2229521a9eac51
 MISC metadata.xml 219 SHA256 9761d87f8c96c0a11b7e70f79b5e9013081f5bda009290e02879c8501c3dc817 SHA512 8634b918c4ce98920deb8828c3bc6620b99eb56ecc3479590168360318c7ecabb20ad783cceeab125a3a82a160fdfd869c42466a441c01be7e9442ffe1921fb9 WHIRLPOOL 2546efecbe9b403121f61e5a13dc6ef9369ede4e3268fc9a9750edcf424cd50b6e2e2a96f0c16e535dae86d18f745effda718d282512e046a8f00bbbb7335c7b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQSwrYAAoJEDxpGckxwJCB3SwQAI9FCOEzWF9KR6hHy8wJtpUs
-rfCe+CAudcp1MZTLWT686lv/Fc2bRc1fUFO/RUV0sNZM1MhEJWhV2HkOSl1fqJuw
-yMhMrveK+rkwVCoqb71nPooQ2/YTCkIkmNKRkkNohBh4cbeiptL/PXUnebh+s87I
-OWABTtd1mNF4XNEgD4pCnzH5auOkorAVWLLp0pnPv9Jx0BnQZd+DLqIKY/agk+SQ
-mo93APOEbSdHUZTKuY6XTdej+dYL7eAL9Vxq/fhv//wyO91FeA99OxRLKJTxjnh1
-AH2SILbj+XlkdyFCKU/FCS4sGHJYt/oqStukvDPHOLZQah0FbUCCoXLWUMtX9m8s
-Pr8ElZB3HyMAiLTq37o8XeLEHC7+qdP1A9d6KpCYxCC7osLXiBezGYx3jDhjmFFS
-+31HC/ceh5zaF56XBcr48B4c4CZpVYiZ/ifSWErusohoFr1WoSVpWOE52wYloDTJ
-4yqCzDfOJj0h2ejIONf+4o7NxnH9g2Wibu/iu+lmpWXuLYtSz+U6DaPIG0V5rLnf
-l2/YNA4TcGnbdjiAAbesUmH0HPQjDvu7djwrSd/Xv8PeVevNb3vmejC7L6MmniLs
-wAK6rECxW8sbHbskqsusUVfMTAHGhc8zwsr54sxPPFI5srfUeeqVBCH0tAhcanDd
-6+ypa8aM3qVlpYTFQsD9
-=Ner6
+iQGcBAEBCAAGBQJTD36OAAoJEJQzkH1pP7W4FTIL/R1aSRdhXjB5YF6k5ez/3nQI
+ZhwGAxI4U8+82i62d3W0+sDQLXVnpIRYozRi/NrrtKA7gljEew5/kohQotp2gx6e
+RRqm8mCrtAqDU3e/pnI0oXiWOe0E7VYcvMxyKYo814ZXabP2f8AE5AQjxYrNlm/+
+j8hgL3P7FvK0LpldygnaYTF6/5WqZ2rPjBQsZ4zmpAKdFTegKngoUERpcF5OpGks
+Etj2fE0oOzcducxd4GhyPDu4RxEvA7Rc3BzADt41aiPrpy3REady0+oYa4DRfCGY
+5Ty9NxOg8izO5x/bCa4MopNsSXdCMxSPaYGHGTSgFiIGiUaj1WpFTHl/C+oyV4yp
+ot7ToTu2QFJ76pkKzLgyKyteIUgYZy9dm5G7819w4FWXj5taeqhWG3hbA58JQIFc
+xkzkmNfkBa1z8xBBcg6Yz8I5xyzBvJ82G4h/klk+pRv9gHsrtV6kt+ojvXS4hM1T
+TiwOJ9PIslG54iASEB2UJq5m7XKm7MgQzy+oSvgsrA==
+=OLJS
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/popwin/files/popwin-0.3-emacs24.patch b/app-emacs/popwin/files/popwin-0.3-emacs24.patch
deleted file mode 100644
index 0aa7cb2d8ca6..000000000000
--- a/app-emacs/popwin/files/popwin-0.3-emacs24.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/popwin.el b/popwin.el
-index 22f64f0..a5bafeb 100644
---- a/popwin.el
-+++ b/popwin.el
-@@ -4,7 +4,7 @@
- 
- ;; Author: Tomohiro Matsuyama <tomo@cx4a.org>
- ;; Keywords: convenience
--;; Version: 0.3
-+;; Version: 0.4
- 
- ;; This program is free software; you can redistribute it and/or modify
- ;; it under the terms of the GNU General Public License as published by
-@@ -69,7 +69,19 @@
- 
- 
- 
--;;; Common API
-+;;; Common
-+
-+(defmacro popwin:save-selected-window (&rest body)
-+  "Evaluate BODY saving the selected window."
-+  `(with-selected-window (selected-window) ,@body))
-+
-+(defun popwin:switch-to-buffer (buffer-or-name &optional norecord)
-+  "Call `switch-to-buffer' forcing BUFFER-OF-NAME be displayed in
-+the selected window."
-+  (with-no-warnings 
-+    (if (>= emacs-major-version 24)
-+        (switch-to-buffer buffer-or-name norecord t)
-+      (switch-to-buffer buffer-or-name norecord))))
- 
- (defun popwin:last-selected-window ()
-   "Return currently selected window or lastly selected window if
-@@ -82,6 +94,12 @@ minibuffer window is selected."
-   "Return t if BUFFER might be thought of as a buried buffer."
-   (eq (car (last (buffer-list))) buffer))
- 
-+(defun popwin:called-interactively-p ()
-+  (with-no-warnings
-+    (if (>= emacs-major-version 23)
-+        (called-interactively-p 'any)
-+      (called-interactively-p))))
-+
- (defvar popwin:empty-buffer nil
-   "Marker buffer of indicating a window of the buffer is being a
- popup window.")
-@@ -142,7 +160,7 @@ horizontal factor HFACTOR, and vertical factor VFACTOR."
-           (cdr node)
-         (popwin:adjust-window-edges window edges hfactor vfactor)
-         (with-selected-window window
--          (switch-to-buffer buffer t))
-+          (popwin:switch-to-buffer buffer t))
-         (when selected
-           (select-window window)))
-     (destructuring-bind (dir edges . windows) node
-@@ -221,7 +239,8 @@ window-configuration."
-          (root-win (popwin:last-selected-window))
-          (hfactor 1)
-          (vfactor 1))
--    (delete-other-windows root-win)
-+    (popwin:save-selected-window
-+     (delete-other-windows root-win))
-     (let ((root-width (window-width root-win))
-           (root-height (window-height root-win)))
-       (when adjust
-@@ -238,7 +257,7 @@ window-configuration."
-           (popwin:create-popup-window-1 root-win size position)
-         ;; Mark popup-win being a popup window.
-         (with-selected-window popup-win
--          (switch-to-buffer (popwin:empty-buffer) t))
-+          (popwin:switch-to-buffer (popwin:empty-buffer) t))
-         (popwin:replicate-window-config master-win root hfactor vfactor)
-         (list master-win popup-win)))))
- 
-@@ -410,7 +429,7 @@ BUFFER."
-               popwin:selected-window (selected-window))
-         (popwin:start-close-popup-window-timer))))
-   (with-selected-window popwin:popup-window
--    (switch-to-buffer buffer))
-+    (popwin:switch-to-buffer buffer))
-   (setq popwin:popup-buffer buffer
-         popwin:popup-window-stuck-p stick)
-   (if noselect
-@@ -438,6 +457,10 @@ be closed by `popwin:close-popup-window'."
- 
- ;;; Special Display
- 
-+(defmacro popwin:without-special-display (&rest body)
-+  "Evaluate BODY without special displaying."
-+  `(let (display-buffer-function special-display-function) ,@body))
-+
- (defcustom popwin:special-display-config
-   '(("*Help*")
-     ("*Completions*" :noselect t)
-@@ -481,13 +504,19 @@ buffers will be shown at the left of the frame with width 80."
- 
- (defun popwin:original-display-buffer (buffer &optional not-this-window)
-   "Call `display-buffer' for BUFFER without special displaying."
--  (let (display-buffer-function special-display-function)
--    ;; Close the popup window here so that the popup window won't to
--    ;; be splitted.
--    (when (and (eq (selected-window) popwin:popup-window)
--               (not (same-window-p (buffer-name buffer))))
--      (popwin:close-popup-window))
--    (display-buffer buffer not-this-window)))
-+  (popwin:without-special-display
-+   ;; Close the popup window here so that the popup window won't to
-+   ;; be splitted.
-+   (when (and (eq (selected-window) popwin:popup-window)
-+              (not (same-window-p (buffer-name buffer))))
-+     (popwin:close-popup-window))
-+   (if (and (>= emacs-major-version 24)
-+            (boundp 'action)
-+            (boundp 'frame))
-+       ;; Use variables ACTION and FRAME which are formal parameters
-+       ;; of DISPLAY-BUFFER.
-+       (display-buffer buffer action frame)
-+     (display-buffer buffer not-this-window))))
- 
- (defun* popwin:display-buffer-1 (buffer-or-name &key default-config-keywords if-buffer-not-found if-config-not-found)
-   "Display BUFFER-OR-NAME, if possible, in a popup
-@@ -548,9 +577,9 @@ usual. This function can be used as a value of
-   (popwin:display-buffer-1
-    buffer-or-name
-    :if-config-not-found
--   (unless (interactive-p)
--     (lambda (buffer-or-name)
--       (popwin:original-display-buffer buffer-or-name not-this-window)))))
-+   (unless (popwin:called-interactively-p)
-+     (lambda (buffer)
-+       (popwin:original-display-buffer buffer not-this-window)))))
- 
- (defun popwin:special-display-popup-window (buffer &rest ignore)
-   "The `special-display-function' with a popup window."
diff --git a/app-emacs/popwin/popwin-0.5.1.ebuild b/app-emacs/popwin/popwin-0.5.1.ebuild
index 81aa94f588eb..1c316095990c 100644
--- a/app-emacs/popwin/popwin-0.5.1.ebuild
+++ b/app-emacs/popwin/popwin-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.5.1.ebuild,v 1.1 2012/09/08 08:59:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.5.1.ebuild,v 1.2 2014/02/27 18:00:00 ulm Exp $
 
 EAPI=4
 NEED_EMACS=22
@@ -11,10 +11,9 @@ DESCRIPTION="Popup window manager for Emacs"
 HOMEPAGE="https://github.com/m2ym/popwin-el/"
 SRC_URI="https://github.com/m2ym/popwin-el/tarball/v${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md NEWS.md"
diff --git a/app-emacs/popwin/popwin-0.3-r1.ebuild b/app-emacs/popwin/popwin-0.6.2.ebuild
index 3df9bbd83744..640459c635df 100644
--- a/app-emacs/popwin/popwin-0.3-r1.ebuild
+++ b/app-emacs/popwin/popwin-0.6.2.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.3-r1.ebuild,v 1.2 2011/10/21 19:19:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/popwin/popwin-0.6.2.ebuild,v 1.1 2014/02/27 18:00:00 ulm Exp $
 
-EAPI=3
+EAPI=5
 NEED_EMACS=22
 
 inherit elisp eutils
 
 DESCRIPTION="Popup window manager for Emacs"
 HOMEPAGE="https://github.com/m2ym/popwin-el/"
-SRC_URI="https://github.com/m2ym/popwin-el/tarball/v${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/m2ym/${PN}-el/tarball/v${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.markdown"
-ELISP_PATCHES="${P}-emacs24.patch"
+DOCS="README.md NEWS.md"
 
 src_unpack() {
 	unpack ${A}