version bump; remove old

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

6 files changed, 34 insertions, 72 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 23a9c0097542..dba5682cb84c 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2012/06/23 20:25:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.88 2012/06/27 16:01:19 axs Exp $
+
+*slim-1.3.4 (27 Jun 2012)
+
+  27 Jun 2012; Ian Stakenvicius <axs@gentoo.org>
+  -files/405579-fix-numlock.patch, -slim-1.3.3.ebuild,
+  -files/slim-1.3.3-xmu-cmakelists.patch, +slim-1.3.4.ebuild,
+  +files/slim-1.3.4-libpng.patch:
+  version bump; remove old
 
   23 Jun 2012; Luca Barbato <lu_zero@gentoo.org> slim-1.3.3.ebuild:
   Tested on efikamx
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index a8dfcb7accfb..cde2666898ca 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -7,25 +7,24 @@ AUX 252280-fix-default_user-focus_passwd.patch 328 RMD160 ca60567fc2f03403bbd60f
 AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e290f4d93 SHA1 dd8b782438bbdb86c44a4e1cb64bd8c3e3afefe6 SHA256 bd3221c9b94cc64ba6f4d786ec57a5d085f247b283cd64117034be15fedc5201
 AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
 AUX 346037-stop_setting_host_for_pam_ck_connector_so.patch 328 RMD160 62012df3cccf607d8cba139b0754a7238bfb1dd3 SHA1 04f26bc3ad82dab47c8911f3ac069b756fe5a1a8 SHA256 51bee429be20f2538b19b84c311b136761acdf2b857661af11749e45cc73ad44
-AUX 405579-fix-numlock.patch 438 RMD160 c6e6e94fcc716c61ac251c35fabb2ac4e9997638 SHA1 d043c6870bd83df554f8a0304d34348113ebbed1 SHA256 204fb0dfce0f5e2ca5c884c53cba419cc19177a0c27457603fbd7f4be3fb9104
 AUX Xsession-r3 4045 RMD160 538a23b1f0812fe2243d678276bced4ea03256a3 SHA1 b4deabb6795738cedca66f171e2fc504dc0cc96d SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af
 AUX slim-1.3.2-bsd-install.patch 1315 RMD160 290a7c31b077bce33b120ab55b9bdd3c6262d2be SHA1 a50d2e3e2810af82ab9bef058a72286734afd338 SHA256 bfb5a506b3baec6d24e6f0cfba34f045768bbccccc652af11199f30a7c45d843
 AUX slim-1.3.2-ck.patch 5249 RMD160 f1da27e5c477f2903f637b4852d1b2ca5f61fe57 SHA1 c94eebc268d1891a7606e8d8f63d1c6d1ec87c78 SHA256 6da435343ebd114b3d38335ed149fe193138cbeabf0712d26534dddab95c42d6
 AUX slim-1.3.2-libpng15.patch 247 RMD160 b28d9a376f4c01baa8b1aec0c5e0e76294997255 SHA1 3cd674e548f4e0aadbbd32a67b4efd1ed263afef SHA256 f84e3e4c069ec103a5f4ec2a60698bf9d035346b604dee59b6efc883c7f14042
 AUX slim-1.3.2-r3-config.diff 2736 RMD160 c570cf88acac9ac15bfb1caba025358564b4d13b SHA1 a79319663573c92b224d1d83b11747ca4d5a5a2f SHA256 cb5b95ae0102dc3625ec7b0f82103ababfd3ba97eeec107d9b034838a9ebc328
 AUX slim-1.3.3-config.diff 2752 RMD160 1320354013f0b1215a44eaa9758a80f36f2534dc SHA1 9587b0548c58c4f7fc8d868543c6adf8fb8e76c4 SHA256 f591f4dbf2f719e71fc9a8616dcba3e223f480297d2634f22a631ee99e732166
-AUX slim-1.3.3-xmu-cmakelists.patch 1069 RMD160 f78c4a1f63436ad73ca275a009e2b2fe4c281cef SHA1 92391aba0339b4b2f3bc165a30ab674eb846527f SHA256 4d5c08199d65097afcda96c6a6b717d3c1a5fda9be599988fc3b43293347f99a
+AUX slim-1.3.4-libpng.patch 376 RMD160 26d806f22e7c3486d14b075cf08c4133f64535eb SHA1 08f908b538436ec5abade5bab8f9ec63b49a4e8f SHA256 9f018c2ff2c0c1788ef59c6e17c66f71ba5ecdf22099c5acc79ae293c7b097c4
 AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
-DIST slim-1.3.3.tar.gz 226797 RMD160 d85f66df7239992b001cb37addc7f341a7042d12 SHA1 791635fc13ec859ed3be8bf1eb2ce0ba2bb3f155 SHA256 c15248d99c36cb45c66298b0797246d43cd851765536746a431a1533e48dbbb9
+DIST slim-1.3.4.tar.gz 227197 RMD160 df74883c6df34708ec9870aa767124a084ee6700 SHA1 70f1383bc8754b6b149c7b69d98ad0851c05081c SHA256 155c26460c98b9f0925624028b4254afc0de4fda33300f3ac45606b2c5cbd501
 EBUILD slim-1.3.2-r7.ebuild 4355 RMD160 0b5e6c6963d8a17de062a93eb777952abcf10b0e SHA1 630edece4d9d6e42c8fc27fef01ea21352620232 SHA256 1921922d422dccde2c71b54793ecc77b7b3d721b6c9156423b12a595caf68d04
-EBUILD slim-1.3.3.ebuild 3214 RMD160 bc27b6be147f7f622cd70958b57135899e92088f SHA1 efe3ae02f7bc8c39c0b714b26fe88cc4771f6e4e SHA256 ab3d9817b703476cf32315d43e8961526ce928de2cabf596d567cbe87f0d71cd
-MISC ChangeLog 13864 RMD160 da1d8124617e075f9ebe530031954db6d2badfee SHA1 2d6d096b6e120d07061a15ac0f43456ebb272a57 SHA256 b6e009668325584dd5f1a369361adfd6c7228b47313e38fafd27a5de2853522e
+EBUILD slim-1.3.4.ebuild 2980 RMD160 9cb09bf157d28ae89d3f4748ddfffbaf4040c348 SHA1 555990da0e1dbdecadbc5f952361dd029b78e627 SHA256 1fa3162f64621681cbe700cc1f70cf38c288e4610d08406c331a34672d59e607
+MISC ChangeLog 14115 RMD160 3c686cd238e9207c506309f15737be63017d7a51 SHA1 14f351ec650ff54bbb695b44389ad3186b2c5b85 SHA256 3f9b30543e94168736605c8ae285d304f3f6852905cb45d742a0c4882b5abf03
 MISC metadata.xml 317 RMD160 fcfaa261187ff694f4a90b78c82250387f85b375 SHA1 fec8ad82b63348fcabfae1082a661ff051d1b51a SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/mJk8ACgkQcXOrnRGRc47W8wD8CJayby8oBrlbIy408dYbic3F
-rMjRiXbFIsGBxXUOaNMA/i1e2XCRurqpVNcseQglMgjaIzSPTK+Moe11wsg43A2n
-=ReKb
+iF4EAREIAAYFAk/rLmwACgkQ2ugaI38ACPCg7AD9E+eAmOOY/iFFIhfaUesKTVow
+qvRP5j14JmEP11xRbbYA/2NgQY6E3/91r8Iln4Ji2ZkbNhvZ5lXS915F9IjJomW4
+=oexu
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/405579-fix-numlock.patch b/x11-misc/slim/files/405579-fix-numlock.patch
deleted file mode 100644
index 1e6ea7ec6176..000000000000
--- a/x11-misc/slim/files/405579-fix-numlock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- numlock.cpp.orig	2012-03-04 16:21:34.000000000 +0100
-+++ numlock.cpp	2012-03-04 16:24:49.000000000 +0100
-@@ -68,9 +68,11 @@
-         return;
- 
-     if( flag == true )
--        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
--    else
-         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
-+    else
-+        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
-+
-+    XSync( dpy, false );
- }
- 
- void NumLock::setOn(Display *dpy) {
diff --git a/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch b/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch
deleted file mode 100644
index 3ce99f242748..000000000000
--- a/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- slim-1.3.3/CMakeLists.txt	2012-02-21 18:59:52.000000000 -0500
-+++ slim-1.3.3/CMakeLists.txt	2012-05-10 11:22:51.000000000 -0400
-@@ -18,7 +18,7 @@
- # Version
- set(SLIM_VERSION_MAJOR "1")
- set(SLIM_VERSION_MINOR "3")
--set(SLIM_VERSION_PATCH "2")
-+set(SLIM_VERSION_PATCH "3") # apparently upstream didn't bump this
- set(SLIM_VERSION "${SLIM_VERSION_MAJOR}.${SLIM_VERSION_MINOR}.${SLIM_VERSION_PATCH}")
- 
- set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
-@@ -73,7 +73,6 @@
- 
- find_package(X11 REQUIRED)
- find_package(Freetype REQUIRED)
--find_package(GLUT REQUIRED)
- find_package(JPEG REQUIRED)
- find_package(PNG REQUIRED)
- find_package(ZLIB REQUIRED)
-@@ -143,7 +142,7 @@
- 	${X11_Xft_INCLUDE_PATH}
- 	${X11_Xrender_INCLUDE_PATH}
- 	${FREETYPE_INCLUDE_DIR_freetype2}
--	${GLUT_Xmu_INCLUDE_PATH}
-+	${X11_Xmu_INCLUDE_PATH}
- 	${ZLIB_INCLUDE_DIR}
- 	${JPEG_INCLUDE_DIR}
- 	${PNG_INCLUDE_DIR}
-@@ -158,7 +157,7 @@
- 	${X11_Xft_LIB}
- 	${X11_Xrender_LIB}
- 	${FREETYPE_LIBRARY}
--	${GLUT_Xmu_LIBRARY}
-+	${X11_Xmu_LIB}
- 	${JPEG_LIBRARIES}
- 	${PNG_LIBRARIES}
- 	)
diff --git a/x11-misc/slim/files/slim-1.3.4-libpng.patch b/x11-misc/slim/files/slim-1.3.4-libpng.patch
new file mode 100644
index 000000000000..57b39272b620
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.4-libpng.patch
@@ -0,0 +1,14 @@
+--- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
++++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
+@@ -781,7 +781,11 @@
+                                 (png_infopp) NULL);
+     }
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++    if (setjmp(png_jmpbuf((png_ptr)))) {
++#else
+     if (setjmp(png_ptr->jmpbuf)) {
++#endif
+         goto png_destroy;
+     }
+ 
diff --git a/x11-misc/slim/slim-1.3.3.ebuild b/x11-misc/slim/slim-1.3.4.ebuild
index 4f26ad9bbd2f..4105b8883706 100644
--- a/x11-misc/slim/slim-1.3.3.ebuild
+++ b/x11-misc/slim/slim-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.6 2012/06/23 20:25:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4.ebuild,v 1.1 2012/06/27 16:01:19 axs Exp $
 
 EAPI=4
 
@@ -34,9 +34,8 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 src_prepare() {
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${P}-config.diff
-	# Bug 414891
-	epatch "${FILESDIR}"/${P}-xmu-cmakelists.patch
+	epatch "${FILESDIR}"/${PN}-1.3.3-config.diff
+	epatch "${FILESDIR}"/${P}-libpng.patch
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -46,11 +45,6 @@ src_prepare() {
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
-
-	# Upstream bug #15287 (still not fixed in codebase)
-	epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch
-	# Gentoo bug 405579, Upstream bug #18552
-	epatch "${FILESDIR}"/405579-fix-numlock.patch
 }
 
 src_configure() {