Unconditionally install one .desktop file, bug #81915. Marked 0.4.4 stable on x86, bug #65804.

(Portage version: 2.0.51.19)

4 files changed, 14 insertions, 40 deletions

diff --git a/net-irc/lostirc/ChangeLog b/net-irc/lostirc/ChangeLog
index 1563933fab6b..52b6f2e786c1 100644
--- a/net-irc/lostirc/ChangeLog
+++ b/net-irc/lostirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/lostirc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/ChangeLog,v 1.32 2005/02/04 17:28:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/ChangeLog,v 1.33 2005/03/18 22:19:30 swegener Exp $
+
+  18 Mar 2005; Sven Wegener <swegener@gentoo.org> -lostirc-0.4.3.ebuild,
+  lostirc-0.4.4.ebuild:
+  Unconditionally install one .desktop file, bug #81915. Marked 0.4.4 stable
+  on x86, bug #65804.
 
 *lostirc-0.4.4 (04 Feb 2005)
 
diff --git a/net-irc/lostirc/files/digest-lostirc-0.4.3 b/net-irc/lostirc/files/digest-lostirc-0.4.3
deleted file mode 100644
index 1de4c2840122..000000000000
--- a/net-irc/lostirc/files/digest-lostirc-0.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7213a2a013f29fc41d88e936beea2bae lostirc-0.4.3.tar.gz 632393
diff --git a/net-irc/lostirc/lostirc-0.4.3.ebuild b/net-irc/lostirc/lostirc-0.4.3.ebuild
deleted file mode 100644
index b6303e76948b..000000000000
--- a/net-irc/lostirc/lostirc-0.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/lostirc-0.4.3.ebuild,v 1.3 2005/02/04 17:28:47 swegener Exp $
-
-inherit base
-
-IUSE="kde gnome debug"
-DESCRIPTION="A simple but functional graphical IRC client"
-HOMEPAGE="http://lostirc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
-RDEPEND="=dev-cpp/gtkmm-2.4*
-	>=dev-cpp/glibmm-2.4.4
-	=dev-libs/libsigc++-2.0*"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf \
-		$(use_with gnome) \
-		$(use_with kde) \
-		$(use_enable debug logdebug) \
-		|| die "econf failed"
-	base_src_compile make
-}
-
-src_install() {
-	base_src_install
-	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
-}
diff --git a/net-irc/lostirc/lostirc-0.4.4.ebuild b/net-irc/lostirc/lostirc-0.4.4.ebuild
index 886d705b2f80..66abeb67dd2b 100644
--- a/net-irc/lostirc/lostirc-0.4.4.ebuild
+++ b/net-irc/lostirc/lostirc-0.4.4.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/lostirc-0.4.4.ebuild,v 1.1 2005/02/04 17:28:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/lostirc/lostirc-0.4.4.ebuild,v 1.2 2005/03/18 22:19:30 swegener Exp $
 
 inherit base
 
-IUSE="kde gnome debug"
+IUSE="debug"
 DESCRIPTION="A simple but functional graphical IRC client"
 HOMEPAGE="http://lostirc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 
 RDEPEND="=dev-cpp/gtkmm-2.4*
 	>=dev-cpp/glibmm-2.4.4
@@ -19,9 +19,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
+	# Note: --enable-gnome installs the .desktop file in
+	# /usr/share/applications, it does not add gnome dependencies
+	# so, as this is the standard place, we should enable it always
 	econf \
-		$(use_with gnome) \
-		$(use_with kde) \
+		--enable-gnome \
+		--disable-kde \
 		$(use_enable debug logdebug) \
 		|| die "econf failed"
 	base_src_compile make