This change just installs .desktop files for the Qt desktop applications so that...

Package-Manager: portage-2.1.2.2

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index dc9bd7114edbc78437da548531530ceb7ae85a11..d965b1c6508fbc1ebbd13ed218e4b7af4b48ba20 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.429 2007/04/12 22:19:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.430 2007/04/13 12:25:03 caleb Exp $
+
+  13 Apr 2007; Caleb Tennis <caleb@gentoo.org> +files/qt4/Assistant.desktop,
+  +files/qt4/Designer.desktop, +files/qt4/Linguist.desktop,
+  qt-4.2.3-r1.ebuild:
+  This change just installs .desktop files for the Qt desktop applications so
+  that they can be used from the menus of the desktops. From bug #174033
 
   12 Apr 2007; Jeroen Roovers <jer@gentoo.org> qt-4.2.3-r1.ebuild:
   W00t! Back to stable (bug #172746, comment #23).

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index a31cb1e9f9fc4afd7bc3572f3d69d783c3731fee..9e1a1983988dcef26b747a07c3b9b45ce049620d 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -122,6 +122,18 @@ AUX qt4-sqlite-configure.patch 738 RMD160 0797534db076cf47da01f17fe51296300e7db1
 MD5 341ca0df76ba1dcb9fd0847566055a99 files/qt4-sqlite-configure.patch 738
 RMD160 0797534db076cf47da01f17fe51296300e7db167 files/qt4-sqlite-configure.patch 738
 SHA256 f7bfbcbe05b44821114eda5d515a2a629d233e8b92e91f4542197d83b8c6e51e files/qt4-sqlite-configure.patch 738
+AUX qt4/Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b
+MD5 08afb9af6b61475a516879b8ff95fdf0 files/qt4/Assistant.desktop 368
+RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d files/qt4/Assistant.desktop 368
+SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b files/qt4/Assistant.desktop 368
+AUX qt4/Designer.desktop 374 RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 SHA1 2ca9fc952d204635a2b62480cf4531faf2938110 SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741
+MD5 1911e414ddc29513f2204c432b6879ea files/qt4/Designer.desktop 374
+RMD160 bdd36d944e2549649cd0a51382296d86d5c2ac37 files/qt4/Designer.desktop 374
+SHA256 96a2d2a6c0723c1ce7cbb9fd295eadcc300450ce2b585d1168a380142be0e741 files/qt4/Designer.desktop 374
+AUX qt4/Linguist.desktop 362 RMD160 ce7f588d57300eb859634cabdccd5331da572c76 SHA1 ba914198e37fbf94a8bcbcbfb33bf0f5b45aec8b SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7
+MD5 cf4cf235c1eb98d99879962c6cc12030 files/qt4/Linguist.desktop 362
+RMD160 ce7f588d57300eb859634cabdccd5331da572c76 files/qt4/Linguist.desktop 362
+SHA256 3c527616f52bf533256150dab7f5f6e94bc4f73e2193fae20314cf3d70c4b1f7 files/qt4/Linguist.desktop 362
 AUX utf8-bug-qt3.diff 2670 RMD160 f5db1461cd82ac98417ab641228e15816d160724 SHA1 ca5ecb29c7f1c826d48703339a3371038e306bb7 SHA256 aab526bcff76ccf981ce3095bf6f26b26823f9078a672c89fe78331b6d975aa0
 MD5 f6b3b39040f2b8f19ba1cf1445468c28 files/utf8-bug-qt3.diff 2670
 RMD160 f5db1461cd82ac98417ab641228e15816d160724 files/utf8-bug-qt3.diff 2670
@@ -171,18 +183,18 @@ EBUILD qt-4.2.2.ebuild 7692 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 SHA1
 MD5 d9d58ed2097ab604884c022c2eb5f108 qt-4.2.2.ebuild 7692
 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 qt-4.2.2.ebuild 7692
 SHA256 1d7322eec33620e1f7fae1c8a2a9fabc98ef74e1b91b0135de84c802291611e3 qt-4.2.2.ebuild 7692
-EBUILD qt-4.2.3-r1.ebuild 7742 RMD160 b665d6acceb353e0f1b1befbf55ef0923ef3a57b SHA1 fa750163de1a1e3109be1e7d784e9c2ba461e92f SHA256 f75bc7d740d1e333ed8a156d6431fff1b08068878b601fffaec9974068ee9ebe
-MD5 341650c5692de2a41cad197197ed6352 qt-4.2.3-r1.ebuild 7742
-RMD160 b665d6acceb353e0f1b1befbf55ef0923ef3a57b qt-4.2.3-r1.ebuild 7742
-SHA256 f75bc7d740d1e333ed8a156d6431fff1b08068878b601fffaec9974068ee9ebe qt-4.2.3-r1.ebuild 7742
+EBUILD qt-4.2.3-r1.ebuild 7855 RMD160 0db28ca450d9267c84a92da437a594d28fa9585e SHA1 48d623d33116121779448a5c5f91f0b0967bae3b SHA256 29dc2371d6955eadebdbdf10bdbe2bcdb57097c6e8ff3dd4d206e71602361daf
+MD5 f088697870cc783c831501ef4afaaeba qt-4.2.3-r1.ebuild 7855
+RMD160 0db28ca450d9267c84a92da437a594d28fa9585e qt-4.2.3-r1.ebuild 7855
+SHA256 29dc2371d6955eadebdbdf10bdbe2bcdb57097c6e8ff3dd4d206e71602361daf qt-4.2.3-r1.ebuild 7855
 EBUILD qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 SHA1 44d1008fd8eabb0cc5e03bb301d88dade84a124f SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9
 MD5 371dc767bce4f830b97bc0155280eb95 qt-4.2.3.ebuild 7699
 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 qt-4.2.3.ebuild 7699
 SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 qt-4.2.3.ebuild 7699
-MISC ChangeLog 26702 RMD160 8fe924860323ac8f7e7fa9347a535c2f0f177f1b SHA1 5d7b70403c5e8e554f5fac1ed179485e33250eaa SHA256 785884b0264ebad9feb4a5e58c4fe54a85019cfa69f0b9d2321b6d0fe1b31e15
-MD5 b9ba9107cf2e790a3771014666bbedb6 ChangeLog 26702
-RMD160 8fe924860323ac8f7e7fa9347a535c2f0f177f1b ChangeLog 26702
-SHA256 785884b0264ebad9feb4a5e58c4fe54a85019cfa69f0b9d2321b6d0fe1b31e15 ChangeLog 26702
+MISC ChangeLog 27015 RMD160 8ff6b87006b3ea6eb97870722d33f17dd287d06a SHA1 9f65d815aed5ff76107ed52e6d0bc2d89ac8628a SHA256 26cc209af1ef2d3561ec032c2df16577feaeb067cd9d72ca2e7fa92b6c531271
+MD5 afbfbaa0c67854c1d5125a6af759b9b9 ChangeLog 27015
+RMD160 8ff6b87006b3ea6eb97870722d33f17dd287d06a ChangeLog 27015
+SHA256 26cc209af1ef2d3561ec032c2df16577feaeb067cd9d72ca2e7fa92b6c531271 ChangeLog 27015
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156

diff --git a/x11-libs/qt/files/qt4/Assistant.desktop b/x11-libs/qt/files/qt4/Assistant.desktop
new file mode 100644 (file)
index 0000000..fe8f472
--- /dev/null
+++ b/x11-libs/qt/files/qt4/Assistant.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Categories=Qt;Development;GUIDesigner;
+Comment=
+Comment[en_US]=
+Encoding=UTF-8
+Exec=/usr/bin/assistant
+GenericName=Assistant
+GenericName[en_US]=Assistant
+Icon=assistant
+MimeType=
+Name=Assistant
+Name[en_US]=Assistant
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=

diff --git a/x11-libs/qt/files/qt4/Designer.desktop b/x11-libs/qt/files/qt4/Designer.desktop
new file mode 100644 (file)
index 0000000..aaeb24f
--- /dev/null
+++ b/x11-libs/qt/files/qt4/Designer.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Comment=
+Comment[en_US]=
+Encoding=UTF-8
+Exec=/usr/bin/designer
+GenericName=Qt Designer
+GenericName[en_US]=Qt Designer
+Icon=designer
+MimeType=
+Name=Qt Designer
+Name[en_US]=Qt Designer
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+Categories=Qt;Development;GUIDesigner;

diff --git a/x11-libs/qt/files/qt4/Linguist.desktop b/x11-libs/qt/files/qt4/Linguist.desktop
new file mode 100644 (file)
index 0000000..2a2c3de
--- /dev/null
+++ b/x11-libs/qt/files/qt4/Linguist.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Comment=
+Comment[en_US]=
+Encoding=UTF-8
+Exec=/usr/bin/linguist
+GenericName=Linguist
+GenericName[en_US]=Linguist
+Icon=linguist
+MimeType=
+Name=Linguist
+Name[en_US]=Linguist
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+Categories=Qt;Development;GUIDesigner;

diff --git a/x11-libs/qt/qt-4.2.3-r1.ebuild b/x11-libs/qt/qt-4.2.3-r1.ebuild
index 49cd053d6ac27030015773edca7719eab3a10ec9..1f44f9e73999391ae8890d76dfe3414040988d9a 100644 (file)
--- a/x11-libs/qt/qt-4.2.3-r1.ebuild
+++ b/x11-libs/qt/qt-4.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3-r1.ebuild,v 1.8 2007/04/12 22:19:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3-r1.ebuild,v 1.9 2007/04/13 12:25:03 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -230,6 +230,10 @@ src_install() {
        dodir ${QTPCDIR}
        mv ${D}/${QTLIBDIR}/*.pc ${D}/${QTPCDIR}
 
+       # Install .desktop files, from bug #174033
+       insinto /usr/share/applications
+       doins ${FILESDIR}/qt4/*.desktop
+
        # List all the multilib libdirs
        local libdirs
        for libdir in $(get_all_libdirs); do