Create a desktop file instead of using a premade one, remove old

(Portage version: 2.1.4.4)

9 files changed, 13 insertions, 526 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 8eb5d27e8eab..c349a2e1f3f5 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.205 2008/03/13 12:32:45 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.206 2008/03/19 19:30:12 armin76 Exp $
+
+  19 Mar 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/mldonkey.initd-2.8-r1, -files/mldonkey, -files/mldonkey.png,
+  -files/mldonkey-gui.desktop, -mldonkey-2.9.2.ebuild,
+  -mldonkey-2.9.2-r1.ebuild, mldonkey-2.9.3.ebuild, mldonkey-2.9.4.ebuild:
+  Create a desktop file instead of using a premade one, remove old
 
   13 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> mldonkey-2.9.3.ebuild:
   amd64 stable wrt bug #211382
diff --git a/net-p2p/mldonkey/files/mldonkey b/net-p2p/mldonkey/files/mldonkey
deleted file mode 100644
index 6a407cd64679..000000000000
--- a/net-p2p/mldonkey/files/mldonkey
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/mldonkey
-
-if [ ! -d ${HOME}/.mldonkey ] ; then
-	echo "Creating subdirectory \".mldonkey\" in your home"
-	echo "to store config files and downloaded files..."
-	
-	if ! mkdir ${HOME}/.mldonkey ; then
-		echo "Creation of subdirectory failed! Exiting..."
-		exit 1
-	fi
-fi
-
-cd ${HOME}/.mldonkey && exec /usr/bin/mlnet
diff --git a/net-p2p/mldonkey/files/mldonkey-gui.desktop b/net-p2p/mldonkey/files/mldonkey-gui.desktop
deleted file mode 100644
index 880ae71ff1bc..000000000000
--- a/net-p2p/mldonkey/files/mldonkey-gui.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=0.9.4
-Name=MLDonkey GUI
-Comment=MLDonkey graphical interface
-Comment[pl]=Graficzny interfejs do programu MLDonkey
-Exec=mlgui
-Icon=mldonkey
-Terminal=false
-Type=Application
-Categories=GTK;Network;P2P;
-# vi: encoding=utf-8
diff --git a/net-p2p/mldonkey/files/mldonkey.initd-2.8-r1 b/net-p2p/mldonkey/files/mldonkey.initd-2.8-r1
deleted file mode 100644
index 78f57ad83875..000000000000
--- a/net-p2p/mldonkey/files/mldonkey.initd-2.8-r1
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/sbin/runscript
-
-opts="start stop restart reload slow fast info"
-
-MLDONKEY_BINARY=${MLDONKEY_BINARY:-/usr/bin/mlnet}
-MLDONKEY_TIMEOUT=${TIMEOUT:-10}
-
-depend() {
-	need net
-	${USE_LOGGER} && use logger
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -z "${MLDONKEY_DIR}" ]; then
-		ewarn "mldonkey's start script has been changed. You should remove"
-		ewarn "BASEDIR and SUBDIR from /etc/conf.d/mldonkey and set MLDONKEY_DIR"
-		ewarn "to the correct value (you probably want"
-		ewarn "MLDONKEY_DIR=${BASEDIR}/${SUBDIR})"
-		MLDONKEY_DIR=${BASEDIR}/${SUBDIR}
-		einfo "Using ${MLDONKEY_DIR} as working directory"
-	fi
-
-	local result=0
-	if [ ! -d ${MLDONKEY_DIR} ]; then
-		einfo "Directory ${MLDONKEY_DIR} not existing, trying to create..."
-		if `mkdir -p ${MLDONKEY_DIR} 2>/dev/null`; then
-			chown ${USER}:users ${MLDONKEY_DIR}
-		else
-			eerror "Directory ${MLDONKEY_DIR} could not be created!"
-			((result++))
-		fi
-	fi
-
-	cd ${MLDONKEY_DIR}
-	env MLDONKEY_DIR=${MLDONKEY_DIR} start-stop-daemon --quiet --start \
-		-c ${USER} -N ${NICE} -x ${MLDONKEY_BINARY} &>${LOG} &
-	sleep 5
-
-	if ! pgrep -u ${USER} mlnet >/dev/null; then
-		eerror "${SVCNAME} could not be started! Check logfile: ${LOG}"
-		((result++))
-	fi
-
-	eend $result
-}
-
-setup_uri() {
-	BASE="http://"
-	if [[ -n ${USERNAME} && -n ${PASSWORD} ]]; then
-		BASE=${BASE}${USERNAME}:${PASSWORD}@
-	fi
-	BASE=${BASE}${SERVER}:${PORT}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME} -- please wait"
-
-	setup_uri
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} ${BASE}/submit?q=close_fds -q
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} ${BASE}/submit?q=save -q
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} ${BASE}/submit?q=kill -q
-
-	# give it a chance to die:
-	local timeout=${MLDONKEY_TIMEOUT}
-	while [ $timeout -gt 0 ] && pgrep -u ${USER} mlnet &>/dev/null; do
-		sleep 1
-		((timeout--))
-	done
-	if `pgrep -u ${USER} mlnet &>/dev/null`; then
-	start-stop-daemon --oknodo --stop -x ${MLDONKEY_BINARY} &>${LOG}
-	fi	
-
-	eend $?
-}
-
-restart() {
-	svc_stop
-	sleep 5
-	svc_start
-}
-
-reload() {
-	if ! service_started ${SVCNAME}; then
-		eerror "${SVCNAME} is not started"
-		return 0
-	fi
-
-	ebegin "Reloading ${SVCNAME}"
-
-	start-stop-daemon --stop --signal HUP --oknodo \
-		--exec ${MLDONKEY_BINARY} &>${LOG}
-
-	eend $?
-}
-
-slow() {
-	if ! service_started ${SVCNAME}; then
-		start_service ${SVCNAME}
-	fi
-
-	ebegin "Reducing bandwidth to ${LOW_DOWN}k/${LOW_UP}k"
-
-	setup_uri
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
-		${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN} -q
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
-		${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP} -q
-
-	eend $?
-}
-
-fast() {
-	if ! service_started ${SVCNAME}; then
-		start_service ${SVCNAME}
-	fi
-
-	ebegin "Increasing bandwidth to ${HIGH_DOWN}k/${HIGH_UP}k"
-
-	setup_uri
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
-		${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP} -q
-	wget --spider --timeout=${MLDONKEY_TIMEOUT} \
-		${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN} -q
-
-
-	eend $?
-}
-
-
-info() {
-	if ! service_started ${SVCNAME}; then
-		eerror "${SVCNAME} is not started"
-		return 0
-	fi
-
-	setup_uri
-	local result=$(/usr/bin/wget --timeout=${MLDONKEY_TIMEOUT} \
-		-O - ${BASE}/submit?q=vo 2> /dev/null | \
-		/bin/grep -C1 max_hard_upload | \
-		/bin/grep value=\" | /bin/cut -d\" -f2)
-	if [[ ${result} -eq ${LOW_UP} ]]; then
-		einfo "${SVCNAME} runs slow"
-	else
-		einfo "${SVCNAME} runs fast"
-	fi
-}
diff --git a/net-p2p/mldonkey/files/mldonkey.png b/net-p2p/mldonkey/files/mldonkey.png
deleted file mode 100644
index e43f94d3d38b..000000000000
--- a/net-p2p/mldonkey/files/mldonkey.png
+++ /dev/null
diff --git a/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild
deleted file mode 100644
index c6d058fef238..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild,v 1.2 2008/01/19 16:13:45 aballier Exp $
-
-WANT_AUTOCONF=2.5
-
-inherit flag-o-matic eutils autotools
-
-EAPI="1"
-
-IUSE="doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-
-DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface."
-HOMEPAGE="http://mldonkey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="dev-lang/perl
-	guionly? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gtk? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gd? ( >=media-libs/gd-2.0.28 )
-	magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-3.08.3
-	sys-apps/sed"
-
-MLUSER="p2p"
-
-pkg_setup() {
-	if use gtk; then
-		echo ""
-		einfo "If the compile with gui fails, and you have updated Ocaml"
-		einfo "recently, you may have forgotten that you need to run"
-		einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
-		einfo "to learn which ebuilds you need to recompile"
-		einfo "each time you update Ocaml to a different version"
-		einfo "see the Ocaml ebuild for details"
-		echo ""
-	fi
-
-	if use gtk && !(built_with_use dev-ml/lablgtk svg); then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
-	fi
-
-	if use gd && !(built_with_use media-libs/gd truetype); then
-		eerror "media-libs/gd must be built with 'truetype' to compile"
-		eerror "MLDonkey with gd support"
-		die "Recompile media-libs/gd with enabled truetype USE flag"
-	fi
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	cd "${S}"/config
-	eautoconf
-	cd "${S}"
-	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
-}
-
-src_compile() {
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-
-	# onlygui	Disable all nets support, build only chosen GUI
-
-	if use gtk || use guionly; then
-		myconf="--enable-gui=newgui2"
-	else
-		myconf="--disable-gui"
-	fi
-
-	if use guionly; then
-		myconf="${myconf} --disable-multinet --disable-donkey"
-	fi
-
-	cd "${S}"
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-checks \
-		--disable-batch \
-		$(use_enable fasttrack) \
-		$(use_enable gnutella) \
-		$(use_enable gnutella gnutella2) \
-		$(use_enable gd) \
-		$(use_enable magic) \
-		--enable-ocamlver=3.10 \
-		${myconf} || die "econf failed"
-
-	export OCAMLRUNPARAM="l=256M"
-	emake || die "emake failed"
-
-	if ! use guionly; then
-		emake utils || die "emake utils failed"
-	fi;
-}
-
-src_install() {
-	local myext=""
-	use ocamlopt || myext=".byte"
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-	if ! use guionly; then
-		for i in mlnet mld_hash get_range copysources make_torrent subconv; do
-			newbin $i$myext $i || die "failed to install $i"
-		done
-
-		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
-		fperms 600 /etc/conf.d/mldonkey
-		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
-	fi
-
-	if use gtk; then
-		for i in mlgui mlguistarter; do
-			newbin $i$myext $i || die "failed to install $i"
-		done
-		domenu "${FILESDIR}"/${PN}-gui.desktop
-		doicon "${FILESDIR}"/${PN}.png
-	fi
-
-	if use doc ; then
-		cd "${S}"/distrib
-		dodoc ChangeLog *.txt
-		dohtml *.html
-
-		insinto /usr/share/doc/${PF}/scripts
-		doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
-		cd "${S}"/docs
-		dodoc *.txt *.tex *.pdf
-		dohtml *.html
-
-		cd "${S}"/docs/developers
-		dodoc *.txt *.tex
-
-		cd "${S}"/docs/images
-		insinto /usr/share/doc/${PF}/html/images
-		doins *
-	fi
-}
-
-pkg_preinst() {
-	if ! use guionly; then
-		enewuser ${MLUSER} -1 -1 /home/p2p users
-	fi
-}
-
-pkg_postinst() {
-	if ! use guionly; then
-		echo
-		einfo "If you want to start MLDonkey as a system service, use"
-		einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-		einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-		einfo "/etc/conf.d/mldonkey also."
-		echo
-		einfo "Attention: 2.6 has changed the inifiles structure, so downgrading"
-		einfo "will be problematic."
-		einfo "User settings (admin) are transferred to users.ini from "
-		einfo "downloads.ini"
-		einfo "Old ini files are automatically converted to the new format"
-		echo
-	else
-		echo
-		einfo "Simply run mlgui to start the chosen MLDonkey gui."
-		einfo "It puts its config files into ~/.mldonkey"
-	fi
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.9.2.ebuild b/net-p2p/mldonkey/mldonkey-2.9.2.ebuild
deleted file mode 100644
index d505688b7432..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.9.2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.2.ebuild,v 1.6 2008/01/06 16:04:14 armin76 Exp $
-
-inherit flag-o-matic
-
-IUSE="doc fasttrack gd gnutella gtk guionly magic"
-
-DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface."
-HOMEPAGE="http://mldonkey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ~sparc x86 ~x86-fbsd"
-
-RDEPEND="dev-lang/perl
-	guionly? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gtk? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gd? ( >=media-libs/gd-2.0.28 )
-	magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	>=dev-lang/ocaml-3.08.3"
-
-MLUSER="p2p"
-
-pkg_setup() {
-	if use gtk; then
-		echo ""
-		einfo "If the compile with gui fails, and you have updated Ocaml"
-		einfo "recently, you may have forgotten that you need to run"
-		einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
-		einfo "to learn which ebuilds you need to recompile"
-		einfo "each time you update Ocaml to a different version"
-		einfo "see the Ocaml ebuild for details"
-		echo ""
-	fi
-
-	if use gtk && !(built_with_use dev-ml/lablgtk svg); then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
-	fi
-
-	if use gd && !(built_with_use media-libs/gd truetype); then
-		eerror "media-libs/gd must be built with 'truetype' to compile"
-		eerror "MLDonkey with gd support"
-		die "Recompile media-libs/gd with enabled truetype USE flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	export WANT_AUTOCONF=2.5
-	cd "${S}"/config
-	autoconf
-	cd "${S}"
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,noexecstack
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-
-	# onlygui	Disable all nets support, build only chosen GUI
-
-	if use gtk || use guionly; then
-		myconf="--enable-gui=newgui2"
-	else
-		myconf="--disable-gui"
-	fi
-
-	if use guionly; then
-		myconf="${myconf} --disable-multinet --disable-donkey"
-	fi
-
-	cd "${S}"
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-checks \
-		--disable-batch \
-		$(use_enable fasttrack) \
-		$(use_enable gnutella) \
-		$(use_enable gnutella gnutella2) \
-		$(use_enable gd) \
-		$(use_enable magic) \
-		${myconf} || die "econf failed"
-
-	export OCAMLRUNPARAM="l=256M"
-	emake || die "emake failed"
-
-	if ! use guionly; then
-		emake utils || die "emake utils failed"
-	fi;
-}
-
-src_install() {
-	if ! use guionly; then
-		dobin mlnet mld_hash get_range copysources make_torrent subconv \
-			|| die "dobin failed"
-
-		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
-		fperms 600 /etc/conf.d/mldonkey
-		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
-	fi
-
-	if use gtk; then
-		dobin mlgui mlguistarter || die "dobin failed"
-		domenu "${FILESDIR}"/${PN}-gui.desktop
-		doicon "${FILESDIR}"/${PN}.png
-	fi
-
-	if use doc ; then
-		cd "${S}"/distrib
-		dodoc ChangeLog *.txt
-		dohtml *.html
-
-		insinto /usr/share/doc/${PF}/scripts
-		doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
-		cd "${S}"/docs
-		dodoc *.txt *.tex *.pdf
-		dohtml *.html
-
-		cd "${S}"/docs/developers
-		dodoc *.txt *.tex
-
-		cd "${S}"/docs/images
-		insinto /usr/share/doc/${PF}/html/images
-		doins *
-	fi
-}
-
-pkg_preinst() {
-	if ! use guionly; then
-		enewuser ${MLUSER} -1 -1 /home/p2p users
-	fi
-}
-
-pkg_postinst() {
-	if ! use guionly; then
-		echo
-		einfo "If you want to start MLDonkey as a system service, use"
-		einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-		einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-		einfo "/etc/conf.d/mldonkey also."
-		echo
-		einfo "Attention: 2.6 has changed the inifiles structure, so downgrading"
-		einfo "will be problematic."
-		einfo "User settings (admin) are transferred to users.ini from "
-		einfo "downloads.ini"
-		einfo "Old ini files are automatically converted to the new format"
-		echo
-	else
-		echo
-		einfo "Simply run mlgui to start the chosen MLDonkey gui."
-		einfo "It puts its config files into ~/.mldonkey"
-	fi
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.9.3.ebuild b/net-p2p/mldonkey/mldonkey-2.9.3.ebuild
index a0f9447988a9..889f94291290 100644
--- a/net-p2p/mldonkey/mldonkey-2.9.3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.3.ebuild,v 1.5 2008/03/13 12:32:45 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.3.ebuild,v 1.6 2008/03/19 19:30:12 armin76 Exp $
 
 WANT_AUTOCONF=2.5
 
@@ -127,8 +127,8 @@ src_install() {
 		for i in mlgui mlguistarter; do
 			newbin $i$myext $i || die "failed to install $i"
 		done
-		domenu "${FILESDIR}"/${PN}-gui.desktop
-		doicon "${FILESDIR}"/${PN}.png
+		make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+		newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
 	fi
 
 	if use doc ; then
diff --git a/net-p2p/mldonkey/mldonkey-2.9.4.ebuild b/net-p2p/mldonkey/mldonkey-2.9.4.ebuild
index 64d17ec8a924..8b8d68db624f 100644
--- a/net-p2p/mldonkey/mldonkey-2.9.4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.4.ebuild,v 1.1 2008/03/04 14:33:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.4.ebuild,v 1.2 2008/03/19 19:30:12 armin76 Exp $
 
 WANT_AUTOCONF=2.5
 
@@ -127,8 +127,8 @@ src_install() {
 		for i in mlgui mlguistarter; do
 			newbin $i$myext $i || die "failed to install $i"
 		done
-		domenu "${FILESDIR}"/${PN}-gui.desktop
-		doicon "${FILESDIR}"/${PN}.png
+		make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+		newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
 	fi
 
 	if use doc ; then