Version bump

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

4 files changed, 25 insertions, 102 deletions

diff --git a/x11-misc/lightdm-gtk-greeter/ChangeLog b/x11-misc/lightdm-gtk-greeter/ChangeLog
index 103f188b6fbd..408ebc2eaff4 100644
--- a/x11-misc/lightdm-gtk-greeter/ChangeLog
+++ b/x11-misc/lightdm-gtk-greeter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/lightdm-gtk-greeter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/ChangeLog,v 1.16 2013/08/16 18:03:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/ChangeLog,v 1.17 2013/10/11 19:50:56 hwoarang Exp $
+
+*lightdm-gtk-greeter-1.6.1 (11 Oct 2013)
+
+  11 Oct 2013; Markos Chandras <hwoarang@gentoo.org>
+  +lightdm-gtk-greeter-1.6.1.ebuild, -lightdm-gtk-greeter-1.1.4-r1.ebuild,
+  -lightdm-gtk-greeter-1.1.5.ebuild, -lightdm-gtk-greeter-1.3.1.ebuild:
+  Version bump
 
 *lightdm-gtk-greeter-1.6.0 (16 Aug 2013)
 
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild
deleted file mode 100644
index 763350cc5400..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.4-r1.ebuild,v 1.2 2012/02/27 20:00:10 hwoarang Exp $
-
-EAPI=4
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="http://launchpad.net/lightdm-gtk-greeter/trunk/${PV}/+download/${P}.tar.gz branding? (
-http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="branding"
-
-DEPEND="x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.1.3"
-RDEPEND="!!<x11-misc/lightdm-1.1.1
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.1.3
-	x11-themes/gnome-themes-standard
-	x11-themes/gnome-icon-theme"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" ${WORKDIR}/${PN}.conf || die
-	fi
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/gentoo1024x768.png
-		sed -i -e "/background/s:=.*:=/usr/share/lightdm/backgrounds/gentoo1024x768.png:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
-	fi
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.5.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.5.ebuild
deleted file mode 100644
index 4c1cb46c7f19..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.1.5.ebuild,v 1.2 2012/06/27 21:19:16 steev Exp $
-
-EAPI=4
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="http://launchpad.net/lightdm-gtk-greeter/trunk/${PV}/+download/${P}.tar.gz branding? (
-http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="branding"
-
-DEPEND="x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-RDEPEND="!!<x11-misc/lightdm-1.1.1
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2
-	x11-themes/gnome-themes-standard
-	x11-themes/gnome-icon-theme"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" ${WORKDIR}/${PN}.conf || die
-	fi
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/gentoo1024x768.png
-		sed -i -e "/background/s:=.*:=/usr/share/lightdm/backgrounds/gentoo1024x768.png:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
-	fi
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
index cdc604832631..d4907a9d30b2 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.3.1.ebuild,v 1.1 2012/09/11 20:31:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-1.6.1.ebuild,v 1.1 2013/10/11 19:50:56 hwoarang Exp $
 
 EAPI=4
 
+inherit versionator
+
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="http://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="http://launchpad.net/lightdm-gtk-greeter/1.4/${PV}/+download/${P}.tar.gz branding? (
-http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )"
+SRC_URI="http://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
+http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
 
-LICENSE="GPL-3 LGPL-3"
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="branding"
 
 DEPEND="x11-libs/gtk+:3
@@ -22,13 +25,16 @@ RDEPEND="!!<x11-misc/lightdm-1.1.1
 	x11-themes/gnome-themes-standard
 	x11-themes/gnome-icon-theme"
 
+GENTOO_BG="gentoo-bg_65.jpg"
+
 src_prepare() {
 	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
 	# I will fix this once I decide to update the tarball with a new gentoo
 	# background
 	# Bug #404467
 	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" ${WORKDIR}/${PN}.conf || die
+		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+			"${WORKDIR}"/${PN}.conf || die
 	fi
 }
 
@@ -39,8 +45,10 @@ src_install() {
 		insinto /etc/lightdm/
 		doins "${WORKDIR}"/${PN}.conf
 		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/gentoo1024x768.png
-		sed -i -e "/background/s:=.*:=/usr/share/lightdm/backgrounds/gentoo1024x768.png:" \
+		doins "${WORKDIR}"/${GENTOO_BG}
+		sed -i -e \
+			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
 			"${D}"/etc/lightdm/${PN}.conf || die
+		newdoc "${WORKDIR}"/README.txt README-background.txt
 	fi
 }