bump to 1.13.1. Drop 1.8.5

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

4 files changed, 58 insertions, 34 deletions

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index b54439703ccb..54cea92d258f 100644
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.106 2015/01/19 19:54:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.107 2015/01/19 20:33:44 hwoarang Exp $
+
+*lightdm-1.13.1 (19 Jan 2015)
+
+  19 Jan 2015; Markos Chandras <hwoarang@gentoo.org> +lightdm-1.13.1.ebuild,
+  -lightdm-1.8.5.ebuild, metadata.xml:
+  bump to 1.13.1. Drop 1.8.5
 
   19 Jan 2015; Markos Chandras <hwoarang@gentoo.org> lightdm-1.13.0.ebuild:
   Drop unconditional dependency on accountservice. Patch by Harvey Mittens. Bug
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 1851cff3f5a5..571bb30ba568 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -15,32 +15,32 @@ DIST lightdm-1.10.4.tar.xz 470392 SHA256 af67cb9ef36655c7a1e8c692f38c018c3be24de
 DIST lightdm-1.11.9.tar.xz 474928 SHA256 a6047c773cb7341e28385d807fd1cd1adb356c7fee0d559e7c9fd6c3c9cb934c SHA512 a0c194d36cdf257352f4e2653bd9ebf4963ce4462fd235b7d8b4bd3110637c4b154cb37dd4559c16f0713fa43a9d49416a74b1827b5eb9eb9014801e7856f2d7 WHIRLPOOL 090f73362625625b1b50be38a58c3ffa4bc9a3ee97e1c36c973a0e98c03ade34fb6f0b492904e795ec2b30da0d52c5432e70e57e736b8674aa7b426ee7c327bf
 DIST lightdm-1.12.2.tar.xz 473360 SHA256 ce36bacef7a0ac5b720dc0f4aeb1c37aa56e7b72f7390e290a670fb1b8231736 SHA512 bf3a9ce659929fb628f869ce2d4570bf46d7ae5481df2423ba845c2b652f9d6ae7a0017c5a48ac4d1b72135163031e5382edead313a6f58613c7e8d3b5f449d1 WHIRLPOOL 9bf0f0c52ad8d4bd1537a907f3c438f9f91c28c0812f9c98792c35a0149d2f8fa2f08c5d9781f671292d1c29675d4c1eae5473b3b32f40cb23f8d06c81c586c3
 DIST lightdm-1.13.0.tar.xz 476588 SHA256 c2af13c70c6ac74ddd171d4a17c101d90ced799267cfc5d8d6c9ca611def5aba SHA512 df31d9e2919a2cd2053e02321221df64ceccb2674e8d0445a79df4f59d517610fb61b7c3d53ff505f856d0ffdf9d23f7aff46ce9d633ae248cbe509f6816e6f4 WHIRLPOOL a6b97c1b9e9c6f16c1c1134d38bf7eb940e3f39b0e8bf3d47583ad208c8957b47117a7654705608b4a5c3c74a6c705d02cf8f9fcc51c7553089e9ca4f050c5cb
-DIST lightdm-1.8.5.tar.xz 449024 SHA256 c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2 SHA512 a3941560abe402b07e5595a6fb6bcbd9df36f775b07ac23c526a14c25c1bc2e9ce4e2f912354446111f58499d9df92c650b44b05dbd1e49b5207722d5bf7985f WHIRLPOOL aabc3adf3412b92b235fc8c2674d6807d5bf5c0714a73ac62b558decf779f98a5fbf9151ec00498c4ef3032b153d7735ca216d9451fdd11924f72dab77e7f4ef
+DIST lightdm-1.13.1.tar.xz 476748 SHA256 e958e6afe158680b4dd18707c7fed22955f162dc46f48e6874135e83551d4275 SHA512 74d96ce380f581fd664364c0a13e66b41e823d36e2e2df8d8b663e05f6a41de4278fbfa13a9d460d16abf83d026bf2af7913cb5ab7ce122f183c363bb578c9e8 WHIRLPOOL 6f254a7cca249fced79f1dbfbefbeffddbc65fd37c02bf4c5d4b5cc267839ae533f0fcd4adc2f5df0dfc3a31a4f3b3333d5126dfbfe3a8eccf81ed09be514ea3
 EBUILD lightdm-1.10.3.ebuild 3264 SHA256 001f3c85828d6ac1458ead07c2b5688672c58988e6861238d41f982e3ba7006c SHA512 3c5e0332f8c38163376deefa1f8b9b6cd35f1b35517d4a226f71a98685edcdd271e238870ab00b10eb8fa1ca16a7360b3ca3ac863f1ffb6dff00d971d559503a WHIRLPOOL 6ba68a770b5b2c8f0a312583310f5322a27b6719ef490efcb89a22ecc60bf26695c195e2912059db33b115d4cb359af15a690c82cc2a1e6964ccb1e0c33ad3ae
 EBUILD lightdm-1.10.4.ebuild 3272 SHA256 ac19caac10f193c977aee89b5846c4e54ed12d00bb36f6090b03642b825cc82b SHA512 568eca2e06640dffeb88813bf593794ea29180c6d3c6c20c2435b09f885262f3f807d854ff0e21a4451ba9e71c34ac1d43dab7e9342a297a4083e1214432121d WHIRLPOOL 4028524cde75f985175751f5fcd82a081786a4b210862239abcb0e6de7c869fa5888d59bf3d8ba2ff79dc7f19a9df5099a89283c4389da50e1c2b39edff311ef
 EBUILD lightdm-1.11.9.ebuild 3314 SHA256 d751381830378f07e3fb7d7e6234d86579bfffcfbb8102698f991d3f64e30317 SHA512 e765213e7badfd1b100f91990846afc2d9af1acfc4bcfd454c527d1e4d709882a71348030582418733b8c4b44a463ccf4ee79845dcfea96555c81008d5f95998 WHIRLPOOL 7ed10fdbfc8c9d3e31974063c15befd2c0646d534022124f39dfd06fd4b2b26e013b7d89c3f63481c369fb4037859cb7aba0bfc90c8b44f94766a9651f1406e4
 EBUILD lightdm-1.12.2.ebuild 3397 SHA256 6b475601530f4cedefd3652f4ffd9af7cc3168d66d05a8eb230331376fd71a65 SHA512 7be17eb76186b45c4f7f9da55d8caff189a1cb5a8f1d7f1ff018d940e9779077fb4eddbaca8c1c4f2b2aa4424dbe6be02fcbe686273a822c70b89e07bfa52489 WHIRLPOOL 20d4997f63030adb81671338d0f60cea8f68106cd0e281cb8d7f4f664c4a66c8558aa198805d1f5f7725bf033f6986c322272b8500d4458b5f819be113ff5112
 EBUILD lightdm-1.13.0.ebuild 3627 SHA256 f9660eeef0afa09f8739538c3ef87e0da104d22f2fd5ee390af17295af922f8c SHA512 ea86d44ca391a8e79610c53337f8bfadc36ff93f983f5d394ae22985978b8c29242724e0ac2c6a34176196619253ce1895095f08b76de98a78f9bfc34b81d14b WHIRLPOOL 9fc9f7825764f5778b58ef6ad2b88f6904b1a5ca3de198b797356b05bc2a1aad8a7c557e7dbb7b2fdb9559498df60af4dc02fa8428ee6f0fa5a1c76fb6c81c99
-EBUILD lightdm-1.8.5.ebuild 2803 SHA256 8f9329140c76835a3450966fce40e4def32ebf0ef81f8a79ce78a6723d6a3e3d SHA512 3cf035301b67292dddba3bfa1e348f72044da8f1cd87171bec2f44da64e17aa625be8a0e5540b184f3464d4a0e305c06f9c4c7c44d627cfc013ccc02d6c5e4a4 WHIRLPOOL b8c42bf4ea1d8f9f2e0c282778a84532060ce481d679c56e9d8facde20a6d0462e8b5385f9571ae9dec4fbb1bbdebf81faddb92d51ba099b2c44644328a0d1f4
-MISC ChangeLog 17453 SHA256 e7a8a13ccefc6adde97fa413d73d63c2c748479243424f1047cfd7e57255ea57 SHA512 793331df768a1a51250099955f28abc9ea70812c153b372219b4c450ac783beb8ec2573d8052fe2b3af0684e2b260ffd53801b87f2ed2f5312dc78a8b0e952cd WHIRLPOOL 7f79c928a65d28a7bac2ca9bf4795e04f801a2406b2c95eb9958563de84cbdcf354676e689272162092a7eb035b6cee08506b2c81263da5ba6e7c87d4b09fcf4
-MISC metadata.xml 534 SHA256 cc20c58e04e520dc9e21c7a75d92e2714d94b1c1cdfddc94e8694c40af0d9597 SHA512 141fa9fde06c409a2d5ab3bc2f91c6d0a61568e1e94cdc417e530124487ef9f51141eeb74bc6e9ff957ae0f1f166a799634fca5a99995fdec920c3c858300863 WHIRLPOOL ff63e4220de78992417e5f8ecbe5b00b90f54a98bcd8c0dd6c9025db749213534a0b3e79d51a8f958f463726efee952eb8c31d2a161a77637f5eb6fd565f66c1
+EBUILD lightdm-1.13.1.ebuild 3627 SHA256 a014c2ca85872fa281a7327b998b8730485709cbb8f641d64987116b47bf38d6 SHA512 ad0f02f542cb99d52aec04f280233e32e4a8ff70118ee4ce48832aaeb77c753a8f081eb5f1322b64341f3ec101b20b5f2d5d299229dfb6d4c028e30f7fe2a6f1 WHIRLPOOL ad01df113f4f089e816a922f8d1af45cc57af40c0c59142de01c943fe38ae520f2eef27763d9a472919956b83161e9f948c50367436dae570181ff4768879ca0
+MISC ChangeLog 17630 SHA256 bf3cbb51a5a0e3f788650cc287044aac116a460b1bd0c4e2d4b39d6b6fe985ca SHA512 1107498a537373532c5e8f3a60e20cdc4f2e78fb10d7981ae96a08dda5b12c408065e248847de4b457d15b5065f681f5e5f82f5f1f7d0a9ce49fbb61ae2e91f2 WHIRLPOOL d0e46854ccee91dc46245bf7658185caa4538874f03d0bf338598f77756be28610bee457d5317f0e58ac088415a02ac6bd47c672ffaf5c19194cbd97fe16313e
+MISC metadata.xml 479 SHA256 4e0fa8ca99f6b80f9a8aac474b5bc0392d3f0f63e3f791b3e21d069798e50382 SHA512 b5346c4319d9a8bc194792450bc48b82490d6ee55b2cdf9ac902385fc2c5566fdb6021296fcd34915fd6a928c05ae96796677dd90811d0d3a0bfae20c6f4e1f7 WHIRLPOOL adae0849743226e0cf85711a70de31e9566ef15c2e2f784f7893539991871c9b5074eab8aeda03110272cc2b58f2004dc09f2fd0ac1c0928f35b5dec16f7f48d
 MISC p0.orig 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUvWERXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUvWopXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88N8QQAJITMPyPy4E0z+I1PEh+b2jA
-wJ2MeYXwz4NZWZaquzO5rQgzcNlR9bRA2lbfTNQ2eQC5jumEM2kXUtIhRYo0Dsx5
-3YC5sflQogtvl/4+5J8pO3YWjHJXJKVlnEFK00QroiNi0YzExEr9C8Gfn066lLPn
-2gYY1YobcJTVtSFWnuUP4TkcfNQwSGI+3/tg2zD8u5wQAeNVFyQGXlrpfEO4jVfI
-eStoEj6r+3YtuHZl3xI4SGme/wxh4M2sMLmsSnYgWJrh9+kAM0o6j6JjaOzf8XDm
-hDT/RnTsuN8C5Mynm/QPXwnv8w7KRu04x15zQYegIDFADLxerbEXm87gwTZqAzJg
-p9sr7coQoMGLQM2bGbm+s7cuMNxce1vokZVjTlZhoCxnSJMC8sItqeDw3bWiru3E
-CEuvcTM8KEN52yZc0NELpZ2jQxL9I6neyAcGiB5uy/+goUJ0XVmuuPycep54CPki
-Zi2xQZD9HDGiiv3PphsbZOomctQib3j7wIG1ODiDJIMiogMMGiwBl4JTFMrKhscQ
-lkoKSYW2DMfIPOIKCckpv9pThNzXrhpA215ahF6xJ+YykXxiU8B7WW3qJSJ5b/gU
-fOLnV+/bYqrvNOcKQzXXz/SKFHFY8lWIWB+QWAE2OCUn4tJmOLntSuE12SXAB/Sm
-uAbfsdU2ApQ/UcKwxpAF
-=mta8
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88Xb0P/3j9EY3d2/BWWEOKU3ZRZ4OO
+XUbN3NJeqXtHpf3gLgXK0M8y1k1cpBv6m8sa1NsinMC4CWc0wfk2Ayds8tMax3lF
+E9b9W8ectAmUjGkTP9+2g3V8IkfyeSPf4p3y306rMQoMLwXFK3ckyBtl2bUcw8Qz
+OHzDosAC9k2oPl3Kahm3xL7vf1qbrFkBlNUMeHYXeBN96/FUGHqYve401GcfohBN
+3oFK7aNtQz0o04hVSz46PlSrM596VH17vp5GMnJTsV9NLu2tJSCqg2rolcp+FCY1
+TurAFofxvuo3owGfdf3qgPsFqIM2dJT5+mp1typdQ2G+3biThXrpyDaN20RD2zM6
+h6p3z85xB/ZgKjz5UYpQiAHvU3zKSjvMo1TR+qqySLDcOIsCDSt45q0ohEBO1nJp
+KTD1fCrviF7ge9ci0Cf+Ytur/pUJdn/13hYy3AbP+J9zJvoqHvxo6flYX816sdP/
+RrqF/cWadpIaSlQRN9hmAxfaXSURhGZwLnGOYFlO7fyulCjAnhxI/kibJ7+KTK22
+GOdn5CqM7j6uSsI4JoW2Ro9CNzB8untkToHGLDGiZyNLmW89w9IXHWkEtbrKQm5B
+aibHFhN2sVVL8xreR/Iwbz2cPZqyHNwxsXlgdebTk2f0aZpDgjUs11wBX0iu0+nv
+o9NqoR9JICp7qjo+NmJJ
+=wGVu
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/lightdm-1.8.5.ebuild b/x11-misc/lightdm/lightdm-1.13.1.ebuild
index 838e45603ef6..5cb15681acc4 100644
--- a/x11-misc/lightdm/lightdm-1.8.5.ebuild
+++ b/x11-misc/lightdm/lightdm-1.13.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.8.5.ebuild,v 1.4 2013/12/23 22:09:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.13.1.ebuild,v 1.1 2015/01/19 20:33:44 hwoarang Exp $
 
 EAPI=5
-inherit autotools eutils pam readme.gentoo systemd
+inherit autotools eutils pam readme.gentoo systemd versionator
 
-TRUNK_VERSION="1.8"
+TRUNK_VERSION="$(get_version_component_range 1-2)"
 DESCRIPTION="A lightweight display manager"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
 SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
@@ -13,13 +13,13 @@ SRC_URI="http://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="+gtk +introspection kde qt4 razor"
-REQUIRED_USE="|| ( gtk kde razor )"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+gtk +introspection kde qt4 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
 
 COMMON_DEPEND=">=dev-libs/glib-2.32.3:2
 	dev-libs/libxml2
-	sys-apps/accountsservice
+	gnome? ( sys-apps/accountsservice )
 	virtual/pam
 	x11-libs/libX11
 	>=x11-libs/libxklavier-5
@@ -34,21 +34,24 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-util/gtk-doc-am
 	dev-util/intltool
-	gnome-base/gnome-common
+	gnome? ( gnome-base/gnome-common )
 	sys-devel/gettext
 	virtual/pkgconfig"
 PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
-	kde? ( x11-misc/lightdm-kde )
-	razor? ( razorqt-base/razorqt-lightdm-greeter )"
+	kde? ( x11-misc/lightdm-kde )"
 
-RESTRICT="test"
 DOCS=( NEWS )
+RESTRICT="test"
 
 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}"/${PN}-1.7.7-session-wrapper.patch
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
 	epatch_user
 
 	# Remove bogus Makefile statement. This needs to go upstream
@@ -72,11 +75,15 @@ src_configure() {
 	einfo "Default session: ${_session}"
 	einfo "Greeter user: ${_user}"
 
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
 	econf \
 		--localstatedir=/var \
 		--disable-static \
+		--disable-tests \
 		$(use_enable introspection) \
 		$(use_enable qt4 liblightdm-qt) \
+		--disable-liblightdm-qt5 \
 		--with-user-session=${_session} \
 		--with-greeter-session=${_greeter} \
 		--with-greeter-user=${_user} \
@@ -86,15 +93,27 @@ src_configure() {
 src_install() {
 	default
 
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${D}/etc/apparmor.d ]]; then
+		rm -r "${D}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
 	insinto /etc/${PN}
 	doins data/{${PN},keys}.conf
 	doins "${FILESDIR}"/Xsession
 	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
 
 	prune_libtool_files --all
 	rm -rf "${ED}"/etc/init
 
-	pamd_mimic system-local-login ${PN} auth account session #372229
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
 	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
 
 	readme.gentoo_create_doc
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index 47be3d7bab69..498c2fffd0a9 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -9,7 +9,6 @@
 	<flag name="gtk">Pull in the gtk+ greeter</flag>
 	<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
 	<flag name="kde">Pull in the kde greeter</flag>
-	<flag name="razor">Pull in the razorqt greeter</flag>
 </use>
 <longdescription lang="en">
 </longdescription>