Fixed the way xsessions files are created, fixes bug #137058.

Package-Manager: portage-2.1.1_pre1-r1

4 files changed, 64 insertions, 12 deletions

diff --git a/x11-wm/matchbox-common/ChangeLog b/x11-wm/matchbox-common/ChangeLog
index bb54621d6b44..2859be2d36ab 100644
--- a/x11-wm/matchbox-common/ChangeLog
+++ b/x11-wm/matchbox-common/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/matchbox-common
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/ChangeLog,v 1.2 2006/04/28 00:03:07 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/ChangeLog,v 1.3 2006/06/20 17:39:22 yvasilev Exp $
+
+*matchbox-common-0.9.1-r1 (20 Jun 2006)
+
+  20 Jun 2006; <yvasilev@gentoo.org> +matchbox-common-0.9.1-r1.ebuild:
+  Fixed the way xsessions files are created, fixes bug #137058.
 
   28 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/x11-wm/matchbox-common/Manifest b/x11-wm/matchbox-common/Manifest
index becd03146e8f..5de69fb48722 100644
--- a/x11-wm/matchbox-common/Manifest
+++ b/x11-wm/matchbox-common/Manifest
@@ -1,30 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX MatchBox.desktop 222 RMD160 481164e9707f74a28fb73f50ac8388df285c83ec SHA1 fc9c6b13df804bf5b5d9e65ecbe36d8b6c840dbf SHA256 09377ec0849e3cd237c349a4f96a4d80f0117585b4362cb27e868685819396b6 size 222
+AUX MatchBox.desktop 222 RMD160 481164e9707f74a28fb73f50ac8388df285c83ec SHA1 fc9c6b13df804bf5b5d9e65ecbe36d8b6c840dbf SHA256 09377ec0849e3cd237c349a4f96a4d80f0117585b4362cb27e868685819396b6
 MD5 5eb6aa9f99c23644243071183d3f8d98 files/MatchBox.desktop 222
 RMD160 481164e9707f74a28fb73f50ac8388df285c83ec files/MatchBox.desktop 222
 SHA256 09377ec0849e3cd237c349a4f96a4d80f0117585b4362cb27e868685819396b6 files/MatchBox.desktop 222
-DIST matchbox-common-0.9.1.tar.bz2 86365 RMD160 b4c6ed40da45f55129bb31d05e0e43c2787d0104 SHA256 524995b9899cc10d04c7964fb88ff8a2199865ca97e8d4988abd8d6c2a286199 size 86365
-EBUILD matchbox-common-0.9.1.ebuild 1030 RMD160 dd26cb562779799dbfe33d03d2802ed2b9e53a3d SHA1 130b0f5acf9a13d0aba36a1663f1fd65d31befbf SHA256 1f5144f1ca533e7a0b75a4b5b630b0ba921d11f72aa6c3ce3948d6b7b004abd1 size 1030
+DIST matchbox-common-0.9.1.tar.bz2 86365 RMD160 b4c6ed40da45f55129bb31d05e0e43c2787d0104 SHA1 1d8adb017b600f6c58a8cefdd7c9f4597f21e4b5 SHA256 524995b9899cc10d04c7964fb88ff8a2199865ca97e8d4988abd8d6c2a286199
+EBUILD matchbox-common-0.9.1-r1.ebuild 1027 RMD160 f47019e93242a41c8623b8414ca3ba8fb5d7a581 SHA1 8b865dfd3ccd17a44a1bee10c557dc47b27fa368 SHA256 d58938dabbbb2242cd4bce2dc37c93927b3702875acab3441730462671f8a042
+MD5 7990bf485ebbcca2dcaa74e95f5c1c94 matchbox-common-0.9.1-r1.ebuild 1027
+RMD160 f47019e93242a41c8623b8414ca3ba8fb5d7a581 matchbox-common-0.9.1-r1.ebuild 1027
+SHA256 d58938dabbbb2242cd4bce2dc37c93927b3702875acab3441730462671f8a042 matchbox-common-0.9.1-r1.ebuild 1027
+EBUILD matchbox-common-0.9.1.ebuild 1030 RMD160 dd26cb562779799dbfe33d03d2802ed2b9e53a3d SHA1 130b0f5acf9a13d0aba36a1663f1fd65d31befbf SHA256 1f5144f1ca533e7a0b75a4b5b630b0ba921d11f72aa6c3ce3948d6b7b004abd1
 MD5 944e1b39e0dd212dc7a5dddf54a4640e matchbox-common-0.9.1.ebuild 1030
 RMD160 dd26cb562779799dbfe33d03d2802ed2b9e53a3d matchbox-common-0.9.1.ebuild 1030
 SHA256 1f5144f1ca533e7a0b75a4b5b630b0ba921d11f72aa6c3ce3948d6b7b004abd1 matchbox-common-0.9.1.ebuild 1030
-MISC ChangeLog 566 RMD160 216fddc198299b7d461b87024f2a060d9ffb29a0 SHA1 bd19322b730ea82a82770f5496f0c5011e03f83f SHA256 0e624ac4a2ca00875b4007ea165d4d80ede4fca94454b7d22488c8f90391b1c6 size 566
-MD5 9f04035e51101a16f540b2e0e92b6c5e ChangeLog 566
-RMD160 216fddc198299b7d461b87024f2a060d9ffb29a0 ChangeLog 566
-SHA256 0e624ac4a2ca00875b4007ea165d4d80ede4fca94454b7d22488c8f90391b1c6 ChangeLog 566
-MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55 size 247
+MISC ChangeLog 744 RMD160 eeae1dd4942d630f98ac3765959bbff307adb962 SHA1 2d4730ea4bf1e43b70738416433ab5a6be341072 SHA256 f0e33b952a2d4188ec679a93e2943583c319f59def67aadfcfce90ab52243435
+MD5 286f02472618e0a2f91419074da209f3 ChangeLog 744
+RMD160 eeae1dd4942d630f98ac3765959bbff307adb962 ChangeLog 744
+SHA256 f0e33b952a2d4188ec679a93e2943583c319f59def67aadfcfce90ab52243435 ChangeLog 744
+MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55
 MD5 a80bc50cf196a9e5a2764d6f6081b56a metadata.xml 247
 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 metadata.xml 247
 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55 metadata.xml 247
 MD5 dc3b208d8b654da696555b513dfba91f files/digest-matchbox-common-0.9.1 265
 RMD160 98e3f03b61033cacf8eca7c6df313e882eeeb439 files/digest-matchbox-common-0.9.1 265
 SHA256 912dc3446858cfe8abdc27fb0dfe6b74a2cdd177f2e9307c41952b4978b1d9e7 files/digest-matchbox-common-0.9.1 265
+MD5 dc3b208d8b654da696555b513dfba91f files/digest-matchbox-common-0.9.1-r1 265
+RMD160 98e3f03b61033cacf8eca7c6df313e882eeeb439 files/digest-matchbox-common-0.9.1-r1 265
+SHA256 912dc3446858cfe8abdc27fb0dfe6b74a2cdd177f2e9307c41952b4978b1d9e7 files/digest-matchbox-common-0.9.1-r1 265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEUVvBW78445TWHXcRAicEAJ0csZAW7Pzac5+ory/nZSkO+T+cbACfRtq8
-2qGHH7Qx+4DkEUxgLt9yjBA=
-=gmc/
+iD8DBQFEmDKLyZl4piiTjjYRAl6FAJ9gIl21GlQPm2Ho+V2KSqkE+CK1FACfXDzs
+4zSHXIxQIdRLMXGKLSzAsX8=
+=ZTd/
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/matchbox-common/files/digest-matchbox-common-0.9.1-r1 b/x11-wm/matchbox-common/files/digest-matchbox-common-0.9.1-r1
new file mode 100644
index 000000000000..8290b5b3a1a2
--- /dev/null
+++ b/x11-wm/matchbox-common/files/digest-matchbox-common-0.9.1-r1
@@ -0,0 +1,3 @@
+MD5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 86365
+RMD160 b4c6ed40da45f55129bb31d05e0e43c2787d0104 matchbox-common-0.9.1.tar.bz2 86365
+SHA256 524995b9899cc10d04c7964fb88ff8a2199865ca97e8d4988abd8d6c2a286199 matchbox-common-0.9.1.tar.bz2 86365
diff --git a/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild b/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..a17389cc4234
--- /dev/null
+++ b/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2006-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild,v 1.1 2006/06/20 17:39:22 yvasilev Exp $
+
+inherit eutils versionator
+
+DESCRIPTION="Common files used by matchbox-panel and matchbox-desktop packages"
+HOMEPAGE="http://projects.o-hand.com/matchbox/"
+SRC_URI="http://projects.o-hand.com/matchbox/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	econf --disable-pda-folders \
+		|| die "Configuration failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	# Insert our Xsession
+	echo -e "#!/bin/sh\n\nmatchbox-session" > ${T}/matchbox
+	exeinto /etc/X11/Sessions
+	doexe ${T}/matchbox
+
+	# Insert GDM/KDM xsession file
+	wm=matchbox make_session_desktop MatchBox matchbox-session
+
+	dodoc AUTHORS Changelog INSTALL NEWS README
+}