x11-misc/slim: Sync with upstream

Rename r99 to r5

4 files changed, 68 insertions, 19 deletions

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index b4946db2..3a81efa2 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -4,7 +4,9 @@ AUX slim-1.3.5-disable-ck-for-systemd.patch 3303 SHA256 e309716a177bcff758f2e5b8
 AUX slim-1.3.6-add-missing-libgen_h.patch 323 SHA256 a8637ff009441e763f4dedf28db5663661ba25a798288238b0cd503a43898bf4 SHA512 c69937c42abf0c5959af7f0291af1608aa4a39a107f1a11e36f262b79e72537ca8aa69af03f3b637b6e6e2c440887990b5c5065863a7357f27009fc6e82a851e WHIRLPOOL 1cd94b031879204dc97f95324509a6395e4284e60814b44193156c426088819a3e2092cab5eac0c27ab4e0b128b31415f97ea99be73e8899b2b4c12c3f2a9f94
 AUX slim-1.3.6-config.diff 2934 SHA256 5f7f1fcd6d0d28a4060b2360fdbd0489dd3884087596786ce3f31615098d1840 SHA512 afee976f30f563ed97187f40cdd618159545d7850e8af15bd5b30306c347cf8e5276c6c16938ce094bb589dcab8d88d5c368f7267dbe3f794a18f734f69ddf10 WHIRLPOOL caf3eac08c415e6370a1e0c4077137ccf4763c761a91d130648d9edbbcbb2ced2723c4a5dc4498fff4b3f410b7b6bb21b6f0c3882043aa25ce0941d37a5905cd
 AUX slim-1.3.6-drop-zlib.patch 309 SHA256 d90ead30ef02aa4e0f6fcc9b23c248522409749338972c8d343880e66478ac8b SHA512 2aa62e5b7ad67df47009e4cff0b34b8ff6116e9d3d23194c8199ec06356fbf0660df6b807e530075d3dc5aa8e04dda29e7a6e1337212b58e3bae09e9543c0c22 WHIRLPOOL b16da43ede2991bc14af3063d187301e93c29deb96c336a7558caeabcc5ba92bf425512252e170ee45f48dcbb2837e0c46dd7c828ad1943e65b3100df3dd18b0
+AUX slim-1.3.6-envcpy-bad-pointer-arithmetic.patch 583 SHA256 8965ea24c0864881713a4548fe10bd24e885e94a441c17ddbf94fbe2872fb1ea SHA512 cec2a82cc57a3dc3eb67a40becb9ef562d1fc0c2e962cb0cdddf978d776c8139f616647e3ab25255a616d3b17ff3f67ecaf4d7d92fa6af8aaec3ccf30efdde9c WHIRLPOOL c9df1bd8d5b1fffebaf3f4cf8f729b2ce07e5e02fcf9866a8f16c3da311811fa3fb1fdb87546a5e4a39fde88499af3c0fb5b04eda6ebf92c260bba83af2a700e
 AUX slim-1.3.6-fix-slimlock-nopam-v2.patch 839 SHA256 7ee18c47e3159145be99b16bc2a8c56543043be17ff4527e581cf033a0b4d42e SHA512 2251cd96801e593b387037d79014ea86fdec223d8910628fbfd0e9c5eafbe79c27ffb7f08123c89b635d33dc2bf9cf76e2964f5293352784c1e08c7b1c7427c0 WHIRLPOOL ec303bf8a764e0445726df941d1e09b94d0aaae522f43146dc3a5fef4ad197f0bd654d081489f51a7ed0cbbf30fe8954abb1f5ff5066e4ca69bbb04e21373c54
+AUX slim-1.3.6-freetype.patch 426 SHA256 8bf59d9d4ebbf629f524331fa0389937ccbe1074a5e7d8eb1cfed4264986669b SHA512 e7181993d305b5dd2d27c9c44ffa944c07a5fc9342c70a12f2f8283dff61db7ee3dc8aac50a566104dfb50ae06777b52835a4a2c3e19ad0e82b22a9487cd71aa WHIRLPOOL cd96fa2d38f55b470571d42e67d22f4a5660d5ff7b77e9e934c613a5141424305297a7dca5d03ea3a5cc4de60a339e7b9a63e3861e664642301e3e342ed46dc3
 AUX slim-1.3.6-honour-cflags.patch 499 SHA256 7a19c872c2f3a290a74df246cdd3f08126f7ce46e63fb5074a326b81adb805bf SHA512 bbc99d396d30e034100e468d8d5a69cee3bc26eb6029793bdb95f29bd6364f680baec13e12e9ca7dcf01d84de3d8d45712462de36f6f729c7f8c232865a71a7a WHIRLPOOL 96941218006cd2d91efca231f9f2917431a1aa4e0afd31137809a90efb4e69122addf5257aff76b2b345606fa44b8593d9b3bb9d01125a83f751ea6f5945dc48
 AUX slim-1.3.6-libslim-cmake-fixes.patch 852 SHA256 9565d206e0e34000975e59afbd2bc3de74fd3f590afdd9e34d0125cb3f12c75a SHA512 457e23e193c6b9ecb5335accad444470ffb2e0109550d041385bba2b6036fdfac8d48e031574e4229d8b8768a7a86f6d6c191b214540f1156a2a13e5a9f3451f WHIRLPOOL e712e7b829da0cc3113a7cc69364045467c89fa05a52b36ccc2393a708840f36108088088500485e251c9765eefd0485462876fb14ca15db09c49a7f63a81cad
 AUX slim-1.3.6-session-chooser.patch 3994 SHA256 3ee06061b10f42925cbd33ca25af1e870d4462be54c34e409fbe7b8f3bafa20e SHA512 7227fa0210d7870971870409da2d86d9f239ae285dde116e2b2d817318339fb51324bd11d04dc4c26a2ca3c1e5a0f0686987eab7042265389fb2f60cc7d37a45 WHIRLPOOL 594651c89d95210b28e8db7b7da547ab3009678be8312d8f94f79c71008aa7d4c3f2f02b71ce0624f400e84399a779b4544ac5523529255209c8e2f9a27b8f1c
@@ -12,5 +14,5 @@ AUX slim-1.3.6-strip-systemd-unit-install.patch 474 SHA256 01e02399cad7f223233e7
 AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c642497638aa1707234d8595e58adee3e SHA512 df653a31bd2b0d3bb5b09d700d89d6b4c444b3ef49dc6d5a0646cab5480841a76ecb1c3bcd45b602eb0d2000971a5ef576eac63de67907769ea23b6925329635 WHIRLPOOL 7557d7afd65ad3dd232656f05f1da7735668c1bb55125b1c833c55f9e4ea1411dcbfd8a104cba0d4d0f94aecd29a9f36d56c06515464e78da772e2ee304019db
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
-EBUILD slim-1.3.6-r99.ebuild 3697 SHA256 63cb91413b38e570571006bbd5330ad16cd0a0cfa20f47b1d873134d5628e0b3 SHA512 376a874374f1d8cf40a4f3f0954a75619cd907733e20ea2dcd6ef657504745820f03a60b7d5f4135d61ca11af557221bde661ba1cb52e96cb6827bf68a74ea6a WHIRLPOOL 1cf2f19e9f83339477754eab4058b64e1ea35ae6db974b04bf7808e6498a0df9c8ee95a591e5ec284acd2527903369381d91f0474c2922dbe611247553a4107e
+EBUILD slim-1.3.6-r5.ebuild 4275 SHA256 8895a1c93a9b8bc04f4894785450371e5e162c7e432e1c16ca09cfabc38c86a9 SHA512 df9eb74a93be678f1c14df864c3c1fb19b8d08a02bbe9c674269fcda3079531133e5ece1d8e0b21c5d6ddf44041629a9515a23ba00bc35dbfd30d3e4df08939f WHIRLPOOL 746d9086c236fac7ea26047ae974f6a02494eb264a9a8e7f7d7959196e481e090e47c8cd49f4dbb0b89a4d7ab0434213a9d937d33581faa0a0230d2643d65049
 MISC metadata.xml 514 SHA256 8096ec96a71df42b3dad271816d305140ad3dc67321778a300a8d3876a4fcb0e SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950 WHIRLPOOL 695802103c841ee6ae60fe8225e6eefbbeae6ed65d7dcf51b249a77c3ef1339e485f29c60ddd4f392aa9e524fe97e5e9a7ed519c262b62fd67b52d0836265e60
diff --git a/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
new file mode 100644
index 00000000..b3787dd5
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-envcpy-bad-pointer-arithmetic.patch
@@ -0,0 +1,15 @@
+--- a/app.cpp	2015-09-14 12:00:00.460481656 -0400
++++ b/app.cpp	2015-09-14 14:41:10.970536588 -0400
+@@ -606,9 +606,9 @@
+ 
+ 		n++;
+ 
+-		child_env = static_cast<char**>(malloc(sizeof(char*)*n));
+-		memcpy(child_env, old_env, sizeof(char*)*n+1);
+-		child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
++		child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
++		memcpy(child_env, old_env, sizeof(char*)*n);
++		child_env[n-1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ 		child_env[n] = NULL;
+ 		}
+ # endif /* USE_CONSOLEKIT */
diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch
new file mode 100644
index 00000000..8cefc0bf
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-freetype.patch
@@ -0,0 +1,12 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig	2014-11-11 20:38:40.706121207 +0100
++++ ./CMakeLists.txt	2014-11-11 20:39:34.206120264 +0100
+@@ -165,7 +165,7 @@ include_directories(
+ 	${X11_Xft_INCLUDE_PATH}
+ 	${X11_Xrender_INCLUDE_PATH}
+ 	${X11_Xrandr_INCLUDE_PATH}
+-	${FREETYPE_INCLUDE_DIR_freetype2}
++	${FREETYPE_INCLUDE_DIRS}
+ 	${X11_Xmu_INCLUDE_PATH}
+ 	${ZLIB_INCLUDE_DIR}
+ 	${JPEG_INCLUDE_DIR}
diff --git a/x11-misc/slim/slim-1.3.6-r99.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 945ac37f..459a7392 100644
--- a/x11-misc/slim/slim-1.3.6-r99.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,12 +8,12 @@ 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"
+HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
+SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
@@ -36,17 +36,19 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 src_prepare() {
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff
-	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
-	epatch "${FILESDIR}"/${P}-honour-cflags.patch
-	epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
-	epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
-	epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
-	epatch "${FILESDIR}"/${P}-systemd-session.patch
-	epatch "${FILESDIR}"/${P}-session-chooser.patch
-	epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
-	epatch "${FILESDIR}"/${P}-drop-zlib.patch
-	epatch "${FILESDIR}"/${P}-add-missing-libgen_h.patch
+	epatch "${FILESDIR}"/${P}-config.diff \
+		"${FILESDIR}"/${PN}-1.3.5-arm.patch \
+		"${FILESDIR}"/${P}-honour-cflags.patch \
+		"${FILESDIR}"/${P}-libslim-cmake-fixes.patch \
+		"${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch \
+		"${FILESDIR}"/${P}-strip-systemd-unit-install.patch \
+		"${FILESDIR}"/${P}-systemd-session.patch \
+		"${FILESDIR}"/${P}-session-chooser.patch \
+		"${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch \
+		"${FILESDIR}"/${P}-drop-zlib.patch \
+		"${FILESDIR}"/${P}-freetype.patch \
+		"${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch \
+		"${FILESDIR}"/${P}-add-missing-libgen_h.patch
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -56,6 +58,8 @@ src_prepare() {
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
+
+	epatch_user
 }
 
 src_configure() {
@@ -87,15 +91,31 @@ src_install() {
 }
 
 pkg_postinst() {
-	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	# massage ${REPLACING_VERSIONS} to come up with whether or not it's a new install
+	# or if it's older than 1.3.2-r7
+	# Note - there should only ever be zero or one version as this package isn't slotted,
+	# so the logic doesn't worry about what happens if there's two, due to the case where
+	# a previous emerge attempt failed in the middle of qmerge.
+	local rv=none
+	for rv in ${REPLACING_VERSIONS} ; do
+		if version_is_at_least "1.3.2-r7" "${rv}" ; then
+			rv=newer
+			break;
+		fi
+		if version_is_at_least "1.0" "${rv}"  ; then
+			rv=older
+			break;
+		fi
+	done
+
+	if [[ ${rv} == none ]]; 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
+	if [[ ${rv} != newer ]]; 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"