Fixing missing lxde-logout icon, patch thanks to Markos Chandras <hwoarang@gentoo.org> bug 380043

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 37 insertions, 24 deletions

diff --git a/lxde-base/lxde-common/ChangeLog b/lxde-base/lxde-common/ChangeLog
index f467c85c1b80..1e3f7856c518 100644
--- a/lxde-base/lxde-common/ChangeLog
+++ b/lxde-base/lxde-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxde-common
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.25 2011/08/03 09:32:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.26 2011/08/28 21:22:30 vostorga Exp $
+
+*lxde-common-0.5.5-r1 (28 Aug 2011)
+
+  28 Aug 2011; <vostorga@gentoo.org> -lxde-common-0.5.5.ebuild,
+  +lxde-common-0.5.5-r1.ebuild, +files/lxde-common-0.5.5-logout.patch:
+  Fixing missing lxde-logout icon, patch thanks to Markos Chandras
+  <hwoarang@gentoo.org> bug 380043
 
 *lxde-common-0.5.5 (03 Aug 2011)
 
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index 07911011c482..e33a0b14f329 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX lxde-common-0.5.0-desktop-icons.patch 321 RMD160 82991e034b370ae210482cbdcdc02dd18999c623 SHA1 9389d688a967a4aa9a7d4e24e052c74a07a194a2 SHA256 9782b33a9ae0af28b4ec40f1234583de68062a9a52edfe6b7c61287a46f4e26c
 AUX lxde-common-0.5.0-session-fix.patch 455 RMD160 37de48c1dbc492f57121576551552846f9fac72d SHA1 db00750b7a899e77ef0ea75ae4484e2fa98a6d90 SHA256 927c3383337a79f50445ae633a4a4b0560a238b3fa701fbef65363d5810b9cb6
+AUX lxde-common-0.5.5-logout.patch 415 RMD160 7e59b78d2247b9dd160d88d7b02a7fe34bb204b3 SHA1 a4e0545311562cb324088fddf97d8ae6492e5400 SHA256 04597937631a4325dd9e9abacb19cd522b34909dec8ba781a84250ab150eda55
 DIST lxde-common-0.4.2.tar.bz2 5195797 RMD160 98cad69ab46c15007fec4d40f7bd901ea6d8c8bd SHA1 401f9d4256c254fb258e860c1a316a06947deabe SHA256 02c9be77d4cb0c6842624c976f322439e87b4372ab1e7996baf791c7bdad779f
 DIST lxde-common-0.5.0.tar.gz 903916 RMD160 f0780b0fb99879e0c318537fe0ea62c42bb7818b SHA1 01a95b9f125616a0f195de4bef7255452b86d1e9 SHA256 db427817070172be349709604944ba7024ac56e5c87f687b7c3f97be58a1e80a
 DIST lxde-common-0.5.5.tar.gz 899075 RMD160 8f821c0bf3ec207ff99db9d952b05b052ca87ce4 SHA1 27ce9bcaf109ded61aa0c691a8dc6059a04a6d08 SHA256 ee18a09b64a442b33c1b54f0269649a1b4d9490460c400a07ed785d41bf6dde6
@@ -10,23 +8,6 @@ EBUILD lxde-common-0.4.2.ebuild 674 RMD160 6adfc9e5fc2af1ee7da93f6b74bafe1d43b74
 EBUILD lxde-common-0.5.0-r1.ebuild 1102 RMD160 8d05a3c188837b40337a763dbb56f182820c2c9a SHA1 81614deefd53b3f657bef106c85bd051a99c248b SHA256 fc4245216f2f20b0980f2d05bafe8f8ce6287dfea9cfd68666eb9d5f82533f11
 EBUILD lxde-common-0.5.0-r2.ebuild 1101 RMD160 0aaa043579928be03f66dd989d7fcd8f382dde2a SHA1 fab59633c3faf51fc5872870949c2762aa4053f9 SHA256 244162834fc3b56fedcccbbd22e03c282fa66951837aabb44bae7710106bec7c
 EBUILD lxde-common-0.5.0.ebuild 1043 RMD160 76cf5018560b99a6d09ebb6b8835c3723e94d9de SHA1 11f5888c86262e71beda65a1bfcfdac5e9ede176 SHA256 3dacf0e6c855d242564a221f108774dde5319a4594155a2c762f893921290c71
-EBUILD lxde-common-0.5.5.ebuild 901 RMD160 16ebb97715ebbd01fde4694dc95754a0af99b7d2 SHA1 405b2e143ff705c73b270457612a0a51646ee05b SHA256 96b6a365c15cd29e1dd72ad75993d86b66b75e99bc00e2d17c99be5b587eae21
-MISC ChangeLog 3419 RMD160 f6517b3e5738de083083e825f0bc90f5b6184a8d SHA1 b958a40ca24e5a31c81a1da4dad06726c41f88da SHA256 00be067530e59e729e5dc9980a4194346f6444bf8ddea4b7a849d6ff3d026a78
+EBUILD lxde-common-0.5.5-r1.ebuild 1076 RMD160 ee000643fef9653b1de040be0aba63187496e218 SHA1 9db5cf9eca1751477e2b522f49bbe7cca6b75f86 SHA256 55548d374ca3ae116622123e60a21ef5f6331a7d088a4ffd13af26b4817768a9
+MISC ChangeLog 3694 RMD160 6bcfe6211fecccf4165bc41c0437ad07e7beb989 SHA1 38272b26da136c66d460fbdb31c740efc4fd9782 SHA256 77c792f9c18005ee8080b232cecc83125e66993f85958b93dd0068e0aafcb8c0
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOORW7AAoJEPqDWhW0r/LConYP/jA2mZUAK+YIK2N3j0YIhis6
-A0CnH+RJXiEdm0kP7RoKY0koKeI4VZRi4ysnLJM6GH0e54iafVRu3gB4T4mEqpi5
-lW5cYJaOrKAFd4tmcePHJ1pPqsz1HFq2pGCvvrKjYavEHh1Z8J6RkuFYnjL7Q7ZS
-IwkmaeqBXP1viCfQb2HzrI6SIH12ZtAlONMU6aVZWoe9E/ZdQec4bswzUJjjcer7
-AAwkLwPglGTTPRum6fsp4zHe/1K1LT2eHrq0s7inZg0DSuyUlC6Hg1TOIFlOMJFg
-xEdp9Q3ml80VKFdD+QqNCz7xR5CQTjfAwYbydsz/vB0J4nIYzDJytg7BDfznCPy3
-O7F4p35RMUm5N6CgXWq5w0dj0kwS6w3WYAjcD4G6L8+qqCa9ZZfU3nr7m2FoCxKF
-vJKc6ipZ3CQwDVG5Qx2tO/WzpMOfjl49ys/O+5Pg1vqrdVcrpL5p+hljQIE5QnDR
-PjYdS3D/B7Gw4SFi8PmG3hbEqZMRLX6aYA0NNr90T2dRJb1igSzfpdltbOKgFTIM
-+9KL1Zog7MQx0bQgeBdrk+yJ7urOqZHzGCHAcvy9q/tEAEE6nktYwzP0x59qo8Ql
-Dq5XQXtADPSBw/hoEc4LNGtp2J2DN6P1mgIung1/EI0yScex87dEDz+4w5/lDYVM
-YoeR2hId1QiNCkC9Bper
-=Ghey
------END PGP SIGNATURE-----
diff --git a/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch b/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch
new file mode 100644
index 000000000000..129fb9a5b1ad
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch
@@ -0,0 +1,14 @@
+Index: lxde-common-0.5.5/Makefile.am
+===================================================================
+--- lxde-common-0.5.5.orig/Makefile.am
++++ lxde-common-0.5.5/Makefile.am
+@@ -20,6 +20,9 @@ images_DATA= \
+ 	images/logout-banner.png \
+ 	images/lxde-icon.png
+ 
++lxlogoutdir=$(datadir)/applications/
++lxlogout_DATA=lxde-logout.desktop
++
+ lxpaneldir=$(datadir)/lxpanel/profile/LXDE
+ lxpanel_DATA=lxpanel/config
+ 
diff --git a/lxde-base/lxde-common/lxde-common-0.5.5.ebuild b/lxde-base/lxde-common/lxde-common-0.5.5-r1.ebuild
index baf9f2291771..4486452dbe80 100644
--- a/lxde-base/lxde-common/lxde-common-0.5.5.ebuild
+++ b/lxde-base/lxde-common/lxde-common-0.5.5-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/lxde-common-0.5.5.ebuild,v 1.1 2011/08/03 09:32:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/lxde-common-0.5.5-r1.ebuild,v 1.1 2011/08/28 21:22:30 vostorga Exp $
 
 EAPI="4"
 
+inherit eutils autotools
+
 DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
 HOMEPAGE="http://lxde.sf.net/"
 SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
@@ -19,6 +21,15 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 PDEPEND="lxde-base/lxde-icon-theme"
 
+src_prepare() {
+	#bug 380043
+	epatch "${FILESDIR}"/${P}-logout.patch
+
+	# Rerun autotools
+	einfo "Regenerating autotools files..."
+	eautoreconf
+}
+
 src_install () {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README