From 1ca6b1116c39f14b939f025687b44314249d50a5 Mon Sep 17 00:00:00 2001
From: Harald van Dijk <truedfx@gentoo.org>
Date: Tue, 23 Jan 2007 16:03:49 +0000
Subject: Fix build with --as-needed (Portage version: 2.1.2-r2)

---
 dev-libs/tvision/ChangeLog                         |  9 ++++-
 dev-libs/tvision/files/digest-tvision-2.1.0_pre2   |  3 --
 .../tvision/files/digest-tvision-2.1.0_pre2-r1     |  3 ++
 .../files/tvision-2.1.0_pre2-asneeded.patch        | 45 ++++++++++++++++++++++
 dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild      | 40 +++++++++++++++++++
 dev-libs/tvision/tvision-2.1.0_pre2.ebuild         | 39 -------------------
 6 files changed, 96 insertions(+), 43 deletions(-)
 delete mode 100644 dev-libs/tvision/files/digest-tvision-2.1.0_pre2
 create mode 100644 dev-libs/tvision/files/digest-tvision-2.1.0_pre2-r1
 create mode 100644 dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
 create mode 100644 dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild
 delete mode 100644 dev-libs/tvision/tvision-2.1.0_pre2.ebuild

(limited to 'dev-libs/tvision')

diff --git a/dev-libs/tvision/ChangeLog b/dev-libs/tvision/ChangeLog
index 99250f9f33bc..9496948aa764 100644
--- a/dev-libs/tvision/ChangeLog
+++ b/dev-libs/tvision/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/tvision
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.17 2007/01/12 15:37:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/ChangeLog,v 1.18 2007/01/23 16:03:49 truedfx Exp $
+
+*tvision-2.1.0_pre2-r1 (23 Jan 2007)
+
+  23 Jan 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/tvision-2.1.0_pre2-asneeded.patch, -tvision-2.1.0_pre2.ebuild,
+  +tvision-2.1.0_pre2-r1.ebuild:
+  Fix building with --as-needed flag
 
 *tvision-2.1.0_pre2 (12 Jan 2007)
 
diff --git a/dev-libs/tvision/files/digest-tvision-2.1.0_pre2 b/dev-libs/tvision/files/digest-tvision-2.1.0_pre2
deleted file mode 100644
index c78d52745067..000000000000
--- a/dev-libs/tvision/files/digest-tvision-2.1.0_pre2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e5d7fe4202bc9e09e81ac0ed561dcd34 rhtvision_2.1.0-2.tar.gz 1590449
-RMD160 e1b27322a9b75e20d13682e4895e05cf369e3017 rhtvision_2.1.0-2.tar.gz 1590449
-SHA256 fef19d839069dea2cd5459f24a190883a3b2b600a60d6f7823f456d8e6889412 rhtvision_2.1.0-2.tar.gz 1590449
diff --git a/dev-libs/tvision/files/digest-tvision-2.1.0_pre2-r1 b/dev-libs/tvision/files/digest-tvision-2.1.0_pre2-r1
new file mode 100644
index 000000000000..c78d52745067
--- /dev/null
+++ b/dev-libs/tvision/files/digest-tvision-2.1.0_pre2-r1
@@ -0,0 +1,3 @@
+MD5 e5d7fe4202bc9e09e81ac0ed561dcd34 rhtvision_2.1.0-2.tar.gz 1590449
+RMD160 e1b27322a9b75e20d13682e4895e05cf369e3017 rhtvision_2.1.0-2.tar.gz 1590449
+SHA256 fef19d839069dea2cd5459f24a190883a3b2b600a60d6f7823f456d8e6889412 rhtvision_2.1.0-2.tar.gz 1590449
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
new file mode 100644
index 000000000000..bc8474a83a77
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-asneeded.patch
@@ -0,0 +1,45 @@
+--- tvision/config.pl
++++ tvision/config.pl
+@@ -206,6 +206,7 @@
+   }
+ # Flags to link as a dynamic lib
+ $MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
++$MakeDefsRHIDE[7]='RHIDE_LIBS=';
+ if ($OS eq 'UNIX')
+   {
+    if ($OSf ne 'Darwin')
+@@ -229,15 +230,15 @@
+      }
+    $libs=$conf{'X11Lib'};
+    $libs=~s/(\S+)/-l$1/g;
+-   $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
++   $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
+-   $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
++   $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
+-   $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
++   $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
+-   $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
++   $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
+-   $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
++   $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
+-   $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
++   $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
+   }
+-$MakeDefsRHIDE[7]="LIB_VER=$Version";
++$MakeDefsRHIDE[8]="LIB_VER=$Version";
+-$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
++$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
+ 
+ ModifyMakefiles('intl/dummy/Makefile');
+ CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
+--- tvision/makes/common.imk
++++ tvision/makes/common.imk
+@@ -54,7 +54,7 @@
+ C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
+ RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
+ 	$(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE)  \
+-	$(OBJFILES)
++	$(OBJFILES) $(RHIDE_LIBS)
+ else
+ RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
+ 	$(ALL_PREREQ)
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild
new file mode 100644
index 000000000000..e21305c240e5
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.1.0_pre2-r1.ebuild,v 1.1 2007/01/23 16:03:49 truedfx Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-outb.patch
+	epatch "${FILESDIR}"/${P}-underflow.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--fhs \
+		|| die
+	emake || die
+}
+
+src_install() {
+	einstall libdir="\$(prefix)/$(get_libdir)"|| die
+	dosym rhtvision /usr/include/tvision
+	dodoc readme.txt THANKS TODO
+	dohtml -r www-site
+}
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2.ebuild
deleted file mode 100644
index 15c5f306c180..000000000000
--- a/dev-libs/tvision/tvision-2.1.0_pre2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tvision/tvision-2.1.0_pre2.ebuild,v 1.1 2007/01/12 15:37:32 truedfx Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Text User Interface that implements the well known CUA widgets"
-HOMEPAGE="http://tvision.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-outb.patch
-	epatch "${FILESDIR}"/${P}-underflow.patch
-}
-
-src_compile() {
-	./configure \
-		--prefix=/usr \
-		--fhs \
-		|| die
-	emake || die
-}
-
-src_install() {
-	einstall libdir="\$(prefix)/$(get_libdir)"|| die
-	dosym rhtvision /usr/include/tvision
-	dodoc readme.txt THANKS TODO
-	dohtml -r www-site
-}
-- 
cgit v1.2.3-65-gdbad