bugfix

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

6 files changed, 22 insertions, 78 deletions

diff --git a/sys-power/suspend/ChangeLog b/sys-power/suspend/ChangeLog
index a124687366e9..b02441fdb3ad 100644
--- a/sys-power/suspend/ChangeLog
+++ b/sys-power/suspend/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/suspend
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.19 2011/05/05 21:42:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.20 2011/05/15 20:49:06 xmw Exp $
+
+  15 May 2011; Michael Weber <xmw@gentoo.org> 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)
 
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index 8264a0ce28be..75c638267964 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX suspend-0.9_pre0-errno.patch 240 RMD160 2ed4a26fad8b21fd88ed9710b0d70eacc259c673 SHA1 f902e7f8394596d19c9858044fd05b42a7366767 SHA256 88eae010830c90b4fe6f115c3d638df5751f0ffa1cab4342aa33031fe14e9c03
+AUX suspend-1.0-errno.patch 240 RMD160 2ed4a26fad8b21fd88ed9710b0d70eacc259c673 SHA1 f902e7f8394596d19c9858044fd05b42a7366767 SHA256 88eae010830c90b4fe6f115c3d638df5751f0ffa1cab4342aa33031fe14e9c03
 AUX suspend-overflow-gentoo.patch 1546 RMD160 998a9d59da92cac7410351c8f672e14e8317dfb6 SHA1 ad10780af2a772be738182f07139d57a8f4487b7 SHA256 7ca6a2c59947978cb55c2f6de115b38bed07b729c8dcfb9c191e1a43102846d9
 DIST suspend-0.8.tar.gz 414135 RMD160 cd481fdb5206c824bf8138be0061bf98c0410f76 SHA1 acc9fb8f85d35f3e12c8406be1e958fc67ece01c SHA256 a5ee1dcfeb05e9c2a63583d7518065d42dc83264144359a2456fd8b9c71e63ee
 DIST suspend-utils-1.0.tar.bz2 408451 RMD160 2eee4a2a3e987763663f98522ed142d9d1e58226 SHA1 49ac219b54780265c31e8263d00e2b7b525d0736 SHA256 0206ba6332860b6da57acc79cc0f8604150ef0835ff9633fd42d59d181a6c85d
-DIST suspend-utils-9a5329f.tar.bz2 736564 RMD160 a1adfd64fe12a5fef957165d4747b6d0b385fc2b SHA1 74900c710a5896a17f4fdc5fade2d11b407afcfb SHA256 10a50865fec04153e72314fdc7e516d616c331c75a9e55c7f635eded10caa3a3
-EBUILD suspend-0.8-r1.ebuild 1222 RMD160 632555694ca8f4371352c9508d8049c10bd6409f SHA1 5eeb3c5d493a6d50dec2ce7b8e7a6e5fca10998f SHA256 faa4d89daa08f50a6dca2b05bf68d4a692f8eb649a6b70e27e83ff8b874df821
+EBUILD suspend-0.8-r1.ebuild 1283 RMD160 8447cca51bfbe6337acb01e06aa9e7aba4256859 SHA1 fb05c9089e2d4f36072dfa80f1d9c50720c48b86 SHA256 d06c5a93847202a000bba9f920779c14541694852d15be10e2f651c60ec5688e
 EBUILD suspend-0.8.ebuild 1070 RMD160 050240368b64bd00e51e63745416692ee8f07b70 SHA1 90efeced9486247e7be4ec5cb82024588ac46e3d SHA256 4b33c335b3e01b440f8583de36fd21604fd2b97ae9db55d28434da87b633a9ba
-EBUILD suspend-0.9_pre0.ebuild 1526 RMD160 f9d714c8c60256e98a5c4f959f1e071463887a4b SHA1 a162ace02e58e58d2461797ad1277945dd4b9570 SHA256 f171bfbe7b9a1087856e62cfbadecf89f531f55fd31c5a9d5f437356fef3816d
-EBUILD suspend-1.0.ebuild 1443 RMD160 ae1854b7572de8a964546c76f0641a39b8d325b0 SHA1 a7f51eb47c74c9ae91ad0ed7b4e7444598e41e8a SHA256 09e5e42ae3a3821d1ce446e791822650f95a983be8faa342cb753dfa4fa57cf1
-MISC ChangeLog 3165 RMD160 320eca8d60c62e0c413694d3b80ef9ddda05ca11 SHA1 c79e0ad0e1d7aa5923b302219a07458e53772617 SHA256 5c8c11664184d93810af5a875c9bc8962c74d7e14895fd760f19a0e87c48f852
+EBUILD suspend-1.0.ebuild 1343 RMD160 80d0724dc0c9906f0ae1a4df2491200579f8031c SHA1 64a62f88c4ccfbef5de3f90d46ed1829d44db15c SHA256 33eaf7e746b748a34222e84f3e6bf429e8b14d47e6bf793ca6af7881b93ff1f5
+MISC ChangeLog 3548 RMD160 53a89f54cb56f819143856c631a238e13512cf73 SHA1 a534a65a504aeb7b9e65ed6955a87e34ef28fc24 SHA256 5c94278b5dd249c226be8e31d8466073fa3244fe0fda516ad1908ed561dc8ffa
 MISC metadata.xml 406 RMD160 8c35a3c782f02061dc136b525874955517140659 SHA1 3c1e286945de03fe280ad26aadd31a6dac4f1d84 SHA256 f685cede9e4e27a1a8920fbb903cbac1c87d2d64812e826d50f4a6a891aeab97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3DGeUACgkQknrdDGLu8JBF0AD9HyviB5Sa17HT/XEWPTTNnsDj
-vm/lG720TOGBThSHFpgA/jc8ZYs4zk4pkCbApwSMEGOMKfyllYhcdBTuWdhJ/V6o
-=CUbU
+iF4EAREIAAYFAk3QPEgACgkQknrdDGLu8JB0VQD+KlDI5bYaUN3TwZjjQhVtp7Kb
+PnTLSgV6l8fUCAa68h0BAItZVSqPLH9gsihj7wUAuGM1D0FsvEk0XR7UwtnMb761
+=/goy
 -----END PGP SIGNATURE-----
diff --git a/sys-power/suspend/files/suspend-0.9_pre0-errno.patch b/sys-power/suspend/files/suspend-1.0-errno.patch
index ea8a378a5abe..ea8a378a5abe 100644
--- a/sys-power/suspend/files/suspend-0.9_pre0-errno.patch
+++ b/sys-power/suspend/files/suspend-1.0-errno.patch
diff --git a/sys-power/suspend/suspend-0.8-r1.ebuild b/sys-power/suspend/suspend-0.8-r1.ebuild
index 41d416df16ce..3190b064f020 100644
--- a/sys-power/suspend/suspend-0.8-r1.ebuild
+++ b/sys-power/suspend/suspend-0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-0.8-r1.ebuild,v 1.5 2010/06/24 21:12:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-0.8-r1.ebuild,v 1.6 2011/05/15 20:49:06 xmw Exp $
 
 EAPI=2
 inherit eutils
@@ -18,9 +18,10 @@ X86_RDEPEND="dev-libs/libx86"
 X86_DEPEND="
 	${X86_RDEPEND}
 	>=sys-apps/pciutils-2.2.4"
-RDEPEND=">=dev-libs/lzo-2
+RDEPEND=">=dev-libs/lzo-2[static-libs]
 	fbsplash? ( >=media-gfx/splashutils-1.5.2 )
-	crypt? ( dev-libs/libgcrypt )
+	crypt? ( dev-libs/libgcrypt[static-libs]
+		dev-libs/libgpg-error[static-libs] )
 	x86? ( ${X86_RDEPEND} )
 	amd64? ( ${X86_RDEPEND} )"
 DEPEND="${RDEPEND}
diff --git a/sys-power/suspend/suspend-0.9_pre0.ebuild b/sys-power/suspend/suspend-0.9_pre0.ebuild
deleted file mode 100644
index 6485be64774d..000000000000
--- a/sys-power/suspend/suspend-0.9_pre0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-0.9_pre0.ebuild,v 1.4 2011/02/14 22:20:54 sping Exp $
-
-EAPI=2
-
-inherit autotools eutils
-
-# Name based on the git tag from which the tarball was created
-MY_GIT_SHORT_COMMIT=9a5329f
-MY_P=suspend-utils-${MY_GIT_SHORT_COMMIT}
-DESCRIPTION="Userspace Software Suspend and S2Ram"
-HOMEPAGE="http://suspend.sourceforge.net/"
-SRC_URI="http://xmw.de/mirror/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbsplash crypt"
-
-X86_RDEPEND="dev-libs/libx86"
-X86_DEPEND="
-	${X86_RDEPEND}
-	>=sys-apps/pciutils-2.2.4"
-RDEPEND=">=dev-libs/lzo-2[static-libs]
-	fbsplash? ( >=media-gfx/splashutils-1.5.2 )
-	crypt? ( dev-libs/libgcrypt[static-libs]
-		dev-libs/libgpg-error[static-libs] )
-	x86? ( ${X86_RDEPEND} )
-	amd64? ( ${X86_RDEPEND} )"
-DEPEND="${RDEPEND}
-	x86? ( ${X86_DEPEND} )
-	amd64? ( ${X86_DEPEND} )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}-errno.patch
-	sed -i -e "/AC_INIT/s/0\.8/0.9-${MY_GIT_SHORT_COMMIT}/" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-compress \
-		$(use_enable crypt encrypt) \
-		$(use_enable fbsplash) \
-		|| die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || 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-1.0.ebuild b/sys-power/suspend/suspend-1.0.ebuild
index 0feabba23ab3..fe7c20efc431 100644
--- a/sys-power/suspend/suspend-1.0.ebuild
+++ b/sys-power/suspend/suspend-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/05/05 21:42:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0.ebuild,v 1.2 2011/05/15 20:49:06 xmw Exp $
 
 EAPI=2
 
@@ -33,9 +33,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P/-/-utils-}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9_pre0-errno.patch
-	sed -i -e "/AC_INIT/s/0\.8/0.9-${MY_GIT_SHORT_COMMIT}/" configure.ac || die
-	eautoreconf
+	epatch "${FILESDIR}"/${P}-errno.patch
 }
 
 src_configure() {