Respect LDFLAGS and link dynamically to libtommath. Thanks to flameeyes for patches. This closes bug #126851.

(Portage version: 2.1)

5 files changed, 89 insertions, 2 deletions

diff --git a/app-text/convertlit/ChangeLog b/app-text/convertlit/ChangeLog
index fdca541d6308..f936f1fa013e 100644
--- a/app-text/convertlit/ChangeLog
+++ b/app-text/convertlit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/convertlit
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convertlit/ChangeLog,v 1.7 2005/10/11 18:40:42 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/convertlit/ChangeLog,v 1.8 2006/06/17 15:45:18 usata Exp $
+
+*convertlit-1.8-r1 (17 Jun 2006)
+
+  17 Jun 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/convertlit-1.8-respectflags.patch, +convertlit-1.8-r1.ebuild:
+  Respect LDFLAGS and link dynamically to libtommath. Thanks to flameeyes for
+  patches. This closes bug #126851.
 
   11 Oct 2005; Fabian Groffen <grobian@gentoo.org> convertlit-1.8.ebuild:
   Marked ~ppc-macos (bug #108462)
diff --git a/app-text/convertlit/convertlit-1.8-r1.ebuild b/app-text/convertlit/convertlit-1.8-r1.ebuild
new file mode 100644
index 000000000000..817f9f74b6e0
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/convertlit/convertlit-1.8-r1.ebuild,v 1.1 2006/06/17 15:45:18 usata Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P="clit${PV//./}"
+
+DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
+HOMEPAGE="http://www.convertlit.com/"
+SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libtommath-0.36-r1"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+RDEPEND="${RDEPEND}
+	!app-text/open_c-lit"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-respectflags.patch"
+}
+
+src_compile() {
+	tc-export CC
+
+	cd "${S}"/lib
+	emake || die "make lib failed"
+	cd "${S}"/${MY_P}
+	emake || die "make ${MY_P} failed"
+}
+
+src_install() {
+	dobin ${MY_P}/clit || die
+	dodoc README
+}
diff --git a/app-text/convertlit/files/convertlit-1.8-respectflags.patch b/app-text/convertlit/files/convertlit-1.8-respectflags.patch
new file mode 100644
index 000000000000..06209ef62ada
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-respectflags.patch
@@ -0,0 +1,28 @@
+Index: clit18/Makefile
+===================================================================
+--- clit18/Makefile.orig
++++ clit18/Makefile
+@@ -1,9 +1,9 @@
+ all: clit

+ 

+-CFLAGS=-funsigned-char -Wall -O2 -I ../libtommath-0.30/ -I ../lib -I ../lib/des -I .

++CFLAGS+=-funsigned-char -I ../lib -I ../lib/des -I . 

+ clean:

+ 	rm -f *.o clit

+ 

+ clit: clit.o hexdump.o drm5.o explode.o transmute.o display.o utils.o manifest.o ../lib/openclit.a 

+-	gcc -o clit $^  ../libtommath-0.30/libtommath.a

++	$(CC) $(LDFLAGS) -o clit $^ -ltommath

+ 

+Index: lib/Makefile
+===================================================================
+--- lib/Makefile.orig
++++ lib/Makefile
+@@ -1,6 +1,6 @@
+ all: openclit.a

+ 

+-CFLAGS=-O3 -Wall -Ides -Isha -Inewlzx -I.

++CFLAGS+=-Ides -Isha -Inewlzx -I.

+ clean:

+ 	rm -f *.o openclit.a des/*.o lzx/*.o sha/*.o

+ 

diff --git a/app-text/convertlit/files/digest-convertlit-1.8 b/app-text/convertlit/files/digest-convertlit-1.8
index 0dee498cef8a..c46b442cc870 100644
--- a/app-text/convertlit/files/digest-convertlit-1.8
+++ b/app-text/convertlit/files/digest-convertlit-1.8
@@ -1 +1,3 @@
 MD5 d691d4729485fe5d73e3f0937d8fb42e clit18src.zip 135120
+RMD160 6104a7d951ed60ea73705e401be8b55633ea2d47 clit18src.zip 135120
+SHA256 d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba clit18src.zip 135120
diff --git a/app-text/convertlit/files/digest-convertlit-1.8-r1 b/app-text/convertlit/files/digest-convertlit-1.8-r1
new file mode 100644
index 000000000000..c46b442cc870
--- /dev/null
+++ b/app-text/convertlit/files/digest-convertlit-1.8-r1
@@ -0,0 +1,3 @@
+MD5 d691d4729485fe5d73e3f0937d8fb42e clit18src.zip 135120
+RMD160 6104a7d951ed60ea73705e401be8b55633ea2d47 clit18src.zip 135120
+SHA256 d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba clit18src.zip 135120