Install desktop file in new location, and add Categories entry, bug #97815.

(Portage version: 2.0.51.22-r1)

7 files changed, 164 insertions, 13 deletions

diff --git a/net-nntp/pan/ChangeLog b/net-nntp/pan/ChangeLog
index 1fb72bb6740b..970f44f670ba 100644
--- a/net-nntp/pan/ChangeLog
+++ b/net-nntp/pan/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nntp/pan
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.6 2005/04/30 16:09:16 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/ChangeLog,v 1.7 2005/07/03 19:32:09 azarah Exp $
+
+*pan-0.14.2.91-r3 (03 Jul 2005)
+*pan-0.14.2-r1 (03 Jul 2005)
+
+  03 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/pan-0.14.2-update-desktop-file.patch, +pan-0.14.2-r1.ebuild,
+  +pan-0.14.2.91-r3.ebuild:
+  Install desktop file in new location, and add Categories entry, bug #97815.
 
 *pan-0.14.2.91-r2 (30 Apr 2005)
 
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 085f4878047d..2186968999a0 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,18 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6225c7c8a053c3b857b7b6ca504bd4f9 pan-0.14.2.ebuild 1388
 MD5 6ed7a7a5f6fad9864cd7c2f99c316db8 pan-0.14.2.91-r2.ebuild 1503
 MD5 2dab63376eceed1eff3cdb30d285e7b7 ChangeLog 7357
+MD5 6225c7c8a053c3b857b7b6ca504bd4f9 pan-0.14.2.ebuild 1388
+MD5 05d2f6a60687e07dbd2de3f75bc04bca pan-0.14.2-r1.ebuild 1496
+MD5 a7688b6ce3e7f711b7d37baa369a88da pan-0.14.2.91-r3.ebuild 1607
 MD5 b379ecb012e58dcb29c4feee0f5219f2 metadata.xml 180
+MD5 179a6776627498e226a1cc2d6bdc33d2 files/digest-pan-0.14.2-r1 64
+MD5 8ba6afcc31900a8353dc12ef62681f38 files/pan-0.14.2.91-gcc4-2.patch 698
 MD5 daf4b06f3fce576fbf35e97bcffa9305 files/pan-0.14.2.91-gcc4.patch 698
+MD5 bc715242bd05043ca432fb54b03e2fdf files/digest-pan-0.14.2.91-r3 67
+MD5 47cde96ef20a3fb63f50f4ee96d58a69 files/pan-0.14.2-update-desktop-file.patch 1040
 MD5 bc715242bd05043ca432fb54b03e2fdf files/digest-pan-0.14.2.91-r2 67
 MD5 179a6776627498e226a1cc2d6bdc33d2 files/digest-pan-0.14.2 64
-MD5 8ba6afcc31900a8353dc12ef62681f38 files/pan-0.14.2.91-gcc4-2.patch 698
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCc83JI1lqEGTUzyQRAmjzAJwO1JJt7t8ZOI7JEnOor2Q2JTwY5wCfZ0Qg
-kUBxDaQ9PinPnda/n6c3QCg=
-=9vaY
------END PGP SIGNATURE-----
diff --git a/net-nntp/pan/files/digest-pan-0.14.2-r1 b/net-nntp/pan/files/digest-pan-0.14.2-r1
new file mode 100644
index 000000000000..5001d5275c91
--- /dev/null
+++ b/net-nntp/pan/files/digest-pan-0.14.2-r1
@@ -0,0 +1 @@
+MD5 ed3188e7059bb6d6c209ee5d46ac1852 pan-0.14.2.tar.bz2 1834784
diff --git a/net-nntp/pan/files/digest-pan-0.14.2.91-r3 b/net-nntp/pan/files/digest-pan-0.14.2.91-r3
new file mode 100644
index 000000000000..8d1304772a69
--- /dev/null
+++ b/net-nntp/pan/files/digest-pan-0.14.2.91-r3
@@ -0,0 +1 @@
+MD5 4770d899a1c1ba968ce96bc5aeb07b62 pan-0.14.2.91.tar.bz2 1919099
diff --git a/net-nntp/pan/files/pan-0.14.2-update-desktop-file.patch b/net-nntp/pan/files/pan-0.14.2-update-desktop-file.patch
new file mode 100644
index 000000000000..54e99cde7116
--- /dev/null
+++ b/net-nntp/pan/files/pan-0.14.2-update-desktop-file.patch
@@ -0,0 +1,29 @@
+--- pan-0.14.2.91/Makefile.am	2005-07-03 21:11:21.000000000 +0200
++++ pan-0.14.2.91.az/Makefile.am	2005-07-03 21:12:03.000000000 +0200
+@@ -18,7 +18,7 @@
+ 	     $(DESKTOP_FILES) \
+              intltool-extract.in intltool-merge.in intltool-update.in
+ 
+-Productivitydir = $(datadir)/gnome/apps/Internet
++Productivitydir = $(datadir)/applications
+ Productivity_DATA = $(DESKTOP_FILES)
+ 
+ icon_DATA = pan.png
+--- pan-0.14.2.91/Makefile.in	2005-07-03 21:11:27.000000000 +0200
++++ pan-0.14.2.91.az/Makefile.in	2005-07-03 21:12:20.000000000 +0200
+@@ -148,7 +148,7 @@
+              intltool-extract.in intltool-merge.in intltool-update.in
+ 
+ 
+-Productivitydir = $(datadir)/gnome/apps/Internet
++Productivitydir = $(datadir)/applications
+ Productivity_DATA = $(DESKTOP_FILES)
+ 
+ icon_DATA = pan.png
+--- pan-0.14.2.91/pan.desktop.in	2005-07-03 21:10:11.000000000 +0200
++++ pan-0.14.2.91.az/pan.desktop.in	2005-07-03 21:10:28.000000000 +0200
+@@ -6,3 +6,4 @@
+ Icon=pan.png
+ Terminal=false
+ Type=Application
++Categories=Application;Network;
diff --git a/net-nntp/pan/pan-0.14.2-r1.ebuild b/net-nntp/pan/pan-0.14.2-r1.ebuild
new file mode 100644
index 000000000000..385b0413ea6f
--- /dev/null
+++ b/net-nntp/pan/pan-0.14.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.14.2-r1.ebuild,v 1.1 2005/07/03 19:32:09 azarah Exp $
+
+inherit eutils libtool
+
+IUSE="nls spell"
+
+DESCRIPTION="A newsreader for the Gnome2 desktop"
+SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/SOURCE/${P}.tar.bz2"
+HOMEPAGE="http://pan.rebelbase.com/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-libs/glib-2.0.4
+	>=x11-libs/gtk+-2.0.5
+	>=dev-libs/libxml2-2.4.22
+	>=net-libs/gnet-1.1.8
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.21
+	sys-devel/gettext"
+
+export CONFIG_PROTECT_MASK="/etc/gconf"
+
+pkg_setup() {
+	# Likely that glibc might of been compiled with nls turned off.
+	# Warn people that Pan requires glibc to have nls support.
+	if ! use nls
+	then
+		ewarn "Pan requires glibc to be merged with 'nls' in your USE flags."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Update desktop file location and format.
+	epatch ${FILESDIR}/${P}-update-desktop-file.patch
+
+	elibtoolize || die "elibtoolize failed"
+}
+
+src_compile() {
+	econf $(use_enable spell gtkspell) || die "Configure failure"
+	emake || die "Compilation failure"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Installation failed"
+	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO || die "dodoc failed"
+	dohtml ANNOUNCE.html docs/{pan-shortcuts,faq}.html || die "dodoc failed"
+}
diff --git a/net-nntp/pan/pan-0.14.2.91-r3.ebuild b/net-nntp/pan/pan-0.14.2.91-r3.ebuild
new file mode 100644
index 000000000000..d555d993674e
--- /dev/null
+++ b/net-nntp/pan/pan-0.14.2.91-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/pan/pan-0.14.2.91-r3.ebuild,v 1.1 2005/07/03 19:32:09 azarah Exp $
+
+inherit eutils libtool
+
+IUSE="nls spell"
+
+DESCRIPTION="A newsreader for the Gnome2 desktop"
+SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/SOURCE/${P}.tar.bz2"
+HOMEPAGE="http://pan.rebelbase.com/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-libs/glib-2.0.4
+	>=x11-libs/gtk+-2.0.5
+	>=dev-libs/libxml2-2.4.22
+	>=net-libs/gnet-1.1.8
+	>=dev-libs/libpcre-4.0
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.21
+	sys-devel/gettext"
+
+export CONFIG_PROTECT_MASK="/etc/gconf"
+
+pkg_setup() {
+	# Likely that glibc might of been compiled with nls turned off.
+	# Warn people that Pan requires glibc to have nls support.
+	if ! use nls
+	then
+		ewarn "Pan requires glibc to be merged with 'nls' in your USE flags."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix for building with gcc4
+	epatch ${FILESDIR}/${P}-gcc4-2.patch
+	# Update desktop file location and format.
+	epatch ${FILESDIR}/${PN}-0.14.2-update-desktop-file.patch
+
+	elibtoolize || die "elibtoolize failed"
+}
+
+src_compile() {
+	econf $(use_enable spell gtkspell) || die "Configure failure"
+	emake || die "Compilation failure"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Installation failed"
+	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO || die "dodoc failed"
+	dohtml ANNOUNCE.html docs/{pan-shortcuts,faq}.html || die "dodoc failed"
+}