From 1c752c49caeaaec8b85e8057f93ba1fd58713846 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 3 Aug 2007 03:49:37 +0000 Subject: Fix build of the static version. Package-Manager: portage-2.1.3_rc8 --- app-admin/testdisk/ChangeLog | 8 +++- app-admin/testdisk/Manifest | 15 +++++-- app-admin/testdisk/files/digest-testdisk-6.7-r1 | 3 ++ app-admin/testdisk/testdisk-6.7-r1.ebuild | 60 +++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 app-admin/testdisk/files/digest-testdisk-6.7-r1 create mode 100644 app-admin/testdisk/testdisk-6.7-r1.ebuild (limited to 'app-admin/testdisk') diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog index bff26315498e..8e84448232e8 100644 --- a/app-admin/testdisk/ChangeLog +++ b/app-admin/testdisk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/testdisk # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.24 2007/06/27 08:57:24 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.25 2007/08/03 03:49:37 robbat2 Exp $ + +*testdisk-6.7-r1 (02 Aug 2007) + + 02 Aug 2007; Robin H. Johnson + +testdisk-6.7-r1.ebuild: + Fix build of the static version. *testdisk-6.7 (27 Jun 2007) diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index b81438b2d257..7265614be386 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -13,14 +13,18 @@ EBUILD testdisk-6.6.ebuild 1996 RMD160 bcee1edfa836d65972b57200f13084ad79c72a9c MD5 69d32756d0bc03cbaa1880caa2754b42 testdisk-6.6.ebuild 1996 RMD160 bcee1edfa836d65972b57200f13084ad79c72a9c testdisk-6.6.ebuild 1996 SHA256 11f48bfc4c83404ec34fc1b759556704c54117175654611b1a033653ad254ddf testdisk-6.6.ebuild 1996 +EBUILD testdisk-6.7-r1.ebuild 2100 RMD160 787f1a2954a5c9eec766b1005b6b6ce13484e502 SHA1 9dcec5e3dab5a47573d694033478cd90081273a1 SHA256 3c9c78c0968122f5774bef8b7dfe61c665bff92258ddd05dc01e90fb1912fa45 +MD5 8ac79a53c6ab423c10ad66e8ad98f365 testdisk-6.7-r1.ebuild 2100 +RMD160 787f1a2954a5c9eec766b1005b6b6ce13484e502 testdisk-6.7-r1.ebuild 2100 +SHA256 3c9c78c0968122f5774bef8b7dfe61c665bff92258ddd05dc01e90fb1912fa45 testdisk-6.7-r1.ebuild 2100 EBUILD testdisk-6.7.ebuild 2085 RMD160 1ca78163af7e1569bc2215cf0d2854c5d8b48c75 SHA1 cacff284705340f587f67d2729991a471db33a78 SHA256 8274dcaa44a35ca9c6da41d74eafb5bb3de990c68b0467894635f346ed88079d MD5 d7a95128aec3c9f9bbcb82bd6f259912 testdisk-6.7.ebuild 2085 RMD160 1ca78163af7e1569bc2215cf0d2854c5d8b48c75 testdisk-6.7.ebuild 2085 SHA256 8274dcaa44a35ca9c6da41d74eafb5bb3de990c68b0467894635f346ed88079d testdisk-6.7.ebuild 2085 -MISC ChangeLog 4386 RMD160 3882bbd7eb4832e0b7a4397f6237361ac487b1d7 SHA1 152d630b2f8f23fb8c937d7c25bc21fdb30f7fa0 SHA256 08152626d7e0399482f94d802abdc2f2fef5894bf1ffa95e1a333e6c63fbd325 -MD5 341e5ae328867573d542d13133f97fb0 ChangeLog 4386 -RMD160 3882bbd7eb4832e0b7a4397f6237361ac487b1d7 ChangeLog 4386 -SHA256 08152626d7e0399482f94d802abdc2f2fef5894bf1ffa95e1a333e6c63fbd325 ChangeLog 4386 +MISC ChangeLog 4530 RMD160 a6f9ab1933bb3c64a4388c83c9e9fa64b4a6606e SHA1 f90bd2e623bb90a9161512c9e13fc5bf197d7860 SHA256 703fab3fb14d851909bf5d2136fe4b5f0ec8f9721b9e8ec54ab75609fe66cd01 +MD5 a225b1da0c77a63bc15187bacd0b3db1 ChangeLog 4530 +RMD160 a6f9ab1933bb3c64a4388c83c9e9fa64b4a6606e ChangeLog 4530 +SHA256 703fab3fb14d851909bf5d2136fe4b5f0ec8f9721b9e8ec54ab75609fe66cd01 ChangeLog 4530 MISC metadata.xml 402 RMD160 ae12e298d38a98431fccbee713620c8597e17f92 SHA1 d956360229d061564cf325428514f34615a2a6bf SHA256 93adc4693a6a520fbe525cb241c9e3cd55a8e8a8550386e8382fdd7e04422e74 MD5 823f2a5e2ad7ce2c2ff737251a9d399f metadata.xml 402 RMD160 ae12e298d38a98431fccbee713620c8597e17f92 metadata.xml 402 @@ -34,3 +38,6 @@ SHA256 5b751c1d5361119c9b0b050be95ac267b56d7692c4cdf9b1d840bdf3462a6dc9 files/di MD5 5dbeb6b712cae3f19ee58682c8c5b137 files/digest-testdisk-6.7 241 RMD160 9d56a4a9a19d711d3444dbbfaf5f5ccbb75ca41d files/digest-testdisk-6.7 241 SHA256 d75a297e6c7bbf87a5e8bccf7be901b1600cfe7ad8bc3f6977e950ae3d182465 files/digest-testdisk-6.7 241 +MD5 5dbeb6b712cae3f19ee58682c8c5b137 files/digest-testdisk-6.7-r1 241 +RMD160 9d56a4a9a19d711d3444dbbfaf5f5ccbb75ca41d files/digest-testdisk-6.7-r1 241 +SHA256 d75a297e6c7bbf87a5e8bccf7be901b1600cfe7ad8bc3f6977e950ae3d182465 files/digest-testdisk-6.7-r1 241 diff --git a/app-admin/testdisk/files/digest-testdisk-6.7-r1 b/app-admin/testdisk/files/digest-testdisk-6.7-r1 new file mode 100644 index 000000000000..8ac9bbde575b --- /dev/null +++ b/app-admin/testdisk/files/digest-testdisk-6.7-r1 @@ -0,0 +1,3 @@ +MD5 cf5f633dbbeadfff0c38d39e1fa56b5e testdisk-6.7.tar.bz2 762396 +RMD160 5514ad8ef2dec793cc130916a4e6e62426d6bb24 testdisk-6.7.tar.bz2 762396 +SHA256 dd3acc1f17414e37f8e6ef71736f17cb69b98d5f84863973753edc19bc644bc8 testdisk-6.7.tar.bz2 762396 diff --git a/app-admin/testdisk/testdisk-6.7-r1.ebuild b/app-admin/testdisk/testdisk-6.7-r1.ebuild new file mode 100644 index 000000000000..8af5573b70bf --- /dev/null +++ b/app-admin/testdisk/testdisk-6.7-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.7-r1.ebuild,v 1.1 2007/08/03 03:49:37 robbat2 Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory." +HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk" +SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="static reiserfs ntfs jpeg" +# WARNING: reiserfs support does NOT work with reiserfsprogs +# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released). +DEPEND=">=sys-libs/ncurses-5.2 + jpeg? ( media-libs/jpeg ) + ntfs? ( >=sys-fs/ntfsprogs-1.9.4 ) + reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) + >=sys-fs/e2fsprogs-1.35" +RDEPEND="!static? ( ${DEPEND} )" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/${P}-constdef.patch +} + +src_compile() { + local myconf="--without-ewf" + # --with-foo are broken, any use of --with/--without disable the + # functionality. + # The following variation must be used. + use reiserfs || myconf="${myconf} --without-reiserfs" + use ntfs || myconf="${myconf} --without-ntfs" + use jpeg || myconf="${myconf} --without-jpeg" + + # this is static method is the same used by upstream for their 'static' make + # target, but better, as it doesn't break. + use static && append-ldflags -static + + econf ${myconf} || die + + # perform safety checks for NTFS and REISERFS + if useq ntfs && egrep -q 'undef HAVE_LIBNTFS\>' ${S}/config.h ; then + die "Failed to find NTFS library." + fi + if useq reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' ${S}/config.h ; then + die "Failed to find reiserfs library." + fi + if useq jpeg && egrep -q 'undef HAVE_LIBJPEG\>' ${S}/config.h ; then + die "Failed to find jpeg library." + fi + + emake || die +} + +src_install() { + emake DESTDIR="${D}" install || die + [ "$PF" != "$P" ] && mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF} +} -- cgit v1.2.3-65-gdbad