- make pda support optional and sync patchsets with OE

(Portage version: 2.1.4.5)

7 files changed, 105 insertions, 6 deletions

diff --git a/x11-wm/matchbox-common/ChangeLog b/x11-wm/matchbox-common/ChangeLog
index 355cef13396d..acd554bc643f 100644
--- a/x11-wm/matchbox-common/ChangeLog
+++ b/x11-wm/matchbox-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/matchbox-common
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/ChangeLog,v 1.8 2008/07/13 07:28:35 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/ChangeLog,v 1.9 2009/01/10 02:23:34 solar Exp $
+
+*matchbox-common-0.9.1-r2 (10 Jan 2009)
+
+  10 Jan 2009; <solar@gentoo.org> +files/add-media-category.patch,
+  +files/no-utilities-category.patch, metadata.xml,
+  +matchbox-common-0.9.1-r2.ebuild:
+  - make pda support optional and sync patchsets with OE
 
   13 Jul 2008; Joseph Jezak <josejx@gentoo.org>
   matchbox-common-0.9.1-r1.ebuild:
diff --git a/x11-wm/matchbox-common/files/add-media-category.patch b/x11-wm/matchbox-common/files/add-media-category.patch
new file mode 100644
index 000000000000..5c502b379728
--- /dev/null
+++ b/x11-wm/matchbox-common/files/add-media-category.patch
@@ -0,0 +1,37 @@
+diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am matchbox-common-0.9.1/data/vfolders-pda/Makefile.am
+--- matchbox-common-0.9.1/data/vfolders-pda.orig/Makefile.am	2004-12-01 12:22:30.000000000 +0100
++++ matchbox-common-0.9.1/data/vfolders-pda/Makefile.am	2006-02-16 21:32:57.000000000 +0100
+@@ -1,5 +1,6 @@
+ desktop_files = Applications.directory \
+                 Games.directory        \
++                Media.directory        \
+                 Other.directory        \
+                 Root.directory         \
+                 Settings.directory     \
+@@ -11,4 +12,4 @@
+ vfolders_DATA = $(desktop_files)
+ endif
+ 
+-EXTRA_DIST = $(desktop_files)
+\ No newline at end of file
++EXTRA_DIST = $(desktop_files)
+diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory matchbox-common-0.9.1/data/vfolders-pda/Media.directory
+--- matchbox-common-0.9.1/data/vfolders-pda.orig/Media.directory	1970-01-01 01:00:00.000000000 +0100
++++ matchbox-common-0.9.1/data/vfolders-pda/Media.directory	2006-02-16 21:16:29.000000000 +0100
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Name=Media
++Name[de]=Medien
++Comment=View media files
++Comment[de]=Programme zur Wiedergabe von audiovisuellen Medien
++Icon=mbfolder.png
++Type=Directory
++Match=AudioVideo;Graphics;Media;Viewer;
+diff -urN matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order matchbox-common-0.9.1/data/vfolders-pda/Root.order
+--- matchbox-common-0.9.1/data/vfolders-pda.orig/Root.order	2006-02-16 20:51:36.000000000 +0100
++++ matchbox-common-0.9.1/data/vfolders-pda/Root.order	2006-02-16 20:53:23.000000000 +0100
+@@ -1,3 +1,4 @@
++Media
+ Games
+ Settings
+ Other
diff --git a/x11-wm/matchbox-common/files/no-utilities-category.patch b/x11-wm/matchbox-common/files/no-utilities-category.patch
new file mode 100644
index 000000000000..6801533ac3a0
--- /dev/null
+++ b/x11-wm/matchbox-common/files/no-utilities-category.patch
@@ -0,0 +1,7 @@
+--- matchbox-common-0.9.1.orig/data/vfolders-pda/Root.order	2006-02-03 22:26:55.000000000 +0100
++++ matchbox-common-0.9.1/data/vfolders-pda/Root.order	2006-02-03 22:32:08.000000000 +0100
+@@ -1,4 +1,3 @@
+-Utilities
+ Games
+ Settings
+ Other
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
index b5cc63ff056e..550436d401d3 100644
--- a/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild
+++ b/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2008 Gentoo Foundation
+# Copyright 2006-2009 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.6 2008/07/13 07:28:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/matchbox-common-0.9.1-r1.ebuild,v 1.7 2009/01/10 02:23:34 solar Exp $
 
 inherit eutils versionator
 
diff --git a/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild b/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..d3cc02ba538e
--- /dev/null
+++ b/x11-wm/matchbox-common/matchbox-common-0.9.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2006-2009 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-r2.ebuild,v 1.1 2009/01/10 02:23:34 solar Exp $
+
+inherit eutils versionator
+
+DESCRIPTION="Common files used by matchbox-panel and matchbox-desktop packages"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~arm ~hppa ~ppc ~x86"
+IUSE="pda"
+
+DEPEND=">=x11-libs/libmatchbox-1.1"
+
+src_compile() {
+
+	econf $(use_enable pda 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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/no-utilities-category.patch
+	epatch "${FILESDIR}"/add-media-category.patch
+}
diff --git a/x11-wm/matchbox-common/matchbox-common-0.9.1.ebuild b/x11-wm/matchbox-common/matchbox-common-0.9.1.ebuild
index 796d95b11601..ff597a77e24b 100644
--- a/x11-wm/matchbox-common/matchbox-common-0.9.1.ebuild
+++ b/x11-wm/matchbox-common/matchbox-common-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2006-2008 Gentoo Foundation
+# Copyright 2006-2009 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.ebuild,v 1.3 2008/02/27 17:23:35 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-common/matchbox-common-0.9.1.ebuild,v 1.4 2009/01/10 02:23:34 solar Exp $
 
 inherit versionator
 
diff --git a/x11-wm/matchbox-common/metadata.xml b/x11-wm/matchbox-common/metadata.xml
index a7160ed0027d..0733934fe98b 100644
--- a/x11-wm/matchbox-common/metadata.xml
+++ b/x11-wm/matchbox-common/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gpe</herd>
+<use>
+	<flag name='pda'>Support for pda folders</flag>
+</use>
 <maintainer>
 <email>yvasilev@gentoo.org</email>
 <name>Yuri Vasilevski</name>