Version bump to 0.4.6.1 which includes the segfault patch. Remove old ebuild

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

4 files changed, 25 insertions, 49 deletions

diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog
index 1b3d37b2bd8e..83b8f22e0a64 100644
--- a/lxde-base/lxsession/ChangeLog
+++ b/lxde-base/lxsession/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxsession
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.32 2011/07/27 14:14:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.33 2011/07/28 07:13:46 hwoarang Exp $
+
+*lxsession-0.4.6.1 (28 Jul 2011)
+
+  28 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
+  -lxsession-0.4.6-r1.ebuild, +lxsession-0.4.6.1.ebuild,
+  -files/lxsession-0.4.6-fix-segfault.patch:
+  Version bump to 0.4.6.1 which includes the segfault patch. Remove old ebuild
 
 *lxsession-0.4.6-r1 (27 Jul 2011)
 
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index e74c2a210f00..e3e62a5c06f7 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -1,29 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX lxsession-0.4.6-fix-segfault.patch 788 RMD160 1a580e4a2b5da1de7e23a904f59847b69fb8fa02 SHA1 bbf70b0d938c8d9e322e3c23246f456b2e58100b SHA256 a87e1105cb26e2da64635529091259fdf772d0e8073a54335ae3fff70e9cb7de
 DIST lxsession-0.4.4.tar.gz 245804 RMD160 86225d6759f85cbe20c6bcbf06843847076cd424 SHA1 e76d437abb111bda2b83cc7de541790bcbca0c17 SHA256 5d9304697fbc872f34e60728d046b10a0f41322099be828bae461b6b9ab617f8
 DIST lxsession-0.4.5.tar.gz 259755 RMD160 49fa3d1b282a3508304502eb3b0b93f0dc8dc239 SHA1 e66fd5d1f239f4cea6195218fbfab7bce19cd884 SHA256 f65625a491f4d7aee24f1fb0e183a6abc9bd31a5fa8411eac125b2d00adeff15
-DIST lxsession-0.4.6.tar.gz 407058 RMD160 e5a27de5b8fb6f3b86baa1f80e22dcf477a2e6c9 SHA1 5f1dd16b15265484554a7a6be4ce0649474f4bdd SHA256 0abc8884be26641c9057bb21676c56e05ed076ef17ca863b429c5f27caf75eaf
+DIST lxsession-0.4.6.1.tar.gz 407100 RMD160 97c0c88abdb81c22ec356371c4b7572cd715608f SHA1 ef7f74617f7555f3e292b670099ef44389a9a849 SHA256 bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1
 EBUILD lxsession-0.4.4.ebuild 718 RMD160 f550f4ce49269c4e0465942dd8e6bf5c54a1f34c SHA1 e945e9e80e61f50e1c5ed293583b0d3c1cbd2bda SHA256 e6ac1dd8bab198f98ed01e9d832ce059a68bfe591a79826cd6ff681e28b25586
 EBUILD lxsession-0.4.5.ebuild 960 RMD160 0d9a67c57147574a73edcb89e7126cbfeec2eccf SHA1 6155406bc94b06c0145961d39baa56c3589b6798 SHA256 b902394625353dcdb0a5bb847cd5ea21af99af4851a68adb926378e9f6bd293e
-EBUILD lxsession-0.4.6-r1.ebuild 1035 RMD160 fbddd8f4eb07e2ea2fab870c660a84ef1a354e71 SHA1 8d26c709f78a5147b3210e4f6bba6533fc68b14c SHA256 8b91c2edb75a9f91a4d804c61c2578dd9e4c0e82c500ae86e0b83e9d45e335df
-MISC ChangeLog 4519 RMD160 045b0aa20740888a36f22bfc0eecd9072535c667 SHA1 bf708084380c305603e5dd0aa1e9b7ace0872516 SHA256 f7c400d808559ae15b1557e6872f746b96efc653237274d51e701ec87fda66cf
+EBUILD lxsession-0.4.6.1.ebuild 953 RMD160 6f5f2ee5ec546ec30eeb87184d86e413904ce32d SHA1 26b79f6b436eb86a4b0f95e965a1cdacc2bc3d13 SHA256 70686132dda3a9a2162598e484b84710db206d5883f5a4be9bbb4daf11ff8e7e
+MISC ChangeLog 4788 RMD160 82b33a3d31dbdaae9d7377224ea94cd375414659 SHA1 9ef6528fea35a8bdbdc2f53084ccadba613ed798 SHA256 1f807ae6eb1ed61c53c1fc3604642568040cde63ad7e8cbeb0479c3fd60972f8
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMB1JAAoJEPqDWhW0r/LCDRsP/2ZYeCJwl87yZb5cM729sUK+
-TGBJwkZU4Q2ZhFST8oZw6mD6WZ0rSQbrDHYux59439rrhi9SRO/DQi08AH+q1xLd
-2FBwvnOqRd0uHUwUqWdyVC4LmLr1F61AvyY5SQDGs12deWLZh7zgoR1/YvmTRqzT
-UfgtCjiV+1zIITT5NCbz+bX+XbV3AEXCVjM9h8U8SGqNoTSBIk7Yq11q5DpHZo7/
-LV7puSDAiZpsJe6glUr6UBVNpul+PP0BnU4JoLEsBiI8jVV6PvR44e4As/8JBtx3
-fhZEWSDguC0KWCOwHce0xx/Q0sKeuXibSPoD1TEASHGkuILPkYigdNtAfL/Zrqx+
-ETtlvfCRlXXwwmmKfJT5c3sdw3TEZJAuA3wKR7DcykI6nfqjKkOG8t4UQbvbqBzn
-B19d/GpKIdgEuiMKknOobOWNL4rYaTLB9g9IFIU+WzQN//ZGxltL8IpfrJOiERxM
-DbQ59hodpSwIqLZiC5m35NjVBx/Lc5oJ0irZsnC7WzX0in/xDI2beN+QGEVcvS34
-rfj8h4wC+w5s405e/PKGuIn4p0riAtRhsOlrpL8hiCZkqa7EGtagpLEe5I1wlINB
-TkgRTiiO3dQKWAdAx8yk68294lZHKabWPcKqCEMMxKUTUF9lixO0b/TvEO6a5wpT
-hCtqWdjsnSB4WuJ4Xb4k
-=dr0t
+iQIcBAEBCgAGBQJOMQwjAAoJEPqDWhW0r/LC0MEP/3Irg9fw1JUvSox+zocw5o/Y
+78BIE0RbZ8gadMrmdEuQULxsw8DpxbLOkoxTihrzqRJcT+qDfqrXiOrFMQMFqBnd
+VqfPR05UzYrLVLutyAMOy1sawz2e7wGqGERVVNOauGBXlT6jnGxRZH/pVPL+r6OT
+bLlHWste+eaCJ8IPzOPlbwHin//9+UMMbxJ6gqANkshGcYpXAnoVH/LikLogkpVh
+HwfYyTuEfONd728S7hJ2QeW5J5nJ96NNLMxbXOaT2OvP6WrRuI32qFIzNj3iA3l/
+poGglHW7Z+8Q2DkvKeYjcpVqkJip3aU3FXRzo1GmREhclrHutm6DdBQfIjU3iltR
+KTuNkgNy+dwLTPpTt0+8/p+3rlGfGLDj8Q9U9fq+44+7NzwUTRAjP1ItFFxXdFjK
+turZ/b9AfOo6JHgQvk6R06hz6mBS5JglX02jg8zzmHNYaUsO/xFKEeNa+vkBVn93
+vzBpm22DC6kPNho0gBl8GslR4EWvlva80kPdQjW5s92ZMPDdosfgozEQMZ2m8YZe
+TrIStXmJyc3uywxhArj5vduN5sBxjWGQsbjBiNRGJFcRCNNzmHowvOS3RVIcUZnL
+RcqrrDjaexmDFHuvxTu2c+JB3nRT9YyW3Aku1WQKqzzVWj1/QcDe6d+IVJ/sCg41
+9dcLrgK814vqzarfFsVL
+=YbPv
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch b/lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch
deleted file mode 100644
index eb903ba204fb..000000000000
--- a/lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 82e5901fb68acfead807b8e824310edda2437744 Mon Sep 17 00:00:00 2001
-From: Julien Lavergne <julien.lavergne@gmail.com>
-Date: Sun, 24 Jul 2011 01:14:03 +0200
-Subject: [PATCH] Fix crash on start
-
----
- lxsession/xdg-autostart.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/lxsession/xdg-autostart.c b/lxsession/xdg-autostart.c
-index 39f0d2a..b0f922a 100644
---- a/lxsession/xdg-autostart.c
-+++ b/lxsession/xdg-autostart.c
-@@ -283,7 +283,6 @@ static void get_autostart_files_in_dir( GHashTable* hash, const char* de_name, c
-                 path = g_build_filename( dir_path, name, NULL );
-                 g_hash_table_replace( hash, g_strdup(name), path );
-             }
--            g_free( name );
-         }
-         g_dir_close( dir );
-     }
--- 
-1.7.0.1
-
diff --git a/lxde-base/lxsession/lxsession-0.4.6-r1.ebuild b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
index 23b2650e1194..d6a58e8d6385 100644
--- a/lxde-base/lxsession/lxsession-0.4.6-r1.ebuild
+++ b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6-r1.ebuild,v 1.1 2011/07/27 14:14:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6.1.ebuild,v 1.1 2011/07/28 07:13:46 hwoarang Exp $
 
 EAPI="4"
 
-inherit eutils
-
 DESCRIPTION="LXDE session manager (lite version)"
 HOMEPAGE="http://lxde.sf.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
@@ -28,10 +26,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	x11-proto/xproto"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-segfault.patch
-}
-
 src_configure() {
 	econf \
 		--disable-dependency-tracking \