version bump; better utf8 support, various fixes plus upstream systemd support

Package-Manager: portage-2.1.11.36/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 135 insertions, 15 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index fef121f3f14a..4eb61b7b33d6 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.92 2012/12/29 19:01:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.93 2012/12/31 18:09:51 axs Exp $
+
+*slim-1.3.5 (31 Dec 2012)
+
+  31 Dec 2012; Ian Stakenvicius <axs@gentoo.org> +slim-1.3.5.ebuild,
+  +files/slim-1.3.5-arm.patch:
+  version bump; better utf8 support, various fixes plus upstream systemd
+  support
 
 *slim-1.3.4-r2 (29 Dec 2012)
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index f104ce770a10..2c4db61d6dea 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -16,28 +16,21 @@ AUX slim-1.3.4-arm.patch 304 SHA256 160bd507d9112f4ea2830fb498a1dd4fd8f84bd1b01e
 AUX slim-1.3.4-config.diff 2757 SHA256 03a8091b01f97f388c986ddbd5fba4d8634d4c97805678919de6304e89b6dbab SHA512 f1001fe897a33e22440edc83a9bc3ff77dc4854224d232812352ccaf622c3563957d9ed838071e8438c756878197eeaa98656a23218b9fe2970d54dbd24314b0 WHIRLPOOL 0cd9f83239cb9d7e70e53be439c67f39a024f3e8e4a7676098e611061d75a7b69a3a63072d6ca8c2ab33df536f51c020769886138c343118109793a5463e2da7
 AUX slim-1.3.4-libpng.patch 376 SHA256 9f018c2ff2c0c1788ef59c6e17c66f71ba5ecdf22099c5acc79ae293c7b097c4 SHA512 bc7000e310772a52c28b3efcc21c2acd4b43fc402d24992d6b21ea2166684d8683ec322009b42e6a3ccad02e4444ef6c9b983c5e9bbd6510f4904eb78926ad38 WHIRLPOOL 69b89adf382da0e1092eda3b1f3de450d57ce1fc4aa3541e8237214d05832737b9680a146872b7c77f3a9a6889c9318b91163b6eef1553259e764ba1bedfd287
 AUX slim-1.3.4-pam-end.patch 235 SHA256 a3042abe5f3c45044d0117a7af325f7b236b5e482377eb8f9ccfddd5ee9e875e SHA512 a0db17f5df015d92e617a852f9bcef1f1e3300dae1c818831d439980cee77761f33a5097a4b1b3a563e338833746721e18a340cf1d4d16e0e550b5a5811de608 WHIRLPOOL 99171fed1281f25cafb0aae8b791d8cad3fc4e5707bc118513723bde9927b62db439cd73f79ea3a23180d0d17db55b2aa4ae717df1739d8a133b101f68a7fcb9
+AUX slim-1.3.5-arm.patch 289 SHA256 95c7be21f8a176ce649e2dd804b8c2fa019e5e206a2532233f8b76bdbf201fba SHA512 1d3a3a387433c8bfc9bff6ac3779e70e0e0ca5f65e6120dd83fb51d59dfa47facc6d31c6e955b737e41ebf760416015f7f12dc749e710957cbef274aa5d1d308 WHIRLPOOL 54cb1cff534d30c157460a729a054cb4089b39dbf950b7d78462f6cc8f1dcc1770b6943fe0e24198ad0313cd2c359e0684d35e99155e3945fc19e14638986437
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 AUX slim.service 167 SHA256 4e7f773956f44693fd9de17bd85e8cde443e845f505a561ac41310309cad4005 SHA512 c2379fc65223f46e533c219598a03015b743fa1695e85afdb5a4701266acb76610fa3579af793b6b54548888d8718d26b3a8f65d3f1c27b3580013f774a9c45e WHIRLPOOL ac2f8526a303eaf35fce2cac2c5e554595e908fe03913e0877572227ebc6555318a3627b2365ec6c92cd10f7924906520a2008f7f5791550f6ae426b1e0268d8
 DIST slim-1.3.2.tar.gz 220592 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8 SHA512 80b443878cb45725b4b19783d3881544a591836118dbd95e6bd37a7e25ce47c00c78f3369d1cd4e03481e719be2be04952f6b279a79695d6a4201b5216bf5feb WHIRLPOOL 5b33a969f1b9658bb559e8237f7e314d868e467332023837395a5f802751efb526c53de988484ccb3f9cccbb5bc1c710e03128552f90e5d31685876d0f23de51
 DIST slim-1.3.4.tar.gz 227197 SHA256 155c26460c98b9f0925624028b4254afc0de4fda33300f3ac45606b2c5cbd501 SHA512 9b95eb5b5337974e2d842a462011809f6df8d6723b65e011677653cc25fb987a71760f06b671ccfa3a9db74d8d3cd107cbbb5122c04191ceded7b30f5ae71cd1 WHIRLPOOL 3c7bb99e01173e399b5c0623e72c8f70838ea7f5f2d3012f3d14a43b27878fc5c358736f84eb217f500653961524499cb7a23f24b7ed25ae18cb5b6ea8052ae5
+DIST slim-1.3.5.tar.gz 226413 SHA256 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 SHA512 09757dc115488efd883eeced70ddb7d13afca0738e9cc531b2a66065e55eef52a3f67f5352365f7b9762b75132be4eb18bcbb12d47b3f79bb9ec0e0e2f62d85e WHIRLPOOL 61742167f8c732719411c58d8358a065800db828dae4fe94aad3690ba3f70bd9c57476ea21d09298a96c6236cd5308e83398ba36b43f46aa729363eccb4367c3
 EBUILD slim-1.3.2-r7.ebuild 4587 SHA256 5590fcfa2149a10f4fabdaa9ed66f33ddea23f7ea35d6a5c0dc0275fb4018194 SHA512 bbd54b88af996ad505f7d382fd9eefcc2f3b347b1da4f380e5fd7742031d080bb667f39f42aa2390c9b08d01a8c6bdef01b25415f7fe9d27434c16bafc77cbbc WHIRLPOOL 5c04db6022370f69c25fbfcde207f265c63f4134316dd99473e69a0fd9f8808fd7b2b71765f7b92131d39fc1a45339e6d62347103f61cfeac09e0b2cab741063
 EBUILD slim-1.3.4-r2.ebuild 3361 SHA256 00bd8534399782c0a255ed51e481c53492d836ab39185f5bdc00cf8a535b37c3 SHA512 44110562849a2c1477c44a43d9ff1d78a702e6a313646c532426e6ccc6dedbe6ad4689d6462f0ff39c44d4033364a297b5c7eb61b1494d84e9c707cdd99447bf WHIRLPOOL 8c12302da1cb478f8d34c62ec9ac360a653dce53fb429d7ea6cf0c3e86c27284aa3cb27eb290d054e23798d221781a294c7ced10ae9b8361913b93b037a66f72
-MISC ChangeLog 15058 SHA256 cf29f5e7d32f337dee8bb7af8bac4a52ef105f635c7c6a0abb88c0388e5c4841 SHA512 71b387828f37565b7761768338625f05796c9a66ee29152b04a3e506d38533b8258500a7cca2a50a756d770879a62d877c5ea4bfb8dab7f353eab5673bcd5fae WHIRLPOOL b0ae06eddd826481035c07bcf838cecdeb62c2204ada1ae525af15a941747152a0b753e0db51c0283f7c0ee2bfebd3f38f9422e0fc30077ee213c16852244986
+EBUILD slim-1.3.5.ebuild 3226 SHA256 39026a38353d2fdfdceff1383fae76345cd04bcf90bf2c928b296a75f64cd556 SHA512 3c622f9806e94ae62098dbfae70f3f08ab73c50b8dd1845ec48c6d879cd1b195a831488caa9bf27ea18bf7d003a429503b08e461738ac3d0990c1d7ab5b0df62 WHIRLPOOL adad85299d9c1e4831c2332b5b9de6b51537ca0a240f985565483eb4dab6701dad25964b0ce1e4b51e348aede94cf70ffe672a54608ea2bce011d7bc050e1cc3
+MISC ChangeLog 15262 SHA256 c37ab8a36e65b37f7d0547241f3c1b88e95d4eaaff1ba54152dba5c4bb445a35 SHA512 8990ac808ced0d555686ad54cbee05ac6d94446aa498c746b31d606f3551e4a131027961bffaaf510f87c17dcbd716df0ddcb494167e0096012deaf6d2a430d8 WHIRLPOOL 07f31b2e75118375d206a2ba13213598794b6733d6f69be3186fb2373614cfb83b6187e81c22c458e1c1519139a7be5cea16866b4bf8aadb08859a0c1efc1af8
 MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ3z4jAAoJEF0huFKJUZL5hXoP/0BvctFfpVrm4D1au0Xy7yxj
-AS0Kpe4aa49L59Sq0p4YdfjuYFaJ0/i6Tn3TWtqWXOZnHHqb12sI1mBAymALoQQP
-HMZ3Liw45cZf82OE5nCFAv+TF96XpNsryNq5QJRfkpZJgZmp97HRJMsqvLjstO8+
-AAtG8OhYNqtPSFSmad4RWNhcNaJIlvCr/dustUsgzyNhDIbHqThx016orO14RoKd
-OEZ8i7B3FXVzTozRHgwbd9CLji4cXo0NpYYqiKPNaABcSH0lVOYNp4Ks1caEewWs
-bVtxuMyeBvGLXzzwYC6o36tbmPfWID+5KCbuhDmHpglF6572g6BLfmVBxC+r8Yhf
-2kLZ/vWC1rJr8kke84KXQ55LdZBbDfe8cP+SQ6W2dRb6g2RJUAE0Aup3XBEf/n+o
-yCF65VsxIFbE2Hnopq+NBrrg0s01XY23pHkwJLFHZRs4nrcr0Giqwb9pzDimX1vu
-LqaUVVV4kv3MVFocouDYIquMqZ+25SAxFwfZccf2sfBgYDUcWgL1QersNPiy3yiT
-eDQEz0P2F8/3GVQuKblDvisCHtUjkqIyZMFld6Z+cvBWpDhoLEwqvLpF8Qz45mX3
-eI1HmHzKQ6tCiGnqO6V7+BFgiMQhcyni04Lomg/ZBCipnHGWB/KNOSJahWv8OVfo
-SQL2WyA1qxExar7YvzRQ
-=0CS8
+iF4EAREIAAYFAlDh1QAACgkQ2ugaI38ACPCiEwD9HlfXyFI7vLtBvAF2JxACcSbH
+p7Ebn9QIv9AQHgx/KYMBAJYudGuyVrWPyMZcUOZx4nIV/ZUZsh6wjZDd4RGWDq8q
+=dYYm
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/slim-1.3.5-arm.patch b/x11-misc/slim/files/slim-1.3.5-arm.patch
new file mode 100644
index 000000000000..9438ce4a1caf
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.5-arm.patch
@@ -0,0 +1,11 @@
+--- a/Ck.cpp	2012-06-26 04:20:14.000000000 -0400
++++ b/Ck.cpp	2012-10-05 13:25:29.000000000 -0400
+@@ -91,7 +91,7 @@
+ 
+ 	vt = *((long *)return_value);
+ 
+-	std::snprintf(device, 32, "/dev/tty%ld", vt);
++	std::sprintf(device, "/dev/tty%ld", vt);
+ 
+ 	if(return_value)
+ 	  XFree(return_value);
diff --git a/x11-misc/slim/slim-1.3.5.ebuild b/x11-misc/slim/slim-1.3.5.ebuild
new file mode 100644
index 000000000000..23cefcf678eb
--- /dev/null
+++ b/x11-misc/slim/slim-1.3.5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5.ebuild,v 1.1 2012/12/31 18:09:51 axs Exp $
+
+EAPI=4
+
+CMAKE_MIN_VERSION="2.8.8"
+inherit cmake-utils pam eutils systemd versionator
+
+DESCRIPTION="Simple Login Manager"
+HOMEPAGE="http://slim.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="branding pam consolekit"
+REQUIRED_USE="consolekit? ( pam )"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXft
+	media-libs/libpng
+	virtual/jpeg
+	x11-apps/sessreg
+	consolekit? ( sys-auth/consolekit
+		sys-apps/dbus )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto"
+PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
+
+src_prepare() {
+	# Our Gentoo-specific config changes
+	epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
+	epatch "${FILESDIR}"/${P}-arm.patch
+
+	if use elibc_FreeBSD; then
+		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
+			|| die
+	fi
+
+	if use branding; then
+		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use pam USE_PAM)
+		$(cmake-utils_use consolekit USE_CONSOLEKIT)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use pam ; then
+		pamd_mimic system-local-login slim auth account session
+	fi
+
+	insinto /usr/share/slim
+	newins "${FILESDIR}/Xsession-r3" Xsession
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/slim.logrotate" slim
+
+	dodoc xinitrc.sample ChangeLog README TODO THEMES
+}
+
+pkg_postinst() {
+	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "The configuration file is located at /etc/slim.conf."
+		elog
+		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
+		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
+	fi
+	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
+		elog
+		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
+		elog "support, as well as selection between sessions available in"
+		elog "/etc/X11/Sessions/ at login by pressing [F1]."
+		elog
+		elog "The XSESSION environment variable is still supported as a default"
+		elog "if no session has been specified by the user."
+		elog
+		elog "If you want to use .xinitrc in the user's home directory for session"
+		elog "management instead, see README and xinitrc.sample in"
+		elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
+		elog "accordingly."
+		elog
+		ewarn "Please note that slim supports consolekit directly.  Please do not use any "
+		ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
+		ewarn "and enable USE=\"consolekit\" instead."
+		ewarn
+	fi
+	if ! use pam; then
+		elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
+		elog "the console when restarting your window manager. If this is not desired, then"
+		elog "please remerge ${PN} with USE=\"pam\""
+		elog
+	fi
+}