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

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

4 files changed, 103 insertions, 2 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/Manifest b/x11-plugins/matchbox-desktop-image-browser/Manifest
index 592081bbbbf5..0908f4d09001 100644
--- a/x11-plugins/matchbox-desktop-image-browser/Manifest
+++ b/x11-plugins/matchbox-desktop-image-browser/Manifest
@@ -1,6 +1,8 @@
 AUX matchbox-desktop-image-browser-0.2-include_fix.patch 412 RMD160 28469e4df76c97971f46ed226c92a3e7f2b1c746 SHA1 ada67c4caef0ec09b211b3a91eff2be807e1c0fc SHA256 e348f2c2796a640465b6e0648196141527af126c8a8bc8dd27067e1aa9e6a079
 AUX matchbox-desktop-image-browser-0.2-noexec-matchbox-desktop.patch 541 RMD160 48ab16b2fd21a044811974fb8ae228325e554618 SHA1 f45b8a3536281ac35644be98a5281167922b0fd3 SHA256 c3e19623b5ba01e607cd7f8f4ac053ee16fbb5bc512e296337c5d16a92bcc922
+AUX matchbox-desktop-image-browser-0.2-plugin-location-fix.patch 1318 RMD160 d5f2a00f9e6e6239b28717c7278a29db8291549f SHA1 0033544df3ea48a96e78d25eb60ab453b82aed54 SHA256 cdeb4538d2057db7acc73ba56ddbaed901d3cb70490080452f9dc551026a5d63
 DIST mb-desktop-image-browser-0.2.tar.bz2 209777 RMD160 5ecdad5c1cbd6ba2647bb3c375e74f78a1cdebd3 SHA1 5c9e2fde3aa60ee2e0c62f163ad78df145a786ef SHA256 48c2721048d3fa0bde425df1b40b1baa4ae67f6e42be78761ae81deb39ec746e
+EBUILD matchbox-desktop-image-browser-0.2-r1.ebuild 1513 RMD160 362032b83400fa63b4a8aa648ae2cd621e802518 SHA1 e96d5efc2d1c9e820b9695481c1bfe9d44f3602d SHA256 cf5f25225923405319a4a0a6616ea79ebe80882f44731198687f1b05aa0ac828
 EBUILD matchbox-desktop-image-browser-0.2.ebuild 1134 RMD160 a6c9a5077ab6f7d1a60e7e2ed24c28dc2de3db55 SHA1 666d04945149e9d88680fc5df29c059d2b499b7a SHA256 f38c21a041c30b0661089b4aa465eeb0616ac08f297fab92efdf89e0ac8ac071
-MISC ChangeLog 1226 RMD160 a6f8afc45c1572d0025ff873e20ffcbcbb59566d SHA1 074d3f655cc93034a4a4738bdd6d53f564273787 SHA256 5b6b32227d26bf594176787745fcceb7a077f9b4f257ffa448c1dcd1cc389490
+MISC ChangeLog 1579 RMD160 526d3c64012110a4af5220901dc9a2edb609476e SHA1 a88ab0e857e4c64758a811fc54cf765d2dd39ac4 SHA256 ffdc018527654588e3fb2a4b08e26a2e671ee4dba21d6fc2b1ef09a673a34454
 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55
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'
+}