From bed01402e57d442b2e30885ab945202f360b4712 Mon Sep 17 00:00:00 2001
From: Sergey Popov <admin@pinkbyte.ru>
Date: Mon, 23 Jan 2012 21:48:46 +0400
Subject: [PATCH] include some changes from upstream tftp-hpa ebuild

---
 net-ftp/tftp-hpa/Manifest                  |  4 ++--
 net-ftp/tftp-hpa/tftp-hpa-5.1-r9999.ebuild | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index 383b966..e7992d8 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -4,6 +4,6 @@ AUX tftp-hpa-5.0-filecase.patch 1980 RMD160 ddd70d8128afbabb9ad60b497c9369ce3efd
 AUX tftp-hpa-5.1-filecase.patch 1998 RMD160 eacc524c28c2a788be55d6034f016e78e468232a SHA1 6d54c4408c2a14697196e845b32dc54ea685833d SHA256 126f52def2b560f78d8f1bb3d34592926cbb659d4a7e5fbc651c2fcaa6d5dda9
 AUX tftp.xinetd 219 RMD160 7927ad10668599d03bbbefe55700c9a018033858 SHA1 658125a31f5348d225367441f8f528afa10f2007 SHA256 044c1c262cbeddbcddf449a694c5c472cc236aba87ea89b5a4dc7a76a1bf90a5
 DIST tftp-hpa-5.0.tar.bz2 93039 RMD160 fbafc398b40098343b9e9e82badcfe6bd0eb3932 SHA1 7f541f085a4af5a87bf86a249421b13a30150597 SHA256 96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
-DIST tftp-hpa-5.1.tar.bz2 93919 RMD160 85591436968e176e1b92d2f7fe547bad34855a97 SHA1 4ccebeea0669c27a707cd38b7087d3713c485526 SHA256 fd3f92064f26367051af91ea44b2553566e3d96cd73b4ccdf28e547e18d0e24c
+DIST tftp-hpa-5.1.tar.xz 89288 RMD160 44dcf64d083aa7a988a4f377954c31bb24da2009 SHA1 ade09d8aba5cb1155d0309c42ac427358cd41853 SHA256 f736417a4d436512168ec34fe0ed13845388a3f01b862baa50b7b427e7ab5e42
 EBUILD tftp-hpa-5.0-r9999.ebuild 1275 RMD160 2a75f90c7be902b97368223e6ccd40b0dcfd339f SHA1 333f39aa79bd99e5142615ac6d5137d57e71de58 SHA256 25b6b53fca5ddfd78fa0d9063de2fe91e1e094c674a878deeb2450e2ee29ad54
-EBUILD tftp-hpa-5.1-r9999.ebuild 1164 RMD160 6ab98488c713a772a0d009be4d58b088a8f08bc2 SHA1 84221a2935ce2561d66129452a70ce9d2410bcfc SHA256 03b2618ad721b30004251a7a9ad57a1f9f26da10c099aefe2625f9243db9867c
+EBUILD tftp-hpa-5.1-r9999.ebuild 1244 RMD160 dbf5b64d14fdb4b4ebc0388c64ac63e32cd63c6f SHA1 1c1ad1c56b244718c44dab5e7e85bcf1e8a4f0d5 SHA256 7be72bd1c7f7b3c1e7fd226fee7bf36b171f4af973193d6964e874e9ba1ccfdb
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.1-r9999.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.1-r9999.ebuild
index f4519e3..6883d62 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.1-r9999.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.1-r9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI="4"
+
 inherit eutils
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
-SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
+SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -13,26 +15,27 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="ipv6 readline selinux tcpd"
 
 RDEPEND="selinux? ( sec-policy/selinux-tftpd )
+	readline? ( sys-libs/readline )
+	tcpd? ( sys-apps/tcp-wrappers )
 	!net-ftp/atftp
 	!net-ftp/netkit-tftp"
 DEPEND="${RDEPEND}
+	app-arch/xz-utils
 	readline? ( sys-libs/readline )
 	tcpd? ( sys-apps/tcp-wrappers )"
 
-src_compile() {
-	# additional patch for Windows clients
+src_configure() {
+	# Pinkbyte: additional patch for Windows clients
 	epatch "${FILESDIR}"/${P}-filecase.patch
 	#
 	econf \
 		$(use_with ipv6) \
 		$(use_with tcpd tcpwrappers) \
-		$(use_with readline) \
-		|| die
-	emake || die
+		$(use_with readline)
 }
 
 src_install() {
-	emake INSTALLROOT="${D}" install || die
+	emake INSTALLROOT="${D}" install
 	dodoc README* CHANGES tftpd/sample.rules
 
 	# iputils installs this