From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 4 Apr 2010 16:10:25 +0000 (+0000)
Subject: Version bump per bug #311059.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e98da93140617856f799d0e3884c7ddcce2ca1e6;p=gentoo.git

Version bump per bug #311059.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 82d0c9f2dcee..f4efd30a1b0b 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/pm-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.29 2010/01/24 21:49:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.30 2010/04/04 16:10:25 scarabeus Exp $
+
+*pm-utils-1.3.0 (04 Apr 2010)
+
+  04 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.3.0-fix_autotools.patch, +pm-utils-1.3.0.ebuild, metadata.xml:
+  Version bump per bug #311059.
 
 *pm-utils-1.2.6.1 (24 Jan 2010)
 
diff --git a/sys-power/pm-utils/files/1.3.0-fix_autotools.patch b/sys-power/pm-utils/files/1.3.0-fix_autotools.patch
new file mode 100644
index 000000000000..389831b46ff4
--- /dev/null
+++ b/sys-power/pm-utils/files/1.3.0-fix_autotools.patch
@@ -0,0 +1,52 @@
+diff -urN pm-utils-1.3.0.old//configure.ac pm-utils-1.3.0/configure.ac
+--- pm-utils-1.3.0.old//configure.ac	2010-03-15 04:44:45.000000000 +0100
++++ pm-utils-1.3.0/configure.ac	2010-04-04 17:00:13.000000000 +0200
+@@ -8,28 +8,28 @@
+ AC_PROG_LN_S
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl - Extra verbose warning switches
+-dnl ---------------------------------------------------------------------------
+-CPPFLAGS="$CPPFLAGS -Wall -Werror"
+-
+-dnl ---------------------------------------------------------------------------
+-dnl - Debugging switches
+-dnl ---------------------------------------------------------------------------
+-CPPFLAGS="$CPPFLAGS -g"
+-
+-dnl ---------------------------------------------------------------------------
+ dnl - Manual page build
+ dnl ---------------------------------------------------------------------------
+-AC_PATH_PROG(XMLTO, xmlto, no)
+-AM_CONDITIONAL(HAVE_XMLTO, [test "x$XMLTO" != xno])
+-
+-dnl ---------------------------------------------------------------------------
+-dnl - Make paths available for source files
+-dnl ---------------------------------------------------------------------------
+-AC_SUBST(SYSCONFDIR, $sysconfdir)
+-AC_SUBST(DATADIR, $datadir)
+-AC_SUBST(BINDIR, $bindir)
+-AC_SUBST(SBINDIR, $sbindir)
++AC_ARG_ENABLE([doc],
++	AC_HELP_STRING([--disable-docs],
++		[Disable manpage generating via xmlto [[default=auto]]]),
++	[MAN="$enableval"],
++	[MAN=auto])
++	AC_PATH_PROG(XMLTO, xmlto, no)
++	AS_IF([test "x$MAN" = "xyes"],
++	[
++		AS_IF([test "x$XMLTO" != "xyes"],
++			[AC_MSG_ERROR([Manpage generating requested but xmlto not found.])
++		])
++	],
++	[test "x${MAN}" != "xno"],
++	[
++		AS_IF([test "x$XMLTO" = "xyes"],
++			[MAN="yes"],
++			[MAN="no"])
++	])
++AM_CONDITIONAL(HAVE_XMLTO, [test "x$MAN" != xno])
++AC_MSG_RESULT([checking whether to build manpages... $MAN])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Makefiles, etc.
diff --git a/sys-power/pm-utils/metadata.xml b/sys-power/pm-utils/metadata.xml
index 03eb45f26251..4c187dcac966 100644
--- a/sys-power/pm-utils/metadata.xml
+++ b/sys-power/pm-utils/metadata.xml
@@ -6,4 +6,3 @@
 		<flag name='ntp'>install support for <pkg>net-misc/ntp</pkg></flag>
 	</use>
 </pkgmetadata>
-
diff --git a/sys-power/pm-utils/pm-utils-1.3.0.ebuild b/sys-power/pm-utils/pm-utils-1.3.0.ebuild
new file mode 100644
index 000000000000..7a67a123add0
--- /dev/null
+++ b/sys-power/pm-utils/pm-utils-1.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 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.3.0.ebuild,v 1.1 2010/04/04 16:10:25 scarabeus Exp $
+
+EAPI="2"
+
+inherit autotools base
+
+DESCRIPTION="Suspend and hibernation utilities 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 ~ppc64 ~x86"
+IUSE="alsa debug doc networkmanager ntp video_cards_intel video_cards_radeon"
+
+RDEPEND="
+	!sys-power/powermgmt-base
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.13
+	sys-power/pm-quirks
+	alsa? ( media-sound/alsa-utils )
+	networkmanager? ( net-misc/networkmanager )
+	ntp? ( net-misc/ntp )
+"
+DEPEND="doc? ( app-text/xmlto )"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-fix_autotools.patch"
+)
+
+src_prepare() {
+	local ignore="01grub"
+	use networkmanager || ignore+=" 55NetworkManager"
+	use ntp || ignore+=" 90clock"
+
+	use debug && echo 'PM_DEBUG="true"' > "${S}/gentoo"
+	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${S}/gentoo"
+
+	# write makefile patch
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc)
+}
+
+src_install() {
+	base_src_install
+
+	dodoc AUTHORS ChangeLog NEWS README* TODO || die "dodoc failed"
+
+	insinto /etc/pm/config.d/
+	doins "${S}/gentoo" || die "doins failed"
+}