Fix pkgconfig file, bug #254492. Fix generation of hook exception file, bug #253835. Kill pm-utils-0.99.4, bug #240720.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 76 insertions, 39 deletions

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 4e3a72e1ae55..8e859584c9d9 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.13 2009/01/15 22:10:20 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.14 2009/01/18 20:21:37 eva Exp $
+
+*pm-utils-1.2.3-r1 (18 Jan 2009)
+
+  18 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -pm-utils-0.99.4.ebuild, +pm-utils-1.2.3-r1.ebuild:
+  Fix pkgconfig file, bug #254492. Fix generation of hook exception file,
+  bug #253835. Kill pm-utils-0.99.4, bug #240720.
 
   15 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
   Compnerd retired.
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 25aa895c8019..960897ddd6f5 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -1,11 +1,19 @@
-DIST pm-utils-0.99.3-cfg.patch 304 RMD160 28e1a29b1afab02a407bc8440ab5d53268767bc7 SHA1 fb658d70c79b7810e86760e6fdc21df8aa6b9130 SHA256 e1e9b48377884f9a7e488a464bf9ab75598e70efa9feb82470c7bc4b37df762f
-DIST pm-utils-0.99.4.tar.gz 124846 RMD160 23c3d3c75ea579164881ccc80af365113bae6dfd SHA1 d8f462bceb026e72f51b2b427b24f2c863ec998a SHA256 ded1f641439b8dd12f2b96d82bebc10d91527d97f2d4b8d51a06c9da085ce491
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pm-utils-1.1.1.tar.gz 143103 RMD160 009cff3428d9c27b47fb874da4c06a12fd8f14d7 SHA1 8ba604f19ed997641573c179e1f06492ed3003d6 SHA256 63187cc7667026c0a798e10549825ed087a7759a5beead4b7db937c868cc3bad
 DIST pm-utils-1.1.2.1.tar.gz 158307 RMD160 8524ec9b668c679664a4b2bf6fe0364434529ae5 SHA1 f16b94aec360f98e783bce741c1343912674956e SHA256 5019dc87196e24c1cc054f3cbf88237d67b3f2d451fa9ae5831435f53e8c67dd
 DIST pm-utils-1.2.3.tar.gz 176568 RMD160 0294a6b59647665e55fea810fd38bd352577668d SHA1 ec513f3742d6fc78eec7115bd003af3c36ae931f SHA256 e098fce7db4999e390a7332abf31b23b95c11515e48c1ff1818b11bf6ac26d07
-EBUILD pm-utils-0.99.4.ebuild 985 RMD160 ef0424c969613c98a1fcb75d4b567dfad0cd8ce4 SHA1 c869fc359418fe4d638dfc6ebfa2e4a061f163bc SHA256 b2e423fe60ed5c09b7064f5be9cc5e3aabd31677dad500e8ca336cd4818eda84
 EBUILD pm-utils-1.1.1.ebuild 1445 RMD160 1a007bb54bef19665595e4e3bf08f519677d3c3f SHA1 f7d51e1fc2d03719db2e55f9c490640d482a5a5a SHA256 3ee21a1bdcce6c33e57fc9e569df1d438a2a3c6b1701db9df12f9395136bade3
 EBUILD pm-utils-1.1.2.1.ebuild 1464 RMD160 0c102b5e8cd319a54319ff564ad0cc6bdbc7d8b4 SHA1 9661d9a5860259f735856dd2efda4148f8e74018 SHA256 41eb63117a4216d4bfb2a20de7522de665ebd34f6fe463253e33f8ae666df546
+EBUILD pm-utils-1.2.3-r1.ebuild 1571 RMD160 1fa1a7d9e47acef133991af2c6b50a02e7e3c0f6 SHA1 e03861054fa2e8417ca5a6881014a0192f12f366 SHA256 d8a914dd67972266ebce932a46b1c1bb34696ecc17b6946d10683b2250e4362f
 EBUILD pm-utils-1.2.3.ebuild 1412 RMD160 e22f91a2b34c4a50f372c1e95242362389e37e0c SHA1 f7d8d7a9fa9493c81a14a2b963a0d531f357e27e SHA256 53433db427d9159380317fb4a9ff107a80eef84d808962862b47103117537d8c
-MISC ChangeLog 1964 RMD160 d7277b8274a744872f91a378830d16539ae6594b SHA1 48479beaf6bcd58dbdbfac526cbc60e00089f575 SHA256 03a9edd0353c70116bfe99190535bb36fa9af51531fc77ecc435fb94bce27c0e
+MISC ChangeLog 2226 RMD160 b5bfbbb940d298f479a5f8b1d763de2c27624b1e SHA1 2ce9b1c6450d8d40c3e776ff502bffa523a3bfd3 SHA256 d67ce03a8be894423df3ff78dee177459566c2fe25e4576b4bde8eb560d2f315
 MISC metadata.xml 251 RMD160 41781b66e083e1e4c11e135fe44eb40da50f15d6 SHA1 b61dc16b3f4c1ee71546729e1fd3c09f2b8ce153 SHA256 d0d5a53d56e26d590db0a3ca7280afbcca426b8f57f47477631a230d9e1f2125
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklzj1YACgkQ1fmVwcYIWAZFcwCgvbdOkfmhjfElRt9GU6j08zTP
+0pUAoOo9/tFruThSuZQ0gAR/mttqIrDd
+=FVz8
+-----END PGP SIGNATURE-----
diff --git a/sys-power/pm-utils/pm-utils-0.99.4.ebuild b/sys-power/pm-utils/pm-utils-0.99.4.ebuild
deleted file mode 100644
index 6789f91147e9..000000000000
--- a/sys-power/pm-utils/pm-utils-0.99.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-0.99.4.ebuild,v 1.4 2008/07/28 14:09:30 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Suspend and hibernation utilties for HAL"
-HOMEPAGE="http://pm-utils.freedesktop.org/ http://people.freedesktop.org/~hughsient/quirk/index.html"
-SRC_URI="http://cvs.fedoraproject.org/repo/pkgs/pm-utils/pm-utils-0.99.4.tar.gz/a88503876f63c96b55784be91b6458d2/pm-utils-0.99.4.tar.gz
-		 http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/pm-utils/pm-utils-0.99.3-cfg.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${DISTDIR}/pm-utils-0.99.3-cfg.patch"
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild b/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..823e19f9b0a8
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.2.3-r1.ebuild,v 1.1 2009/01/18 20:21:37 eva Exp $
+
+DESCRIPTION="Suspend and hibernation utilties for HAL"
+HOMEPAGE="http://pm-utils.freedesktop.org/"
+SRC_URI="http://pm-utils.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
+
+RDEPEND=">=sys-apps/hal-0.5.10
+		 >=sys-apps/dbus-1.0.0
+		 !sys-power/powermgmt-base
+		 >=sys-apps/util-linux-2.13
+		 alsa? ( media-sound/alsa-utils )
+		 networkmanager? ( net-misc/networkmanager )
+		 ntp? ( net-misc/ntp )
+		 !ppc? (
+			 !video_cards_intel? ( sys-apps/vbetool )
+			 video_cards_radeon? ( app-laptop/radeontool )
+		 )"
+DEPEND="!sys-power/powermgmt-base
+		app-text/xmlto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix pkg-config file, bug #254492
+	sed -e 's:${pm_libdir):${pm_libdir}:' -i pm-utils.pc.in || die "sed failed"
+
+	local ignore="01grub"
+	use networkmanager || ignore="${ignore} 55NetworkManager"
+	use ntp            || ignore="${ignore} 90clock"
+
+	touch "${S}/gentoo"
+	use debug && echo 'PM_DEBUG="true"' >> "${S}/gentoo"
+	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
+}
+
+src_compile() {
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
+
+	insinto /etc/pm/config.d/
+	doins "${S}/gentoo"
+}