bugfix

(Portage version: 2.1.9.42/cvs/Linux x86_64)

5 files changed, 15 insertions, 69 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/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() {