Fix installation wrt #238613, thanks to Christophe LEFEBVRE.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 53 insertions, 36 deletions

diff --git a/net-im/linpopup/ChangeLog b/net-im/linpopup/ChangeLog
index 571d859e5233..0257f8b93564 100644
--- a/net-im/linpopup/ChangeLog
+++ b/net-im/linpopup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/linpopup
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.15 2007/05/06 11:43:30 genone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.16 2009/08/05 07:12:04 ssuominen Exp $
+
+  05 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +files/2.0.4-link.patch, linpopup-2.0.4-r1.ebuild,
+  -files/linpopup.desktop:
+  Fix installation wrt #238613, thanks to Christophe LEFEBVRE.
 
   06 May 2007; Marius Mauch <genone@gentoo.org> linpopup-2.0.4-r1.ebuild:
   Replacing einfo with elog
diff --git a/net-im/linpopup/Manifest b/net-im/linpopup/Manifest
index e23392c44a6b..9f4ee170703a 100644
--- a/net-im/linpopup/Manifest
+++ b/net-im/linpopup/Manifest
@@ -1,6 +1,6 @@
+AUX 2.0.4-link.patch 849 RMD160 b0e11b7b2dbc2e76e443945a6041e74b07babe2d SHA1 821e67b1dca593ca7e337a3a166eeb7763e38743 SHA256 f467fb5ef818ae534c3350096d54b3c9bdac5e4454dfaec29a48ad11d2185c2e
 AUX 2.0.4-overflow.patch 1336 RMD160 d9b836f26963cb0087c4cb8c6fa98a958863eefc SHA1 ace898d560656af285b4e6e284ed354c4fe73bab SHA256 caa4183475f6702f0aa2b2ddca4080888df91dcdcecd3923ddbdfc1207979752
-AUX linpopup.desktop 188 RMD160 0a828c8d09e910b7022dc55d11280c075ed164ab SHA1 a929945e31bb748e502f8c16a2f4c4f43a63dc3d SHA256 dedccc5ecf113be71233561eff88de82f876bd470f8336f72539eb61b052d169
 DIST linpopup-2.0.4.tar.bz2 128450 RMD160 5219d22c9fdc1e3ff80d67d90d589377b7557a12 SHA1 4cdccf9ce1241c25e525ac1407e0c1b2044ec1c0 SHA256 899038798f60672880456fa46723c235367a27c422ce70d01120ea7ffee70dd4
-EBUILD linpopup-2.0.4-r1.ebuild 1587 RMD160 cc563975e460c1f5d09af03b6715e301594e6a69 SHA1 efa894432d27f2527006624a8ade612f84f1397c SHA256 94fb733f22ce1349602725b14bb70558e9b84e331348fec6c2b60e1c470056fd
-MISC ChangeLog 1889 RMD160 ec4457c3cc42c4bdf7febb1ff7d77e2d1560ba87 SHA1 c20eb8e856c3a7edfbc90077a979c0203f9546ae SHA256 ef2a64e84ed5deaa807bdc6343f6c60a2bf10cd26f05ce58c92edaa8545fe8e2
+EBUILD linpopup-2.0.4-r1.ebuild 1568 RMD160 d8c2bdc90b2d5100fad39f071c0b13b1a030ebbb SHA1 224598d5a27e5ea7647202cb2dba11eb248452b1 SHA256 f25ddd956fdc9691ad9f3f06deb3b45b2d385c8614d3335b6b38cb6cea353eeb
+MISC ChangeLog 2090 RMD160 060dd89c72294bfaa8d3a5b8290f78e36c0450fc SHA1 a29f4cac4c8a209971410965e3164e0a6513fed5 SHA256 b3081e338fe9501d0a8c47255c57c82c896ceccc928e1eda9f2b55e7c175a713
 MISC metadata.xml 178 RMD160 3df3711b29ed6db98dbd51e4478516344e1ff55d SHA1 c7e29706dea757d74a9f43caf3824e3933c86cab SHA256 dbef97407af642ded30fc584f0dc3eb22fcc880ad6384bfed8d8ced6c7b54fdd
diff --git a/net-im/linpopup/files/2.0.4-link.patch b/net-im/linpopup/files/2.0.4-link.patch
new file mode 100644
index 000000000000..71e2b5346b95
--- /dev/null
+++ b/net-im/linpopup/files/2.0.4-link.patch
@@ -0,0 +1,23 @@
+diff -ur linpopup-2.0.4.orig/Makefile.am linpopup-2.0.4/Makefile.am
+--- linpopup-2.0.4.orig/Makefile.am	2003-08-17 03:18:55.000000000 +0300
++++ linpopup-2.0.4/Makefile.am	2009-08-05 10:10:40.000000000 +0300
+@@ -17,6 +17,5 @@
+ 	   $(mkinstalldirs) $(DATA_FILE); \
+ 	   rm -fR $(DATA_FILE); \
+ 	   touch $(DATA_FILE); \
+-	   chgrp nobody $(DATA_FILE); \
+-	   chmod 0666 $(DATA_FILE); \
++	   chmod 0600 $(DATA_FILE); \
+ 	fi
+diff -ur linpopup-2.0.4.orig/src/Makefile.am linpopup-2.0.4/src/Makefile.am
+--- linpopup-2.0.4.orig/src/Makefile.am	2003-08-17 03:18:40.000000000 +0300
++++ linpopup-2.0.4/src/Makefile.am	2009-08-05 10:09:53.000000000 +0300
+@@ -56,8 +56,6 @@
+ 
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+-	ln -fs $(PACKAGE) $(DESTDIR)$(bindir)/$(PROGNAME_LNK)
+ 
+ uninstall-local:
+ 	@$(NORMAL_UNINSTALL)
+-	rm -f $(DESTDIR)$(bindir)/$(PROGNAME_LNK)
diff --git a/net-im/linpopup/files/linpopup.desktop b/net-im/linpopup/files/linpopup.desktop
deleted file mode 100644
index ee2b99401ffe..000000000000
--- a/net-im/linpopup/files/linpopup.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=LinPopUp
-Comment=Send and recieve network messages
-Exec=LinPopUp
-StartupNotify=false
-Terminal=false
-Type=Application
-Icon=linpopup.xpm
-Categories=Application;Network;
diff --git a/net-im/linpopup/linpopup-2.0.4-r1.ebuild b/net-im/linpopup/linpopup-2.0.4-r1.ebuild
index 8c125be7de95..e0baf0d71c2b 100644
--- a/net-im/linpopup/linpopup-2.0.4-r1.ebuild
+++ b/net-im/linpopup/linpopup-2.0.4-r1.ebuild
@@ -1,43 +1,41 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.4-r1.ebuild,v 1.3 2007/05/06 11:43:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.4-r1.ebuild,v 1.4 2009/08/05 07:12:04 ssuominen Exp $
 
-inherit gnome2 eutils
+EAPI=2
+GCONF_DEBUG=no
+inherit autotools eutils gnome2
 
-DESCRIPTION="GTK2 port of the LinPopUp messaging client for Samba (including Samba 3)"
+DESCRIPTION="GTK+ port of the LinPopUp messaging client for Samba (including Samba 3)"
 HOMEPAGE="http://linpopup2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/linpopup2/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="gnome"
+IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=net-fs/samba-2.2.8a"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	x11-libs/libXmu"
+	x11-proto/xproto"
 
-DOCS="AUTHORS BUGS ChangeLog INSTALL MANUAL NEWS README THANKS TODO"
+DOCS="AUTHORS BUGS ChangeLog MANUAL NEWS README THANKS TODO"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-overflow.patch
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${PV}-overflow.patch \
+		"${FILESDIR}"/${PV}-link.patch
+	eautoreconf
 }
 
 src_install() {
-	# Install icon and .desktop for menu entry
-	if use gnome ; then
-		insinto /usr/share/pixmaps
-		newins ${S}/pixmaps/icon_256.xpm linpopup.xpm
-		insinto /usr/share/applications
-		doins ${FILESDIR}/linpopup.desktop
-	fi
-
 	gnome2_src_install
+	dosym linpopup /usr/bin/LinPopUp || die "dosym failed"
+	newicon pixmaps/icon_256.xpm ${PN}.xpm
+	make_desktop_entry ${PN} LinPopUp ${PN}
 }
 
 pkg_postinst() {