commit:     425dfe21981db3b4ab34819dcffcea410f03095c
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 13:15:22 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat May 21 13:15:22 2016 +0000
URL:        https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=425dfe21

suspend: cleanup

- remove snapshot version, which is in the tree now;
- sync live version with in-tree snapshot version;

 sys-power/suspend/ChangeLog                    | 140 -------------------------
 sys-power/suspend/Manifest                     |   6 --
 sys-power/suspend/metadata.xml                 |   6 +-
 sys-power/suspend/suspend-1.0_p20150810.ebuild |  58 ----------
 sys-power/suspend/suspend-9999.ebuild          |   6 +-
 5 files changed, 8 insertions(+), 208 deletions(-)

diff --git a/sys-power/suspend/ChangeLog b/sys-power/suspend/ChangeLog
deleted file mode 100644
index 985a1c2..0000000
--- a/sys-power/suspend/ChangeLog
+++ /dev/null
@@ -1,140 +0,0 @@
-# ChangeLog for sys-power/suspend
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.29 
2015/04/29 19:35:35 mrueg Exp $
-
-  09 Aug 2015; Andrew Savchenko <[email protected]> suspend-9999.ebuild:
-  Sync with tree. Fix bug 556954.
-
-*suspend-1.0_p20150622 (25 Jun 2015)
-
-  25 Jun 2015; Andrew Savchenko <[email protected]>
-  +suspend-1.0_p20150622.ebuild:
-  Add snapshot version
-
-  25 Jun 2015; Andrew Savchenko <[email protected]> suspend-9999.ebuild:
-  Add perl build-time dependency.
-
-  29 Apr 2015; Manuel Rüger <[email protected]>
-  -files/suspend-overflow-gentoo.patch, -suspend-0.8-r1.ebuild:
-  Remove old.
-
-  01 Mar 2014; Michał Górny <[email protected]> suspend-0.8-r1.ebuild,
-  suspend-1.0.ebuild:
-  Update libgcrypt dep to use slot :0.
-
-  16 Jan 2014; Michael Weber <[email protected]> suspend-0.8-r1.ebuild,
-  suspend-1.0.ebuild:
-  needs old libgcrypt (bug 494638)
-
-  11 May 2013; Agostino Sarubbo <[email protected]> suspend-1.0.ebuild:
-  Stable for x86, wrt bug #469386
-
-  11 May 2013; Agostino Sarubbo <[email protected]> suspend-1.0.ebuild:
-  Stable for amd64, wrt bug #469386
-
-  30 Apr 2013; Michael Weber <[email protected]>
-  +files/suspend-1.0-automake-1.13.patch, suspend-1.0.ebuild:
-  Fix automake-1.13, thanks F. Delente, bug 467950.
-
-  22 May 2012; Michael Weber <[email protected]> suspend-1.0.ebuild,
-  +files/suspend-1.0-bzip2.patch:
-  Fix freetype[bzip2] link problem (bug 416955, thanks tokiclover)
-
-  04 May 2012; Jeff Horelick <[email protected]> suspend-0.8-r1.ebuild,
-  suspend-1.0.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  15 May 2011; Michael Weber <[email protected]> -suspend-0.8.ebuild:
-  Removed old version
-
-  15 May 2011; Michael Weber <[email protected]> suspend-0.8-r1.ebuild,
-  -suspend-0.9_pre0.ebuild, -files/suspend-0.9_pre0-errno.patch,
-  suspend-1.0.ebuild, +files/suspend-1.0-errno.patch:
-  Removed old versions, reviewed -1.0.ebuild, added USE=static-libs to
-  dev-libs/lzo, dev-libs/libgcrypt and dev-libs/libgpg-error (edit on stable
-  version, thanks to IAN DELANEY, bug 366807)
-
-*suspend-1.0 (05 May 2011)
-
-  05 May 2011; Michael Weber <[email protected]> +suspend-1.0.ebuild:
-  Version bump, thanks to Aleksey Kunitskiy for the hint (bug 365327)
-
-  14 Feb 2011; Sebastian Pipping <[email protected]> suspend-0.9_pre0.ebuild:
-  For USE=crypt depend on dev-libs/libgcrypt[static-libs] and
-  dev-libs/libgpg-error[static-libs]. Compile errors reported by K. Posern.
-
-  31 Dec 2010; Michael Weber <[email protected]> suspend-0.9_pre0.ebuild:
-  Add use-dep on dev-libs/lzo[static-libs] (thanks to alexxy and Stefan Botz
-  <[email protected]> on bug 348453)
-
-  04 Oct 2010; Michael Weber <[email protected]> suspend-0.9_pre0.ebuild,
-  +files/suspend-0.9_pre0-errno.patch:
-  Add errno.patch by Ole Craig <[email protected]> on bug #339759,
-  thank you.
-
-*suspend-0.9_pre0 (03 Oct 2010)
-
-  03 Oct 2010; Michael Weber <[email protected]> +suspend-0.9_pre0.ebuild:
-  Version bump to git tag, thanks to Kevin Pyle on bug 339521
-
-  24 Jun 2010; Pacho Ramos <[email protected]> suspend-0.8-r1.ebuild:
-  stable amd64, bug 322491
-
-  16 Jun 2010; Christian Faulhammer <[email protected]> suspend-0.8-r1.ebuild:
-  stable x86, bug 322491
-
-*suspend-0.8-r1 (10 May 2009)
-
-  10 May 2009; Daniel Black <[email protected]>
-  +files/suspend-overflow-gentoo.patch, suspend-0.8.ebuild:
-  add amd64 fix as per bug #238511 thanks ferret. add crypt support in 0.8-r1.
-  remove amd64 for version =0.8.
-
-  16 Aug 2008; Doug Goldstein <[email protected]> metadata.xml:
-  add GLEP 56 USE flag desc from use.local.desc
-
-  28 May 2008; Christian Heim <[email protected]> metadata.xml:
-  Removing Alon Bar-Lev (alonbl) from metadata.xml (as per #147110). Assigning
-  to maintainer-needed.
-
-  01 Jan 2008; Alon Bar-Lev <[email protected]> suspend-0.8.ebuild:
-  Add prepalldocs
-
-*suspend-0.8 (01 Jan 2008)
-
-  01 Jan 2008; Alon Bar-Lev <[email protected]> +suspend-0.8.ebuild,
-  -suspend-0.9_pre20071208.ebuild:
-  Sync with upstream, not that it released all our work! The release is 0.8,
-  this is correct, sorry for the downgrade
-
-*suspend-0.9_pre20071208 (08 Dec 2007)
-
-  08 Dec 2007; Alon Bar-Lev <[email protected]>
-  -suspend-0.9_pre20071109.ebuild, +suspend-0.9_pre20071208.ebuild:
-  New snapshot
-
-  10 Nov 2007; Samuli Suominen <[email protected]>
-  suspend-0.9_pre20071109.ebuild:
-  Keyword ~amd64 wrt #197687.
-
-*suspend-0.9_pre20071109 (09 Nov 2007)
-
-  09 Nov 2007; Alon Bar-Lev <[email protected]>
-  -suspend-0.9_pre20071001.ebuild, +suspend-0.9_pre20071109.ebuild:
-  Version bump
-
-*suspend-0.9_pre20071001 (01 Oct 2007)
-
-  01 Oct 2007; Alon Bar-Lev <[email protected]> metadata.xml,
-  -suspend-0.9_pre20070917.ebuild, +suspend-0.9_pre20071001.ebuild:
-  Fix bug#194323 thanks to Jan Kundrát, resync with upstream
-
-  18 Sep 2007; Alon Bar-Lev <[email protected]>
-  suspend-0.9_pre20070917.ebuild:
-  Modify URI
-
-*suspend-0.9_pre20070917 (17 Sep 2007)
-
-  17 Sep 2007; Alon Bar-Lev <[email protected]> +metadata.xml,
-  +suspend-0.9_pre20070917.ebuild:
-  Initial add, bug#156431

diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
deleted file mode 100644
index 9c2f222..0000000
--- a/sys-power/suspend/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST suspend-1.0_p20120915.tar.xz 111080 SHA256 
4fa7551ec5ce3ed5d7412ad14e01f5fbac3a541db9d94ad6adf20b87d9c32eca SHA512 
bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be
 WHIRLPOOL 
6f5ea4a17572bc1e30d70258a0439b40a29ea67f0251cecec81bdd3dee92e7801645c37dbb868b0f498c093193bd574f361dc015810965c09f53d75cfb391e7f
-DIST suspend-1.0_p20150810.patch.xz 6172 SHA256 
5a07235c805dd3bb043ccc5ec1c18a3ca195912ea05fd3c007845825ebe3ed78 SHA512 
cb186bdb0619ed4852e2ba12d6048f26fa23c7556d7c95713f14a4258fbb014bbec2281edee6478ebf5916600b674d47d8ba53e7644391de933b03e9fd1b96e9
 WHIRLPOOL 
b1d9ba65f02ed4b507a586b5df71b897c147599db51905285cf55037e7c316f0392df432c81c99660abd7616dd60a816c4c2234bac3745eda84f6499cff7bdf4
-EBUILD suspend-1.0_p20150810.ebuild 1403 SHA256 
48cd5d3445f94cb6cd40ecfe8df9dfd76c2d4757e96506738750bef0d936833d SHA512 
7da33186850915069bec405fc1601cd2122a7e17b9004f2e071545b7548492bd5c2c662bc47824cff146dcc826ddc188ad3777fece9315bc3becafa398983ba8
 WHIRLPOOL 
ee98d74a43cf5c0796851867252339e83ea7e38dfd0533070f39ff1076d0f8cf54fb12615028a2fab07cbdf53a1cf18a7f88a6278e4dab7298a17e1f7ed3b154
-EBUILD suspend-9999.ebuild 1216 SHA256 
634314f53db92d2f8af5ff69bc9c36509f6830ee5b190b62a5ddabdf5cb308b1 SHA512 
afc850bf64dcd61bc294d24afb363615666024fc075e34f7a78b7e87966d1d960dba309cec098b47a21a51ab06b445fa4196ef85dfba41c9a5ff5965ea7f8d17
 WHIRLPOOL 
0674d15b71e5cf6138f2e6117646c526739e5dd574932eeea27ed5da6ee45be6065f004318b0df7a13948cfe9fe1570f2211a5c4ee4377c3f5aa0aecff21fedc
-MISC ChangeLog 5070 SHA256 
d55c84288bf4d3e9fec82b8b5fa84db4666eadf6249605735ba951e4f70b6a9c SHA512 
6a45a0ff4dbfba04e2fc9e0186c2d80ad0323612f3ee7f5e16246913d340cb9787e39154954dc1dc45efd6b8660f5960f9bf7741bcc8e85ce82aa4ec966d65cb
 WHIRLPOOL 
50f2c451ade13219df5f7c40603f1f5c8d6cdf1da20aa42ca4a70f9c119d00086d90c704b76b9fa6116ee5ca74cc580d6f5764a70b48423998346f34832c91b1
-MISC metadata.xml 461 SHA256 
9a633660373b250a0c2633df4c4d5439552549885bbbb335a9b113cbf74a997e SHA512 
72562dca1980eb0f3cca95f5fd2b7d963fcb1ed20b3a8f7ff940b4508ea8e0da3c9ae700936778ca5f9cca02c902d159f9535f9c4bee907f11b1217090141ca6
 WHIRLPOOL 
f97a9f3d85f1e996be58f0e2b46d32b2007b4270ae4f8d2e97ffd1553a417d7234f8b499bdda16f258771804a6917f0d44c2badcb282fad1db7d4f6c815ea85a

diff --git a/sys-power/suspend/metadata.xml b/sys-power/suspend/metadata.xml
index e40e74c..959bb49 100644
--- a/sys-power/suspend/metadata.xml
+++ b/sys-power/suspend/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer>
+       <maintainer type="person">
                <email>[email protected]</email>
                <name>Michael Weber</name>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Andrew Savchenko</name>
+       </maintainer>
        <use>
                <flag name="fbsplash">Add support for framebuffer splash</flag>
                <flag name="crypt">Allows suspend and resume from encrypted 
disk</flag>

diff --git a/sys-power/suspend/suspend-1.0_p20150810.ebuild 
b/sys-power/suspend/suspend-1.0_p20150810.ebuild
deleted file mode 100644
index a02f51c..0000000
--- a/sys-power/suspend/suspend-1.0_p20150810.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0_p20150622.ebuild,v 1.1 
2015/08/06 21:53:54 xmw Exp $
-
-EAPI=5
-
-inherit autotools eutils
-
-BASE_PV="1.0_p20120915"
-
-DESCRIPTION="Userspace Software Suspend and S2Ram"
-HOMEPAGE="http://suspend.sourceforge.net/";
-SRC_URI="http://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz
-       http://dev.gentoo.org/~bircoph/patches/${P}.patch.xz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt fbsplash +lzo threads"
-
-RDEPEND="
-       dev-libs/libx86
-       crypt? (
-               >=dev-libs/libgcrypt-1.6.3:0[static-libs]
-               dev-libs/libgpg-error[static-libs] )
-       fbsplash? ( >=media-gfx/splashutils-1.5.4.4-r6 )
-       lzo? ( >=dev-libs/lzo-2[static-libs] ) "
-DEPEND="${RDEPEND}
-       >=dev-lang/perl-5.10
-       >=sys-apps/pciutils-2.2.4
-       virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-       epatch "${WORKDIR}/${P}.patch"
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --docdir="/usr/share/doc/${PF}" \
-               $(use_enable crypt encrypt) \
-               $(use_enable fbsplash) \
-               $(use_enable lzo compress) \
-               $(use_enable threads)
-}
-
-src_install() {
-       dodir etc
-       emake DESTDIR="${D}" install
-       rm "${D}/usr/share/doc/${PF}"/COPYING* || die
-}
-
-pkg_postinst() {
-       elog "In order to make this package work with genkernel see:"
-       elog "http://bugs.gentoo.org/show_bug.cgi?id=156445";
-}

diff --git a/sys-power/suspend/suspend-9999.ebuild 
b/sys-power/suspend/suspend-9999.ebuild
index cb8e97d..42d806a 100644
--- a/sys-power/suspend/suspend-9999.ebuild
+++ b/sys-power/suspend/suspend-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0.ebuild,v 1.9 
2014/03/01 22:15:50 mgorny Exp $
+# $Id$
 
 EAPI=5
 
@@ -47,5 +47,5 @@ src_install() {
 
 pkg_postinst() {
        elog "In order to make this package work with genkernel see:"
-       elog "http://bugs.gentoo.org/show_bug.cgi?id=156445";
+       elog "https://bugs.gentoo.org/show_bug.cgi?id=156445";
 }

Reply via email to