version bump. fixes compile problems with (#44177)

(Portage version: 2.0.51.22-r1)

6 files changed, 72 insertions, 41 deletions

diff --git a/net-im/ohphone/ChangeLog b/net-im/ohphone/ChangeLog
index d3cd780342b4..f67c0d884dc0 100644
--- a/net-im/ohphone/ChangeLog
+++ b/net-im/ohphone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ohphone
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ChangeLog,v 1.5 2005/06/30 17:18:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ChangeLog,v 1.6 2005/07/06 10:28:48 liquidx Exp $
+
+*ohphone-1.4.3_pre20050304 (06 Jul 2005)
+
+  06 Jul 2005; Alastair Tse <liquidx@gentoo.org> -ohphone-1.4.1.ebuild,
+  +ohphone-1.4.3_pre20050304.ebuild:
+  version bump. fixes compile problems with (#44177)
 
   30 Jun 2005; Aron Griffis <agriffis@gentoo.org> ohphone-1.4.1-r1.ebuild:
   It's really obvious this was never tested on ppc. The way the ebuild was
diff --git a/net-im/ohphone/Manifest b/net-im/ohphone/Manifest
index 22c5e6a3e2df..9913c7137574 100644
--- a/net-im/ohphone/Manifest
+++ b/net-im/ohphone/Manifest
@@ -1,6 +1,6 @@
-MD5 31f36cf8a6e240dc87ba502b154c8c78 ohphone-1.4.1-r1.ebuild 1295
-MD5 1c1d53d08070ad8ceea385e2ff6c8ba2 ohphone-1.4.1.ebuild 812
 MD5 3a5fbf16da462c7f73bb83239e767255 ChangeLog 966
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 31f36cf8a6e240dc87ba502b154c8c78 ohphone-1.4.1-r1.ebuild 1295
+MD5 bfe8eecf94f2a8ff6b0f0df40dda7d7c ohphone-1.4.3_pre20050304.ebuild 1391
 MD5 eb00a184805b4c495b46976ce6ccfbbf files/digest-ohphone-1.4.1-r1 64
-MD5 eb00a184805b4c495b46976ce6ccfbbf files/digest-ohphone-1.4.1 64
+MD5 50a3ec4868bd9ba46b1b7d9af3eb4352 files/digest-ohphone-1.4.3_pre20050304 78
diff --git a/net-im/ohphone/files/digest-ohphone-1.4.1 b/net-im/ohphone/files/digest-ohphone-1.4.1
deleted file mode 100644
index e5214e0aca56..000000000000
--- a/net-im/ohphone/files/digest-ohphone-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5b975db51589e2ed741367e20f75ed0 ohphone_1.4.1.tar.gz 77085
diff --git a/net-im/ohphone/files/digest-ohphone-1.4.3_pre20050304 b/net-im/ohphone/files/digest-ohphone-1.4.3_pre20050304
new file mode 100644
index 000000000000..7382811e1e93
--- /dev/null
+++ b/net-im/ohphone/files/digest-ohphone-1.4.3_pre20050304
@@ -0,0 +1 @@
+MD5 26348741d9129beebfa08235c5ce02d7 ohphone_1.4.3+20050304.orig.tar.gz 77920
diff --git a/net-im/ohphone/ohphone-1.4.1.ebuild b/net-im/ohphone/ohphone-1.4.1.ebuild
deleted file mode 100644
index 0a76593fcfcf..000000000000
--- a/net-im/ohphone/ohphone-1.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ohphone-1.4.1.ebuild,v 1.3 2004/06/24 22:58:24 agriffis Exp $
-
-DESCRIPTION="Command line H.323 client"
-HOMEPAGE="http://www.openh323.org/"
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=net-libs/openh323-1.12
-	>=dev-libs/pwlib-1.5.0"
-
-src_compile() {
-	cd ${WORKDIR}/${PN}
-	emake \
-		OPENH323DIR=/usr/share/openh323 \
-		PREFIX=/usr \
-		PWLIBDIR=/usr/share/pwlib \
-		PW_LIBDIR=/usr/lib \
-		OH323_LIBDIR=/usr/lib \
-		opt man || die
-}
-
-src_install() {
-	cd ${WORKDIR}/${PN}
-	doman ohphone.1
-
-	# fill in for other archs
-	if [ ${ARCH} = "x86" ]; then
-		dobin obj_linux_x86_r/ohphone
-	fi
-}
diff --git a/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild b/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild
new file mode 100644
index 000000000000..4092df82491f
--- /dev/null
+++ b/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild,v 1.1 2005/07/06 10:28:48 liquidx Exp $
+
+PV_PRE=${PV#*_pre}
+PV_MAJOR=${PV%_pre*}
+
+DESCRIPTION="Command line H.323 client"
+HOMEPAGE="http://www.openh323.org/"
+SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV_MAJOR}+${PV_PRE}.orig.tar.gz"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="X svga"
+
+DEPEND=">=net-libs/openh323-1.12.2
+	>=dev-libs/pwlib-1.8.3
+	X? ( virtual/x11 )
+	svga? ( media-libs/svgalib )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+
+	use svga \
+		|| sed -e "s:-lvga::" -e "s:-DHAS_VGALIB::" -i ${S}/Makefile \
+		|| die "failed to turn off SVGAlib support"
+}
+
+src_compile() {
+	local myopts
+
+	use X \
+		&& myopts="${myopts} XINCDIR=/usr/X11R6/include XLIBDIR=/usr/X11R6/lib" \
+		|| myopts="${myopts} XINCDIR=/dev/null XLIBDIR=/dev/null"
+
+	emake \
+		OPENH323DIR=/usr/share/openh323 \
+		PREFIX=/usr \
+		PWLIBDIR=/usr/share/pwlib \
+		PW_LIBDIR=/usr/lib \
+		OH323_LIBDIR=/usr/lib \
+		${myopts} \
+		opt man || die
+}
+
+src_install() {
+	cd ${WORKDIR}/${PN}
+	doman ohphone.1
+
+	# fill in for other archs
+	if use x86; then
+		dobin obj_linux_x86_r/ohphone
+	elif use ppc; then
+		dobin obj_linux_ppc_r/ohphone
+	else
+		die "no binary available for your arch"
+	fi
+}