New snapshot.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 42 insertions, 89 deletions

diff --git a/lxde-base/lxpolkit/ChangeLog b/lxde-base/lxpolkit/ChangeLog
index 2e9b83c0bebd..dfb43ad6c431 100644
--- a/lxde-base/lxpolkit/ChangeLog
+++ b/lxde-base/lxpolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxde-base/lxpolkit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpolkit/ChangeLog,v 1.3 2011/01/26 12:53:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpolkit/ChangeLog,v 1.4 2011/03/29 10:12:07 ssuominen Exp $
+
+*lxpolkit-0_p20110329 (29 Mar 2011)
+
+  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +lxpolkit-0_p20110329.ebuild:
+  New snapshot.
 
   26 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
   lxpolkit-0_p20110122.ebuild:
diff --git a/lxde-base/lxpolkit/lxpolkit-0_p20101225.ebuild b/lxde-base/lxpolkit/lxpolkit-0_p20101225.ebuild
deleted file mode 100644
index aff20526db27..000000000000
--- a/lxde-base/lxpolkit/lxpolkit-0_p20101225.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpolkit/lxpolkit-0_p20101225.ebuild,v 1.2 2011/01/24 17:56:58 ssuominen Exp $
-
-EAPI=3
-inherit autotools
-
-DESCRIPTION="A simple PolicyKit authentication agent"
-HOMEPAGE="http://blog.lxde.org/?p=674"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=lxde-base/menu-cache-0.3.2
-	>=sys-auth/polkit-0.99
-	>=x11-libs/gtk+-2.12:2
-	!gnome-extra/polkit-gnome"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40.0
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# NotShowIn=KDE; because they have polkit-kde, but this
-	# is exchangeable with polkit-gnome. The blocker is valid,
-	# and it's other packages that need || ( ) deps.
-	sed -i -e '/ShowIn/d' data/lxpolkit.desktop.in.in || die
-	echo 'NotShowIn=KDE;' >> data/lxpolkit.desktop.in.in
-
-	intltoolize --force --copy --automake
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/lxde-base/lxpolkit/lxpolkit-0_p20110122.ebuild b/lxde-base/lxpolkit/lxpolkit-0_p20110122.ebuild
deleted file mode 100644
index 157d595fea1d..000000000000
--- a/lxde-base/lxpolkit/lxpolkit-0_p20110122.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpolkit/lxpolkit-0_p20110122.ebuild,v 1.3 2011/01/26 12:53:16 hwoarang Exp $
-
-EAPI=3
-inherit autotools
-
-DESCRIPTION="A simple PolicyKit authentication agent"
-HOMEPAGE="http://blog.lxde.org/?p=674"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=lxde-base/menu-cache-0.3.2
-	>=sys-auth/polkit-0.99
-	>=x11-libs/gtk+-2.12:2
-	!gnome-extra/polkit-gnome"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40.0
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	# NotShowIn=KDE; because they have polkit-kde, but this
-	# is exchangeable with polkit-gnome. The blocker is valid,
-	# and it's other packages that need || ( ) deps.
-	sed -i -e '/ShowIn/d' data/lxpolkit.desktop.in.in || die
-	echo 'NotShowIn=KDE;' >> data/lxpolkit.desktop.in.in
-
-	# Fix tests. Bug #352716
-	for i in lxpolkit.desktop.in lxpolkit.ui; do
-		echo "data/${i}" >> po/POTFILES.in
-	done
-	intltoolize --force --copy --automake
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/lxde-base/lxpolkit/lxpolkit-0_p20110329.ebuild b/lxde-base/lxpolkit/lxpolkit-0_p20110329.ebuild
new file mode 100644
index 000000000000..7c9f982cec07
--- /dev/null
+++ b/lxde-base/lxpolkit/lxpolkit-0_p20110329.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpolkit/lxpolkit-0_p20110329.ebuild,v 1.1 2011/03/29 10:12:07 ssuominen Exp $
+
+EAPI=4
+inherit autotools
+
+DESCRIPTION="A simple PolicyKit authentication agent"
+HOMEPAGE="http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxpolkit;a=summary"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-auth/polkit-0.99-r1
+	>=x11-libs/gtk+-2.12:2
+	!gnome-extra/polkit-gnome"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.0
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -i -e 's:GNOME;::' data/lxpolkit.desktop.in.in || die
+
+	local x
+	for x in lxpolkit.desktop.in ui/lxpolkit.ui; do #352716
+		echo data/${x} >> po/POTFILES.skip
+	done
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+}