Fixed the installation path for the dynamically loadable mb-desktop module. Bug #298871, thanks flameeyes for reporting.

(Portage version: 2.1.7.16/cvs/Linux i686)

3 files changed, 100 insertions, 1 deletions

diff --git a/x11-plugins/matchbox-desktop-image-browser/ChangeLog b/x11-plugins/matchbox-desktop-image-browser/ChangeLog
index 926fb6662a34..90a9317f3728 100644
--- a/x11-plugins/matchbox-desktop-image-browser/ChangeLog
+++ b/x11-plugins/matchbox-desktop-image-browser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/matchbox-desktop-image-browser
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/ChangeLog,v 1.5 2010/01/06 00:25:05 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/ChangeLog,v 1.6 2010/01/06 01:24:12 yvasilev Exp $
+
+*matchbox-desktop-image-browser-0.2-r1 (06 Jan 2010)
+
+  06 Jan 2010; Yuri Vasilevski <yvasilev@gentoo.org>
+  +matchbox-desktop-image-browser-0.2-r1.ebuild,
+  +files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch:
+  Fixed the installation path for the dynamically loadable mb-desktop
+  module. Bug #298871, thanks flameeyes for reporting.
 
   06 Jan 2010; Yuri Vasilevski <yvasilev@gentoo.org>
   matchbox-desktop-image-browser-0.2.ebuild,
diff --git a/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch b/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
new file mode 100644
index 000000000000..9026e3c95142
--- /dev/null
+++ b/x11-plugins/matchbox-desktop-image-browser/files/matchbox-desktop-image-browser-0.2-plugin-location-fix.patch
@@ -0,0 +1,36 @@
+diff -Naurp mb-desktop-image-browser-0.2.orig/configure.ac mb-desktop-image-browser-0.2/configure.ac
+--- mb-desktop-image-browser-0.2.orig/configure.ac	2010-01-06 01:05:40.000000000 +0000
++++ mb-desktop-image-browser-0.2/configure.ac	2010-01-06 01:07:24.000000000 +0000
+@@ -34,6 +34,20 @@ AC_ARG_ENABLE(debug,
+       MB_CFLAGS="$MB_CFLAGS -DDEBUG"
+   fi])
+ 
++
++dnl ------ Substitute in found libs, clags to Makefiles etc -----------------
++
++if test "x$prefix" = xNONE; then
++   prefix="${ac_default_prefix}"
++fi
++if test "x$exec_prefix" = xNONE; then
++   exec_prefix='${prefix}'
++fi
++
++MBDESKTOP_PLUGIN_DIR=$libdir/matchbox/desktop
++eval MBDESKTOP_PLUGIN_DIR=`eval echo "$MBDESKTOP_PLUGIN_DIR"`
++
++AC_SUBST(MBDESKTOP_PLUGIN_DIR)
+ AC_SUBST(MB_LIBS)
+ AC_SUBST(MB_CFLAGS)
+ 
+diff -Naurp mb-desktop-image-browser-0.2.orig/Makefile.am mb-desktop-image-browser-0.2/Makefile.am
+--- mb-desktop-image-browser-0.2.orig/Makefile.am	2010-01-06 01:05:40.000000000 +0000
++++ mb-desktop-image-browser-0.2/Makefile.am	2010-01-06 01:07:01.000000000 +0000
+@@ -4,7 +4,7 @@ LDADD = $(MB_LIBS) 
+ AM_CFLAGS = $(MB_CFLAGS)  -g -DDATADIR=\"$(datadir)\"
+ 
+ lib_LTLIBRARIES = imgbrowser.la
+-libdir = $(datadir)/matchbox/desktop/modules
++libdir = $(MBDESKTOP_PLUGIN_DIR)
+ 
+ imgbrowser_la_SOURCES = imgbrowser.c
+ imgbrowser_la_LIBADD  = $(LDADD)
diff --git a/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild b/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild
new file mode 100644
index 000000000000..0a8276eefb33
--- /dev/null
+++ b/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-desktop-image-browser/matchbox-desktop-image-browser-0.2-r1.ebuild,v 1.1 2010/01/06 01:24:12 yvasilev Exp $
+
+inherit versionator eutils autotools
+
+MY_PN=${PN/matchbox/mb}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An alpha-ish image browser plug in for matchbox-desktop."
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/libmatchbox-1.1"
+DEPEND="${RDEPEND} x11-wm/matchbox-desktop"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/$P-include_fix.patch
+	epatch "${FILESDIR}"/$P-noexec-matchbox-desktop.patch
+	epatch "${FILESDIR}"/$P-plugin-location-fix.patch
+
+	eautoreconf
+}
+
+src_compile () {
+	econf $(use_enable debug) || die "Configuration failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
+
+pkg_postinst() {
+	einfo "To use this matchbox-desktop module:"
+	einfo
+	einfo "Add an entry to you mbdesktop_modules file specifying the module and"
+	einfo "where your browsed images live."
+	einfo
+	einfo 'Ej: $ echo "/usr/lib/matchbox/desktop/imgbrowser.so ${HOME}/Pictures" >> \\'
+	einfo '		~/.matchbox/mbdesktop_modules'
+}