Fixed installation of executable to /usr/share (#295769)

Removed old patches
+ move to EAPI2
Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 64 insertions, 53 deletions

diff --git a/net-p2p/linuxdcpp/ChangeLog b/net-p2p/linuxdcpp/ChangeLog
index 61478de9e09f..982189708b60 100644
--- a/net-p2p/linuxdcpp/ChangeLog
+++ b/net-p2p/linuxdcpp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/linuxdcpp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.40 2010/06/18 19:28:36 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/ChangeLog,v 1.41 2010/06/18 21:51:21 sochotnicky Exp $
+
+*linuxdcpp-1.0.3-r1 (18 Jun 2010)
+
+  18 Jun 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -files/linuxdcpp-1.0.1-fix-remote-vulnerability.patch,
+  +linuxdcpp-1.0.3-r1.ebuild, -files/1.0.1-gcc-4.3.patch:
+  Fixed installation of executable to /usr/share (#295769)
+  Removed old patches
 
   18 Jun 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
   linuxdcpp-9999.ebuild:
diff --git a/net-p2p/linuxdcpp/Manifest b/net-p2p/linuxdcpp/Manifest
index 4c815b230a15..3aabd1ee9559 100644
--- a/net-p2p/linuxdcpp/Manifest
+++ b/net-p2p/linuxdcpp/Manifest
@@ -1,7 +1,6 @@
-AUX 1.0.1-gcc-4.3.patch 495 RMD160 52ec76b42dd9361520b247a5c7dcf591c8d44ae3 SHA1 73259cfbb77bdbdee322b75cfa89117956403d4c SHA256 9b59df535273dad60903c65df7cea470d016e1a4376dbfec816c205325a954dc
-AUX linuxdcpp-1.0.1-fix-remote-vulnerability.patch 953 RMD160 26457948031fccde029f9d8e2df6eb24de069316 SHA1 dede29ac45406f2016f0f0d55c83657e840d27b4 SHA256 41fb65c533d80a6b2d792c9c1133b26e83780478017ca11b129a30467ac6537c
 DIST linuxdcpp-1.0.3.tar.bz2 289891 RMD160 b44fe8fb540150786458aa85fbf4631bd9de16cd SHA1 383a55bbc2169280e982571aac92555a25dc05e4 SHA256 3b4eb6cf015f0fe8283508976b24dbb1cd4fb861116d4536f1055136c2442c71
+EBUILD linuxdcpp-1.0.3-r1.ebuild 1430 RMD160 9dba267a5d34e13ad392bbef7a53f609d003d515 SHA1 cd75f1df06614cb124edfa6debdeabdce588f457 SHA256 225fcbdd2d73ff5db4e893014a8435cd5817d9b3abd334279aa77b032259fad1
 EBUILD linuxdcpp-1.0.3.ebuild 1238 RMD160 53517495e71852c972ab2dfb858c70ad958023de SHA1 e13c7dee011206a6d5cb043476684ad7ac96f28c SHA256 c8dccd2bbe3cc9ed58717b10adad33914f90657ddee083675c1877ef84a34fb9
 EBUILD linuxdcpp-9999.ebuild 1204 RMD160 ed500630773d94ecc34fb057d88df8fddae050b7 SHA1 57c562b5d239d6df9d796c10e5fe1a2492044bcd SHA256 2bb34780959763400ff21d0bf96c9a8c3fd0f62bdf2863f092725ce96d7483e2
-MISC ChangeLog 5783 RMD160 6c77f5005732c1333b7c7d51156e0d01ff948e3a SHA1 6ac9a014266ce11a4ef6b67759b98d059a472db2 SHA256 02e8122f23cf3f2f3cf0d39befee67242ca0f556f41abfbed2593df79d5b308a
+MISC ChangeLog 6076 RMD160 21fb77b5ec183c83252736a4d86d4b04be675de7 SHA1 39647a07e703fe4b7b7efe60108465612f161fab SHA256 e40a3d4e130c4554812c4bdca2b84fe86aa656aeb3ab84b49d25873412c851ee
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
diff --git a/net-p2p/linuxdcpp/files/1.0.1-gcc-4.3.patch b/net-p2p/linuxdcpp/files/1.0.1-gcc-4.3.patch
deleted file mode 100644
index 279663eddefb..000000000000
--- a/net-p2p/linuxdcpp/files/1.0.1-gcc-4.3.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 linuxdcpp-1.0.1.orig/client/ShareManager.h linuxdcpp-1.0.1/client/ShareManager.h
---- linuxdcpp-1.0.1.orig/client/ShareManager.h	2007-07-07 22:02:08.000000000 +0200
-+++ linuxdcpp-1.0.1/client/ShareManager.h	2008-06-22 14:14:30.000000000 +0200
-@@ -35,10 +35,12 @@
- #include "Singleton.h"
- #include "BloomFilter.h"
- #include "FastAlloc.h"
- #include "MerkleTree.h"
- 
-+#include <memory>	// GCC 4.3 fix
-+
- STANDARD_EXCEPTION(ShareException);
- 
- class SimpleXML;
- class Client;
- class File;
diff --git a/net-p2p/linuxdcpp/files/linuxdcpp-1.0.1-fix-remote-vulnerability.patch b/net-p2p/linuxdcpp/files/linuxdcpp-1.0.1-fix-remote-vulnerability.patch
deleted file mode 100644
index ab2346678a38..000000000000
--- a/net-p2p/linuxdcpp/files/linuxdcpp-1.0.1-fix-remote-vulnerability.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=230075
-Security bug, fixed upstream.
---- client/ShareManager.cpp	13 Oct 2007 21:56:55 -0000	1.14
-+++ client/ShareManager.cpp	29 Jun 2008 15:34:36 -0000	1.15
-@@ -926,6 +926,10 @@
- 			}
- 			j = i + 1;
- 		}
-+
-+		if(it == directories.end())
-+			return NULL;
-+
- 		for(ShareManager::Directory::MapIter it2 = it->second->directories.begin(); it2 != it->second->directories.end(); ++it2) {
- 			it2->second->toXml(sos, indent, tmp, recurse);
- 		}
---- client/NmdcHub.cpp	4 Aug 2007 21:17:21 -0000	1.14
-+++ client/NmdcHub.cpp	29 Jun 2008 15:42:27 -0000	1.15
-@@ -693,10 +693,14 @@
- 		if(fromNick.empty())
- 			return;
- 
-+		if(param.size() < j + 2) {
-+			return;
-+		}
-+		string msg = param.substr(j + 2);
-+
- 		OnlineUser* replyTo = findUser(rtNick);
- 		OnlineUser* from = findUser(fromNick);
- 
--		string msg = param.substr(j + 2);
- 		if(replyTo == NULL || from == NULL) {
- 			if(replyTo == 0) {
- 				// Assume it's from the hub
diff --git a/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..549d503cfb5c
--- /dev/null
+++ b/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/linuxdcpp/linuxdcpp-1.0.3-r1.ebuild,v 1.1 2010/06/18 21:51:21 sochotnicky Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Direct connect client, looks and works like famous DC++"
+HOMEPAGE="https://launchpad.net/linuxdcpp"
+SRC_URI="http://launchpad.net/linuxdcpp/1.0/${PV}/+download/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug"
+
+RDEPEND=">=gnome-base/libglade-2.4
+	>=x11-libs/gtk+-2.6
+	app-arch/bzip2
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	media-libs/fontconfig
+	>=dev-util/scons-0.96
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# prevent scons installation of *txt files to wrong directory
+	sed -i 's/.*source = text_files.*//' SConstruct
+}
+
+src_compile() {
+	local myconf=""
+	use debug && myconf="${myconf} debug=1"
+
+	scons ${myconf} ${MAKEOPTS} CXXFLAGS="${CXXFLAGS}" PREFIX=/usr || die "scons failed"
+}
+
+src_install() {
+	# linuxdcpp does not install docs according to gentoos naming scheme, so do it by hand
+	dodoc Readme.txt Changelog.txt Credits.txt
+	rm "${S}"/*.txt
+
+	scons install PREFIX="/usr" FAKE_ROOT="${D}" || die "scons install failed"
+
+	doicon pixmaps/${PN}.png
+	make_desktop_entry "${PN}" "${PN}" "${PN}"
+}
+
+pkg_postinst() {
+	elog
+	elog "After adding first directory to shares you might need to restart linuxdcpp."
+	elog
+}