updated for bug #218711, plus freedesktop update

Package-Manager: portage-2.1.5_rc6

3 files changed, 36 insertions, 17 deletions

diff --git a/app-pda/qtopia-desktop-bin/ChangeLog b/app-pda/qtopia-desktop-bin/ChangeLog
index 667c36e5b83e..68770fdb2d18 100644
--- a/app-pda/qtopia-desktop-bin/ChangeLog
+++ b/app-pda/qtopia-desktop-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/qtopia-desktop-bin
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/ChangeLog,v 1.15 2007/07/22 10:12:43 calchan Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/ChangeLog,v 1.16 2008/04/27 19:31:46 nerdboy Exp $
+
+  27 Apr 2008; Steve Arnold <nerdboy@gentoo.org>
+  qtopia-desktop-bin-2.2.0.ebuild:
+  updated for bug #218711, plus freedesktop update
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org>
   qtopia-desktop-bin-2.2.0.ebuild:
diff --git a/app-pda/qtopia-desktop-bin/Manifest b/app-pda/qtopia-desktop-bin/Manifest
index 823265f162f8..0569ea3abaa9 100644
--- a/app-pda/qtopia-desktop-bin/Manifest
+++ b/app-pda/qtopia-desktop-bin/Manifest
@@ -1,5 +1,5 @@
 AUX usb0.conf 991 RMD160 35c113695a58d3a7026a3c05c0eb6f16e5cc47ed SHA1 86ff834da14a40c2ec7b8ec5b3d79aed84e7c8f2 SHA256 9019ae3f01963d9d60d753fe55069f5d0e5e362ad408c29263c7984c5ef46e99
 DIST qtopia-desktop-2.2.0-1-redhat9.i386.rpm 9777987 RMD160 23f49012c225654ca3406f0b734e2dc5a2f1c7a0 SHA1 6424db7b541e2562216464bcf99e1dbb5c79f070 SHA256 28607a73bcc7d1cfedbf421508396e4cf612f9b5c10ff8bede80466b00b961e0
-EBUILD qtopia-desktop-bin-2.2.0.ebuild 2173 RMD160 b88c1e39627dbfbee5ab3e369cfefe925d063f95 SHA1 75aa8a9f1d916d78de47197da15f657713e70f77 SHA256 1f93169e775e835b00102140aaba4a830e0d782a3b478365a878c5c8aac44f32
-MISC ChangeLog 2252 RMD160 cd004f2897519b6407c76d39aad1f525b3da1f3f SHA1 7c1da66b4e9feb5828a24f0c11ef3f9ba402517e SHA256 236a1e07ff6235c6c7154441ecca989f15a8edac2498b1998db863172361f8bb
+EBUILD qtopia-desktop-bin-2.2.0.ebuild 2538 RMD160 15ec9fbdb6f6a5f5d630884d676d95d6ddbe6a49 SHA1 7a7536515260531ddd05760f3f7e587c1e095445 SHA256 599eed20197f24e1c019618de9c624b27e0ff43ec72b9069a6e7e8f0ce2390ae
+MISC ChangeLog 2388 RMD160 fc0bada200a8b8460aa185b3eccd4f6fc3343976 SHA1 346733fffef1f2c22ca03d2c0a1f470c96bd5ce0 SHA256 984df977a3d3a95d104c1e28238ea4daf975a3ba30fabaeef4a8ee602a6be679
 MISC metadata.xml 398 RMD160 876986c6cc626955af06b77daba0561ad95dc188 SHA1 c821d8983f4d249d23c7d4320d4fbc2052d97980 SHA256 dde1e8cec55ce97c20e9bf428ff98418937091410a4b84390a1e87a6a3d0c4b9
diff --git a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild
index 0665656e32b1..2968eeaff1cd 100644
--- a/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild
+++ b/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild,v 1.5 2007/07/22 10:12:43 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/qtopia-desktop-bin/qtopia-desktop-bin-2.2.0.ebuild,v 1.6 2008/04/27 19:31:46 nerdboy Exp $
 
-inherit eutils rpm multilib
+inherit eutils fdo-mime rpm multilib
 
 REV="1"
 QD="/opt/QtopiaDesktop"
@@ -40,31 +40,41 @@ src_install() {
 	dodir ${QD}
 	# Too many subdirs and files for individual ebuild commands
 	# Isn't there a better way?
-	cp -a ${S}/${QD}/qtopiadesktop ${D}${QD}
+	cp -a "${S}/${QD}"/qtopiadesktop "${D}${QD}"
 	local libdir="lib32"
 	if has_multilib_profile ; then
 	    libdir=$(get_abi_LIBDIR x86)
 	fi
+
 	into ${QD}
-	    dolib.so ${S}/${QD}/lib/lib*
-	    rm -f ${S}/${QD}/lib/*.prl
+	    dolib.so "${S}/${QD}"/lib/lib*
+	    rm -f "${S}/${QD}"/lib/*.prl
 	exeinto ${QD}/bin
-	    doexe ${S}/${QD}/bin/*
+	    doexe "${S}/${QD}"/bin/*
 	docinto /usr/share/doc/${P}
-	    dodoc ${S}/${QD}/LICENSE.US
-	    dodoc ${S}/${QD}/README.html
-	    dodoc ${FILESDIR}/usb0.conf
-	    rm -f ${S}/${QD}/LICENSE*
+	    dodoc "${S}/${QD}"/LICENSE.US
+	    dodoc "${S}/${QD}"/README.html
+	    dodoc "${FILESDIR}"/usb0.conf
+	    rm -f "${S}/${QD}"/LICENSE*
+
 	echo "PATH=${QD}/bin" > 37qtopia-desktop-bin
 	echo "LDPATH=${QD}/${libdir}" >> 37qtopia-desktop-bin
 	doenvd 37qtopia-desktop-bin
+
+	make_desktop_entry \
+	    /opt/QtopiaDesktop/bin/qtopiadesktop \
+	    "Qtopia Desktop ${PV}" \
+	    "/opt/QtopiaDesktop/qtopiadesktop/pics/qtopia.png" \
+	    "Application;Office;ContactManagement;"
 }
 
 pkg_postinst() {
+	fdo-mime_desktop_database_update
+
 	elog " Finished installing Qtopia Desktop ${PV}-${REV} into ${QD}"
 	elog
-	elog " To start Qtopia Desktop, run:"
-	elog "   $ qtopiadesktop"
+	elog " To start Qtopia Desktop, use the new desktop menu, or run"
+	elog " qtopiadesktop from a terminal prompt."
 	elog
 	elog "See the usb0.conf file for a static network configuration for the"
 	elog "Zaurus cradle interface (it works with an SL-5x00).  Note the old"
@@ -74,3 +84,8 @@ pkg_postinst() {
 	elog "(such as above) running OZ with kernel 2.4.x."
 	elog
 }
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
+