From: Mamoru Komachi Date: Sat, 17 Jun 2006 15:45:18 +0000 (+0000) Subject: Respect LDFLAGS and link dynamically to libtommath. Thanks to flameeyes for patches... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94d10a3201827d38e521c4138e72e86717b79824;p=gentoo.git Respect LDFLAGS and link dynamically to libtommath. Thanks to flameeyes for patches. This closes bug #126851. Package-Manager: portage-2.1 --- 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 + +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 convertlit-1.8.ebuild: Marked ~ppc-macos (bug #108462) diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest index f1956ee703d2..4cabef96faee 100644 --- a/app-text/convertlit/Manifest +++ b/app-text/convertlit/Manifest @@ -1,4 +1,27 @@ -MD5 be3ad2e340fdba4ba16314facb416cc2 ChangeLog 928 +AUX convertlit-1.8-respectflags.patch 840 RMD160 b6d4f9ef34d8171e12eec8e0ca778212a4e4dfbc SHA1 2a897a27f2af38b88fa445ea3bbd125d2580d62e SHA256 64c23b1ea950305f1f6a47e248a4454a8b73091fdc58da05514e1178ee6976ae +MD5 2fb32ce02cf34e483554491f43d9f926 files/convertlit-1.8-respectflags.patch 840 +RMD160 b6d4f9ef34d8171e12eec8e0ca778212a4e4dfbc files/convertlit-1.8-respectflags.patch 840 +SHA256 64c23b1ea950305f1f6a47e248a4454a8b73091fdc58da05514e1178ee6976ae files/convertlit-1.8-respectflags.patch 840 +DIST clit18src.zip 135120 RMD160 6104a7d951ed60ea73705e401be8b55633ea2d47 SHA1 0fa9aead468bd8640c49374d46d78d2a3e79489f SHA256 d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba +EBUILD convertlit-1.8-r1.ebuild 936 RMD160 229a3a4fe8ccbdfa73f50d7c159d6785fbe074f9 SHA1 0cd35ca25bdb9c555f5918a442b1116f68f57616 SHA256 70b8d5bb85bb1d713769e5c7df661ae5aaaba70e6559690eec9499b018186b3a +MD5 3e1c5d172a847af63f5acb70cc534e5a convertlit-1.8-r1.ebuild 936 +RMD160 229a3a4fe8ccbdfa73f50d7c159d6785fbe074f9 convertlit-1.8-r1.ebuild 936 +SHA256 70b8d5bb85bb1d713769e5c7df661ae5aaaba70e6559690eec9499b018186b3a convertlit-1.8-r1.ebuild 936 +EBUILD convertlit-1.8.ebuild 1028 RMD160 fe0ba3f5b5f287ba48e2e6c59d776d82d1390550 SHA1 d11c7b46dee36e7f5f83371b10e194b69ef0ec84 SHA256 1e0dd8abb00669ffaae0dccd994014768df1d3410d26b455e0f7e3877f335038 MD5 f9702a54633f66423eda01cc6807b5ca convertlit-1.8.ebuild 1028 -MD5 0aa568c1d0028560dd43f694c3bb200f files/digest-convertlit-1.8 58 +RMD160 fe0ba3f5b5f287ba48e2e6c59d776d82d1390550 convertlit-1.8.ebuild 1028 +SHA256 1e0dd8abb00669ffaae0dccd994014768df1d3410d26b455e0f7e3877f335038 convertlit-1.8.ebuild 1028 +MISC ChangeLog 1195 RMD160 07183bf56b1c5c71db928eb2d0004a683b73b7b5 SHA1 4dd917e846af69aca3a92669548080b9ec753cc0 SHA256 2ec75e7841684677905f5b5304aba26a73dd576e9ade11e954c59e8866257f2e +MD5 fd0018a5c7d39fb7507e498c51d2c300 ChangeLog 1195 +RMD160 07183bf56b1c5c71db928eb2d0004a683b73b7b5 ChangeLog 1195 +SHA256 2ec75e7841684677905f5b5304aba26a73dd576e9ade11e954c59e8866257f2e ChangeLog 1195 +MISC metadata.xml 663 RMD160 c9214878e90f80bd8a21f96d5a610a47d8ec4f87 SHA1 f9185d1f75ecda7db83f6f5180714c8a2fa7752f SHA256 98a731a5f28259acd9f0834590d78efee21db09ccadbaa886952c7a9cd7e0142 MD5 19ae2f2f4703b02fa61cc1ebf004518f metadata.xml 663 +RMD160 c9214878e90f80bd8a21f96d5a610a47d8ec4f87 metadata.xml 663 +SHA256 98a731a5f28259acd9f0834590d78efee21db09ccadbaa886952c7a9cd7e0142 metadata.xml 663 +MD5 2fc7e5c9fa34afe28383c6bb8b33b425 files/digest-convertlit-1.8 220 +RMD160 35dd9be63a449e49b4ae8574e2f7cc8ed6efd16a files/digest-convertlit-1.8 220 +SHA256 a6f520def22c878a279beda0591d6248553b53dbbb9f71a40ae7b903830a9467 files/digest-convertlit-1.8 220 +MD5 2fc7e5c9fa34afe28383c6bb8b33b425 files/digest-convertlit-1.8-r1 220 +RMD160 35dd9be63a449e49b4ae8574e2f7cc8ed6efd16a files/digest-convertlit-1.8-r1 220 +SHA256 a6f520def22c878a279beda0591d6248553b53dbbb9f71a40ae7b903830a9467 files/digest-convertlit-1.8-r1 220 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