old

Package-Manager: portage-2.2.0_alpha111/cvs/Linux x86_64

6 files changed, 14 insertions, 351 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index 2f2eada90678..74ca264a4f23 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.44 2012/06/24 12:29:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.45 2012/06/24 12:31:33 ssuominen Exp $
+
+  24 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/lightdm-1.0.6-pkglibexec.patch, -lightdm-1.2.2.ebuild,
+  -lightdm-1.2.2-r1.ebuild, -lightdm-1.2.2-r2.ebuild:
+  old
 
 *lightdm-1.2.2-r3 (24 Jun 2012)
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 509870fdb320..2aafb7f1d82c 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 AUX Xsession 1641 RMD160 fec5ca0ab491c2d23a631d7bab4bfa634788841d SHA1 7261a104c145025c63f8febfcecc189badfd3e86 SHA256 fb38b265420e55b2fd96f003ab00ad2a2d2cd1902984c84239c8ca84eb9b66a9
 AUX lightdm 257 RMD160 85f6b3f74ce06fdd8ee9a5c550ec6c9a1cb75345 SHA1 1b93afa7fa26d5b7ad0292c49be274aa7b2ab932 SHA256 c43240d1fbdb76d219d11ffbb8ad406bcbd7c78c8eba9c03c0feb353b6671c27
-AUX lightdm-1.0.6-pkglibexec.patch 757 RMD160 ac773aa01efd79af1bba9b1c5467493653a11164 SHA1 870dd5ba429c844a1323ca862bb1bf350105a051 SHA256 c00d7c1c3463a96ed69da7159f8c410ff55cebe10c78554dea9d5bad56c41a55
 AUX lightdm-1.2.0-fix-configure.patch 333 RMD160 c527113271fc3701b63f8b0ed49302a8f1c5dc87 SHA1 421321d8c2160bfa936365fcdf42bd98a3283ee5 SHA256 da47ccb4a9be4c5daf7c132d0141c268692c37e60120adc60e132f522d992b56
 AUX lightdm-autologin 155 RMD160 a90a2cf6bad235ef8e0892348facb0f1aec10b75 SHA1 726bbf234f2d4dc6ce5a61beb3c80130a6733b12 SHA256 a3fefe481ba0511f6557194a075f9b40dd15f1680fdfc9cf2441467bae726c83
 AUX session-wrapper-lightdm.patch 419 RMD160 899fd1b62b77ff1d3dcd46c35092486391f8bc2b SHA1 a609ddf728296ed8c139e2750ad3557e2a8bfec0 SHA256 de5504221cd31c6d25ccbb21f4559780564ce908e2306238d92dd4ac481e687a
@@ -12,20 +11,17 @@ DIST lightdm-1.0.11.tar.gz 651203 RMD160 7802d39f4db7bb310d3e03c93b90e91fa6d4c1a
 DIST lightdm-1.2.2.tar.gz 642334 RMD160 bfd65206d389bc29e9b5a60e91044fa19c703115 SHA1 3c52fa36d5c33a86252fb2191a4ca49d7588cd7c SHA256 772cc6a4e7da670352f6a38c05470b8fcfe50a2c1d3d424be1c9309afb0c541b
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
 EBUILD lightdm-1.0.11.ebuild 3637 RMD160 ea1ef882661e1d53e631207dedfd9517c013b7fe SHA1 762931d6fc84ff0ad7e8cf21d7639fe7d2de709d SHA256 03064e876254588c136599d334f79f91be48ccbff3b710255afb1a5f3fa087eb
-EBUILD lightdm-1.2.2-r1.ebuild 2982 RMD160 4770d6200c6faa81b68f0127b0e568d6b605c795 SHA1 72c16a6e0953ccdcf1fd00cc3f65816e2cdd15cc SHA256 2f9a9f00f07879c54948b1917aca104e9ca353d02ac3c60d1926adad7004d9f3
-EBUILD lightdm-1.2.2-r2.ebuild 3112 RMD160 096058ab62677dca7fd4684525d13e1306b68c29 SHA1 c09f174e78620e88da9612fda084b8b2a4fd2140 SHA256 13fd3bdf34a5c14424ff2de0acc696f69df1926fed6bdf6a02771eb9fb9904a2
 EBUILD lightdm-1.2.2-r3.ebuild 3041 RMD160 214c71fbae668a0f7d97c353edf15027b3c86193 SHA1 a4e572eb559ee7277dc2d363a2fcf46982f34b8a SHA256 a71c2d9619b581fb1131b16ca0bd4b2a683d2711e5c1820de4049d8aecee37ab
-EBUILD lightdm-1.2.2.ebuild 2751 RMD160 8b64cf6c134421447bd1a7ac45f62c45479c2007 SHA1 837564b400183024bbf5d184fd9d20e122089b9c SHA256 3ee3832e3d74657978db01be096072511d09415e2dd1b1b8d591a0a38638497e
-MISC ChangeLog 7647 RMD160 5c463a1788ef79b572a6c0790c2104c6b6cc0859 SHA1 5db1e17a846bea99bc8ff8d5c004c617e44749c5 SHA256 ed743813672e9843864008878c03a7051a116c0755c31351d584f7765783ae9d
+MISC ChangeLog 7826 RMD160 62176d969a9cf3f3d05425447bb195c83c4e79b1 SHA1 526e125eb87716e595fc497cf1403e9ccafe71ea SHA256 fcece438b8a153552be9f838e80327138c7c0298661d93ec782bd6dbf77bdfe9
 MISC metadata.xml 565 RMD160 1f9bedfcdaeebb452bfd81e1e6ac52910381841e SHA1 2407aa8809f8da8403a865614dd2daacc53c6c42 SHA256 f229bd86fcc0af59f4d1d68e2f57d56ddda188940ec4b6a01ac26816b3d98fcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP5wcFAAoJEEdUh39IaPFN8TIH/1xw+qZt9ptTY8i2hGI3jMxo
-1XFbWY79nEc953d6oULls0EgzFEBrCuCusnaZgRnt/5/Uoi9MGiEpSLyTaNiV+7w
-dPHPMLGth6YbJtrLsJ7sai2/vkj2+8hqpQHwIek1gUXrbajq7ZtTiGtgOEhXPCAL
-IOkwuLaS3I5xq+f41EGk9tzbpy2nvFT9DQhP6FSaiyE2GqtkU6xkZFjduAaHQIw0
-w0gCUHeVrdaLceQXPyzSNJXapOsixQLVGWNy31igdFbrLWAWp/jwG+c6wlR4mesy
-S8pGjsateal+54Krggpxx16FrQMF2Pg9jaTRYMPZppO9BQeL7WxmJkogPBzPRxA=
-=OM8P
+iQEcBAEBAgAGBQJP5wd8AAoJEEdUh39IaPFNcOoH/00U+JUE6/KYr9lMa1tM3Tqd
+sPQG+ZVW2p/RoAogysgbKtBhQmBtK1fEKPKlUx3DSW9BJV4rVhPgkXNJQKe1lINw
+dmr9b8Gr0MUFHm/+iDoMXiqaVkthiULl09P5PR6jrY4594W78RbIo2jSs8/HNi1c
+akps3Kg8rjA6hs/cfHhclHKhT6J61qTBIrcToEYCnLRHpNXgY+23ARlmqCABv2fZ
+/2D5ttcF+V4FHVCVZ7l4FupbbUEzXrubWaOnjDaKKVaxY82ph7HOZNaXsMEqn4PR
+AEpOssaxVgawnImLRA0ikRswHFAKgqSk61tOtZ3+iZCgsgZvJZ2GF3JoC4o40HY=
+=AcBA
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch b/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch
deleted file mode 100644
index ef208a7f11af..000000000000
--- a/x11-misc/lightdm/files/lightdm-1.0.6-pkglibexec.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Install dir:
-    /usr/libexec/lightdm-guest-session-wrapper
-    /usr/libexec/lightdm-set-defaults
-    /usr/libexec/lightdm/gdmflexiserver
-
-Due to the following change, pkglibexec_SCRIPTS is invalid:
-    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
- utils/Makefile.am |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/utils/Makefile.am b/utils/Makefile.am
-index 41df48b..ee527cf 100644
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -1,6 +1,7 @@
- bin_PROGRAMS = dm-tool
- libexec_PROGRAMS = lightdm-set-defaults
--dist_pkglibexec_SCRIPTS = gdmflexiserver
-+ldmlibexecdir = $(libexecdir)/@PACKAGE@
-+dist_ldmlibexec_SCRIPTS = gdmflexiserver
- 
- dm_tool_SOURCES = \
- 	dm-tool.c
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild
deleted file mode 100644
index 7785dda2af4c..000000000000
--- a/x11-misc/lightdm/lightdm-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,105 +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/lightdm-1.2.2-r1.ebuild,v 1.2 2012/06/04 23:23:38 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	sys-apps/accountsservice
-	virtual/pam
-	x11-libs/libxklavier
-	x11-libs/libX11
-	introspection? ( dev-libs/gobject-introspection )
-	qt4? ( x11-libs/qt-core:4
-		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( NEWS )
-
-src_prepare() {
-	sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
-	sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
-
-	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-	epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
-	epatch_user
-
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	# do the actual configuration
-	econf --localstatedir=/var \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable qt4 liblightdm-qt) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Install missing files
-	insinto /etc/${PN}/
-	doins "${S}"/data/{${PN},users,keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# remove .la files
-	find "${ED}" -name "*.la" -exec rm -rf {} +
-	rm -Rf "${ED}"/etc/init || die
-
-	dopamd "${FILESDIR}"/${PN}
-	dopamd "${FILESDIR}"/${PN}-autologin
-}
-
-pkg_postinst() {
-	elog
-	elog "You will need to install a greeter as actual GUI for LightDM."
-	elog
-	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
-	elog "most users, make sure you configure it to suit your needs"
-	elog "before using ${PN} for the first time."
-	elog "You can test the configuration file using the following"
-	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
-	elog "requires xorg-server to be built with the 'kdrive' useflag."
-	elog
-	elog "You can also set your own default values for LIGHTDM_GREETER,"
-	elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
-	elog
-}
diff --git a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild b/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
deleted file mode 100644
index 96ed3129d1b0..000000000000
--- a/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,108 +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/lightdm-1.2.2-r2.ebuild,v 1.2 2012/06/21 07:37:15 yngwin Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection qt4"
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	sys-apps/accountsservice
-	virtual/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	introspection? ( dev-libs/gobject-introspection )
-	qt4? ( x11-libs/qt-core:4
-		x11-libs/qt-dbus:4
-		x11-libs/qt-gui:4 )"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( NEWS )
-
-src_prepare() {
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-	epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
-	epatch_user
-
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	econf --localstatedir=/var \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable qt4 liblightdm-qt) \
-		--with-user-session=${_session} \
-		--with-greeter-session=${_greeter} \
-		--with-greeter-user=${_user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Install missing files
-	insinto /etc/${PN}
-	doins data/{${PN},users,keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-
-	# Remove unnecessary files
-	prune_libtool_files --all
-	rm -rf "${ED}"/etc/init
-
-	# Install proper pam files
-	pamd_mimic system-local-login ${PN} auth account session
-	pamd_mimic system-local-login ${PN}-autologin auth account session
-}
-
-pkg_postinst() {
-	elog
-	elog "You will need to install a greeter as actual GUI for LightDM."
-	elog
-	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
-	elog "most users, make sure you configure it to suit your needs"
-	elog "before using ${PN} for the first time."
-	elog "You can test the configuration file using the following"
-	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
-	elog "requires xorg-server to be built with the 'kdrive' useflag."
-	elog
-	elog "You can also set your own default values for LIGHTDM_GREETER,"
-	elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
-	elog
-}
diff --git a/x11-misc/lightdm/lightdm-1.2.2.ebuild b/x11-misc/lightdm/lightdm-1.2.2.ebuild
deleted file mode 100644
index 80cfca3026a4..000000000000
--- a/x11-misc/lightdm/lightdm-1.2.2.ebuild
+++ /dev/null
@@ -1,100 +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/lightdm-1.2.2.ebuild,v 1.3 2012/06/04 23:23:38 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="dev-libs/glib:2
-	virtual/pam
-	x11-libs/libxklavier
-	x11-libs/libX11
-	dev-libs/libxml2
-	introspection? ( dev-libs/gobject-introspection )
-	sys-apps/accountsservice"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	sys-devel/gettext
-	dev-util/gtk-doc-am"
-PDEPEND="x11-misc/lightdm-gtk-greeter"
-
-DOCS=( NEWS )
-
-src_prepare() {
-	sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
-	sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
-
-	epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-	epatch_user
-
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-}
-
-src_configure() {
-	# Maybe in the future, we can support some automatic session and user
-	# recognition. Until then, use default values
-	local default=gnome user=root greeter
-
-	# There is no qt greeter, so use gtk anyway
-	# use gtk && greeter=lightdm-gtk-greeter
-	greeter=lightdm-gtk-greeter
-
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${greeter}"
-	einfo "Default session: ${default}"
-	einfo "Greeter user: ${user}"
-
-	# do the actual configuration
-	econf --localstatedir=/var \
-		--disable-static \
-		$(use_enable introspection) \
-		--disable-liblightdm-qt \
-		--with-user-session=${user} \
-		--with-greeter-session=${greeter} \
-		--with-greeter-user=${user} \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-
-	# Install missing files
-	insinto /etc/${PN}/
-	doins "${S}"/data/{${PN},users,keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# remove .la files
-	find "${ED}" -name "*.la" -exec rm -rf {} +
-	rm -Rf "${ED}"/etc/init || die
-
-	dopamd "${FILESDIR}"/${PN}
-	dopamd "${FILESDIR}"/${PN}-autologin
-}
-
-pkg_postinst() {
-	elog
-	elog "Even though the default /etc/${PN}/${PN}.conf will work for"
-	elog "most users, make sure you configure it to suit your needs"
-	elog "before using ${PN} for the first time."
-	elog "You can test the configuration file using the following"
-	elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
-	elog "requires xorg-server to be built with the 'kdrive' useflag."
-	elog
-}