clean up; version bump bug #235146; fixed bug #3335973; set to valid email adresse

(Portage version: 2.1.9.25/cvs/Linux i686)

7 files changed, 79 insertions, 144 deletions

diff --git a/app-misc/irtrans-irclient/ChangeLog b/app-misc/irtrans-irclient/ChangeLog
index 86fb507c8df0..43d11186e36b 100644
--- a/app-misc/irtrans-irclient/ChangeLog
+++ b/app-misc/irtrans-irclient/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/irtrans-irclient
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/ChangeLog,v 1.6 2009/09/23 16:03:31 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/ChangeLog,v 1.7 2011/02/02 10:01:56 hd_brummy Exp $
+
+*irtrans-irclient-6.01.05 (02 Feb 2011)
+
+  02 Feb 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/irtrans-irclient-5.9.01-missing-include.diff,
+  -irtrans-irclient-5.9.04.ebuild, -irtrans-irclient-5.9.07.ebuild,
+  -irtrans-irclient-5.11.04.ebuild, +irtrans-irclient-6.01.05.ebuild,
+  metadata.xml:
+  clean up; version bump bug #235146; fixed bug #3335973; set to valid email
+  adresse
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   irtrans-irclient-5.9.04.ebuild, irtrans-irclient-5.9.07.ebuild,
diff --git a/app-misc/irtrans-irclient/files/irtrans-irclient-5.9.01-missing-include.diff b/app-misc/irtrans-irclient/files/irtrans-irclient-5.9.01-missing-include.diff
deleted file mode 100644
index 1d943300a1d9..000000000000
--- a/app-misc/irtrans-irclient/files/irtrans-irclient-5.9.01-missing-include.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Joerg Bornkessel <hd_brummy@gentoo.org> 16 Aug 2007
-
-diff -Naur client.c.orig client.c
---- client.c.orig	2007-08-16 15:09:02.000000000 +0200
-+++ client.c	2007-08-16 15:09:24.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <errno.h>
- #include <netdb.h>
- #include <signal.h>
-+#include <stdlib.h>
- typedef int SOCKET;
- typedef void* WSAEVENT;
- #define closesocket close
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-5.11.04.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-5.11.04.ebuild
deleted file mode 100644
index 35d2535eecb4..000000000000
--- a/app-misc/irtrans-irclient/irtrans-irclient-5.11.04.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/irtrans-irclient-5.11.04.ebuild,v 1.3 2009/09/23 16:03:31 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="strip"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="http://ftp.mars.arge.at/irtrans/irclient-src-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-
-	append-flags -DLINUX
-
-	# Set sane defaults (arm target has no -D flags added)
-	irbuild=irclient_arm
-	irclient=irclient
-
-	# change variable by need
-	if use x86 ; then
-		irbuild=irclient
-	elif use amd64 ; then
-		irbuild=irclient64
-		irclient=irclient64
-	elif use arm ; then
-		irbuild=irclient_arm
-	fi
-
-	# Some output for bugreport
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "Build Target=\"${irbuild}\""
-	einfo "Build Binary=\"${irclient}\""
-
-	# Build
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" "${irbuild}" || die "emake irclient failed"
-}
-
-src_install() {
-
-	newbin "${WORKDIR}/${irclient}" irclient
-}
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-5.9.04.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-5.9.04.ebuild
deleted file mode 100644
index a4a9d620c441..000000000000
--- a/app-misc/irtrans-irclient/irtrans-irclient-5.9.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/irtrans-irclient-5.9.04.ebuild,v 1.4 2009/09/23 16:03:31 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="IRTrans ASCII Client"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="ftp://mars.arge.at/irtrans/irserver-src-${PV}.tar.gz
-		http://ftp.mars.arge.at/irtrans/irserver-src-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	epatch "${FILESDIR}/${PN}"-5.9.01-missing-include.diff
-}
-
-src_compile() {
-
-	append-flags -DLINUX -Icommon
-	$(tc-getCC) ${CFLAGS} -o irclient  client.c || die "irclient compile failed"
-	$(tc-getCC) ${CFLAGS} -o ip_assign  ip_assign.c || die "ip_assign compile failed"
-}
-
-src_install() {
-
-	dobin "${WORKDIR}"/irclient
-	dobin "${WORKDIR}"/ip_assign
-}
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-5.9.07.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-5.9.07.ebuild
deleted file mode 100644
index f687f9ead8ec..000000000000
--- a/app-misc/irtrans-irclient/irtrans-irclient-5.9.07.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/irtrans-irclient-5.9.07.ebuild,v 1.4 2009/09/23 16:03:31 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="IRTrans ASCII Client"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="ftp://mars.arge.at/irtrans/irserver-src-${PV}.tar.gz
-		http://ftp.mars.arge.at/irtrans/irserver-src-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	epatch "${FILESDIR}/${PN}"-5.9.01-missing-include.diff
-}
-
-src_compile() {
-
-	append-flags -DLINUX -Icommon
-	$(tc-getCC) ${CFLAGS} -o irclient  client.c || die "irclient compile failed"
-	$(tc-getCC) ${CFLAGS} -o ip_assign  ip_assign.c || die "ip_assign compile failed"
-}
-
-src_install() {
-
-	dobin "${WORKDIR}"/irclient
-	dobin "${WORKDIR}"/ip_assign
-}
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
new file mode 100644
index 000000000000..a5c420e7a6c0
--- /dev/null
+++ b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild,v 1.1 2011/02/02 10:01:56 hd_brummy Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RESTRICT="strip"
+
+DESCRIPTION="IRTrans Server"
+HOMEPAGE="http://www.irtrans.de"
+SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-${PV}.tar.gz
+	http://ftp.disconnected-by-peer.at/irtrans/${PN}-5.11.04-ip_assign-1.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE=""
+
+RDEPEND="virtual/libc"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${WORKDIR}/${PN}"-5.11.04-ip_assign-1.patch
+}
+
+src_compile() {
+
+	append-flags -DLINUX
+
+	# Set sane defaults (arm target has no -D flags added)
+	irbuild=irclient_arm
+	irclient=irclient
+	ipbuild=ip_assign_arm
+	ip_assign=ip_assign
+
+	# change variable by need
+	if use x86 ; then
+		irbuild=irclient
+		ipbuild=ip_assign
+	elif use amd64 ; then
+		irbuild=irclient64
+		irclient=irclient64
+		ipbuild=ip_assign64
+		ip_assign=ip_assign64
+	fi
+
+	# Some output for bugreport
+	einfo "CFLAGS=\"${CFLAGS}\""
+	einfo "Build client Target=\"${irbuild}\""
+	einfo "Build client Binary=\"${irclient}\""
+	einfo "Build ip_assign Target=\"${ipbuild}\""
+	einfo "Build ip_assign Binary=\"${ip_assign}\""
+
+	# Build
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${irbuild}" || die "emake irclient failed"
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${ipbuild}" || die "emake ip_assign failed"
+}
+
+src_install() {
+
+	newbin "${WORKDIR}/${irclient}" irclient
+	newbin "${WORKDIR}/${ip_assign}" ip_assign
+}
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index 9a8adc9c2dc1..dc4451bb404a 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<email>mario-fetka@gmx.at</email>
+<email>mario-fetka@gmail.com</email>
 <name>Mario Fetka</name>
 <description>Proxied maintainer</description>
 </maintainer>