revbump and patch adjustment for build system to fix bug 488388

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

4 files changed, 29 insertions, 11 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index bc31bb0a8625..38ed17e74e67 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.118 2013/10/17 14:02:00 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.119 2013/10/17 18:39:31 axs Exp $
+
+*slim-1.3.6-r1 (17 Oct 2013)
+
+  17 Oct 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/slim-1.3.6-libslim-cmake-fixes.patch, +slim-1.3.6-r1.ebuild,
+  -files/slim-1.3.6-lib-linking.patch, -slim-1.3.6.ebuild:
+  revbump and patch adjustment for build system to fix bug 488388
 
 *slim-1.3.6 (17 Oct 2013)
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 8a18aa42ed0e..b658b187d2b7 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -8,20 +8,20 @@ AUX slim-1.3.5-disable-ck-for-systemd.patch 3303 SHA256 e309716a177bcff758f2e5b8
 AUX slim-1.3.5-honour-cflags.patch 445 SHA256 fdac5dfd24d853af0dc0dc49857890455fdb682097db60f9826ccb8584522e13 SHA512 82e16d6ffa7291b00b6078e960b35352658deff7833bb05d00c80202588856b06678e5d7a09e1166152920dd2dfb3eefb4ea5f084976bc346bbf09489832acbd WHIRLPOOL 84b773c1b0b41d1d6b55f55669b8db4d6f40c4886d99ca6983f28845c2b8db80c807c54929f79da1d4139126bb1c95a159f98189fdb5332a9f0750571ad15dd3
 AUX slim-1.3.5-systemd-service.patch 430 SHA256 3dceb91b4d5f6cc086116530e4c261b6984d73e39dfdf132f4201b1ab0c68a98 SHA512 0a83cdf71c9aa521598ffdfda79deb7750e71585d9b7f54f956ec4219039ceb249de2a4f1a7af312a0e3535a24829cf24edddbd1340b30f02d23d817ffb2a223 WHIRLPOOL c19683aa5aedb2758ce406b5ba561ee69f7b4a8565733399ece6169dedd19991d071e6912a4d006dbc9dc07976185fedd82dd6340c112c1238407dc83e335497
 AUX slim-1.3.6-honour-cflags.patch 499 SHA256 7a19c872c2f3a290a74df246cdd3f08126f7ce46e63fb5074a326b81adb805bf SHA512 bbc99d396d30e034100e468d8d5a69cee3bc26eb6029793bdb95f29bd6364f680baec13e12e9ca7dcf01d84de3d8d45712462de36f6f729c7f8c232865a71a7a WHIRLPOOL 96941218006cd2d91efca231f9f2917431a1aa4e0afd31137809a90efb4e69122addf5257aff76b2b345606fa44b8593d9b3bb9d01125a83f751ea6f5945dc48
-AUX slim-1.3.6-lib-linking.patch 607 SHA256 fda525d42665c543086e14827be7b5fa1b23ec862a00dafb58909f3aab7d3f98 SHA512 da22a34dc83f9f7cb18f0d805b0b380c7a2cd573cafde66fcf2a46123500b56ce926236c8b104fd0020b1174de87f7ad6b48447595ec2624f37186af4848e2d8 WHIRLPOOL daa20bda23a0ab41bc9af1fa8f4cd3e25ecb756d79eef54f1d6910818f816f7b281e038f378c0b0eec2bf84c9a3c273cab2243bd636451f475dc834c199a8541
+AUX slim-1.3.6-libslim-cmake-fixes.patch 852 SHA256 9565d206e0e34000975e59afbd2bc3de74fd3f590afdd9e34d0125cb3f12c75a SHA512 457e23e193c6b9ecb5335accad444470ffb2e0109550d041385bba2b6036fdfac8d48e031574e4229d8b8768a7a86f6d6c191b214540f1156a2a13e5a9f3451f WHIRLPOOL e712e7b829da0cc3113a7cc69364045467c89fa05a52b36ccc2393a708840f36108088088500485e251c9765eefd0485462876fb14ca15db09c49a7f63a81cad
 AUX slim-1.3.6-strip-systemd-unit-install.patch 474 SHA256 01e02399cad7f223233e70c255956aff809aa16d416c3e1428d171e0a810c576 SHA512 377b1443c700ab6697b2087affed8486d9661de8794355e134a78125695a22e966927f26296e6330b8f4e7a600e9d21bca034dbc2d5445171e05618a2bfad55a WHIRLPOOL 5aef1e500930710b3cfe042078c3916d361800c61aac9813c56cd64d654786afb67a9f9357c0e1ffede6f5a65068c837767aca8f6fdddeb7935bdcd5e4b4ca9f
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 DIST slim-1.3.5.tar.gz 226413 SHA256 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 SHA512 09757dc115488efd883eeced70ddb7d13afca0738e9cc531b2a66065e55eef52a3f67f5352365f7b9762b75132be4eb18bcbb12d47b3f79bb9ec0e0e2f62d85e WHIRLPOOL 61742167f8c732719411c58d8358a065800db828dae4fe94aad3690ba3f70bd9c57476ea21d09298a96c6236cd5308e83398ba36b43f46aa729363eccb4367c3
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
 EBUILD slim-1.3.5-r2.ebuild 3322 SHA256 43e81db9d02fa480e42a8f9c8a4d1c318b8402200b448e06e9f49ce76468d560 SHA512 74f5f5d5f7e37ef85dfd53baf9f23a28024a58ba89985b0d5c841a8329bcb66453b03c0ae1f7f767304bd56d98f3b471735ac837f51d18fd38eeee532b5ebfd6 WHIRLPOOL 1428cfba3bfa62ce70461b45ce470d96ca8dbc1e9980c84e285553e54c987fd31aa5af0d007ffc283ccfb9032392d92ccc52efea88bbff785dd23a5adcbd72dc
 EBUILD slim-1.3.5-r3.ebuild 3379 SHA256 e63629fb37234a10d89afc0272ef9f300c4349ad4282a7bd436b40459a5c9e22 SHA512 96958594f9062f5a5bac5ea590a29eefcd20dfd168fa96b7ff87bf1023a25ef0aa118b1d9b2010d3a0bb9f1cf756ab4a45e3891c94377170a349f8349ce66cc9 WHIRLPOOL 521d3111771ce1287e7bc9d70b2ec285ff8eca69c75f3a0bfca69b01a84607d88f48b0195100494aff2e6a36f5d04cdfdeb0e70320b64d765a6efc5f8a28d5b3
-EBUILD slim-1.3.6.ebuild 3504 SHA256 d0a3eefc8f2d202ef89dd7fdee88677e1a25bec5b21157bd7eababf572ef0494 SHA512 6f256a0651de6c9dafa08f54c93cd870881a9c339f61230b1ec73e2ebb13d20f168831deed101ad4c07336db99cc87902e89cf74a5bce1c09104781982e97a94 WHIRLPOOL d0dbb1a3cfaebde4bb0000473459527c3a0949e8070703d38067c594fa6d77c322db0b44dc9a56354817da883025b8f5d6885ad3aa202b21392f8a5aac093953
-MISC ChangeLog 19082 SHA256 5b7c056a3b6ee1b15e56404d0fe44f6f921a855b5158f48ca2eabbf8e773d3ff SHA512 610798509df1ee72a95f5ab8a5b77ef2c8b55ada14d3c724087c36556e42b948a06e487acade32765d92be7a3d8e3dc2e73e8cb4cd88df51fe48bfec0d67e836 WHIRLPOOL 630f0bfb18b01a44209e824bd2dd159a5fa12decf9197d3d9e1173bb3c041b3dd737325f2bc64c5b34296f0260ea4f621be1f9a9187a27b7b959d75a1d036dd9
+EBUILD slim-1.3.6-r1.ebuild 3515 SHA256 4df027512c5b8a64fbc4b6fe94a1f0df57915950d5c5404deca5e00f8d738a1b SHA512 801080204c97949ee9f88f610af01f1c69a7c0c906f4eecbcdd3ae5ef81b6dee0c492901e2ce6db663c626baa407b30fe129e269eb41511cd4dd796c5b871d9f WHIRLPOOL 6ccfa46be68e9b2af3639f102a8f1f1ccb67574c3886e25b52429abd4a1e2cb3dd43ae28615ad2c9f7dc35e3d629e08276fbc953904cc309e56901f678445e4f
+MISC ChangeLog 19357 SHA256 4f4e5fd0af0532763c4faee7405656b3ef5afa13e94d76f56788d225d47fb659 SHA512 580a6af606c3bd78060aa663f8d6a1007fdd8a947f9d7497085740029fa33d3d7a7cf14ff2f7d9c385024fac52adf2758d56a7045743742e3228ac54169b6b0c WHIRLPOOL 0e65b5a57dd136686e2ab665d681f54e7fcb284f43e27f429bdcfb6f7a4fc5fb04381f5ff0c8d08368dc8174c9a80de086d0af5b522605eeaf1879c6e07a2bde
 MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJf7d8ACgkQ2ugaI38ACPBItwD9G/O7j3/WpWKVmnXMKF6YUMXX
-LYzAMYphUF30EfipE7MA/2egVdjjYOSyGxxbnKqKIDIAxJ2AMhU/K43tIM7Ngu0l
-=0NEE
+iF4EAREIAAYFAlJgLuoACgkQ2ugaI38ACPCGEAEApRUuMJ3t5d5rauUIB7/psJOG
+uTPNaoLT237GWUDVZfMA/3wdyIvf/i3/xlsCsXUck4mvnMZvNeXA6nFdtf0jSQjK
+=bZbh
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/slim-1.3.6-lib-linking.patch b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
index ab108982c7a5..11e39dc97628 100644
--- a/x11-misc/slim/files/slim-1.3.6-lib-linking.patch
+++ b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2013-10-15 11:35:16.688739802 -0400
-+++ CMakeLists.txt.new	2013-10-15 11:53:46.185727620 -0400
+--- a/CMakeLists.txt	2013-10-15 11:35:16.688739802 -0400
++++ b/CMakeLists.txt	2013-10-15 11:53:46.185727620 -0400
 @@ -115,6 +115,7 @@
  		message("\tPAM Found")
  		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
@@ -20,3 +20,14 @@
  	${PNG_LIBRARIES}
  )
  
+@@ -228,8 +228,8 @@
+ 		SOVERSION ${SLIM_VERSION})
+ 
+ 	install(TARGETS libslim
+-		LIBRARY DESTINATION lib
+-		ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib${LIB_SUFFIX}
++		ARCHIVE DESTINATION lib${LIB_SIFFUX}
+ 	)
+ endif (BUILD_SHARED_LIBS)
+ 
diff --git a/x11-misc/slim/slim-1.3.6.ebuild b/x11-misc/slim/slim-1.3.6-r1.ebuild
index 05108fff1d3c..102f370f39b2 100644
--- a/x11-misc/slim/slim-1.3.6.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6.ebuild,v 1.1 2013/10/17 14:02:00 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r1.ebuild,v 1.1 2013/10/17 18:39:31 axs Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
 	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
 	epatch "${FILESDIR}"/${P}-honour-cflags.patch
-	epatch "${FILESDIR}"/${P}-lib-linking.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