diff options
Diffstat (limited to 'sys-fs/hfsutils')
| -rw-r--r-- | sys-fs/hfsutils/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch | 8 | ||||
| -rw-r--r-- | sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild | 44 |
3 files changed, 36 insertions, 25 deletions
diff --git a/sys-fs/hfsutils/ChangeLog b/sys-fs/hfsutils/ChangeLog index 760cfdb7035a..8b395932a9c0 100644 --- a/sys-fs/hfsutils/ChangeLog +++ b/sys-fs/hfsutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/hfsutils -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.18 2009/09/11 11:34:55 flameeyes Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/ChangeLog,v 1.19 2013/01/26 09:56:30 polynomial-c Exp $ + + 26 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> hfsutils-3.2.6-r5.ebuild, + +files/hfsutils-3.2.6-fix-tcl-8.6.patch: + Non-maintainer commit: Fixed compilation with tcl-8.6. Thanks to Vicente + Olivert Riera for providing a fix and an ebuild patch in bug #451112. 11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> hfsutils-3.2.6-r5.ebuild: diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch new file mode 100644 index 000000000000..19f15424543c --- /dev/null +++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch @@ -0,0 +1,8 @@ +--- hfsutils-3.2.6/config.h.in ++++ hfsutils-3.2.6/config.h.in +@@ -91,3 +91,5 @@ + # ifndef HAVE_STRTOL + long strtol(const char *, char **, int); + # endif ++ ++#define USE_INTERP_RESULT 1 diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild index ec755bbce410..c4c090b80b7c 100644 --- a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild +++ b/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.5 2009/09/11 11:34:55 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild,v 1.6 2013/01/26 09:56:30 polynomial-c Exp $ + +EAPI=5 inherit eutils toolchain-funcs @@ -14,38 +16,34 @@ KEYWORDS="amd64 ppc ppc64 sparc x86" IUSE="tcl tk" DEPEND="tcl? ( dev-lang/tcl ) - tk? ( dev-lang/tk )" + tk? ( dev-lang/tk )" RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/hfsutils-3.2.6-errno.patch - epatch "${FILESDIR}"/largerthan2gb.patch +# use tk requires tcl - bug #150437 +REQUIRED_USE="tk? ( tcl )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-errno.patch \ + "${FILESDIR}"/largerthan2gb.patch \ + "${FILESDIR}"/${P}-fix-tcl-8.6.patch +} + +src_configure() { + econf $(use_with tcl) $(use_with tk) } src_compile() { - tc-export CC CPP LD RANLIB - ### use tk implies --with-tcl - bug #150437 - if use tk; then - econf --with-tcl --with-tk || die - else - econf \ - $(use_with tcl) \ - $(use_with tk) \ - || die - fi - emake PREFIX=/usr MANDIR=/usr/share/man || die - emake -C hfsck PREFIX=/usr MANDIR=/usr/share/man || die + emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" + emake CC="$(tc-getCC)" -C hfsck } src_install() { dodir /usr/bin /usr/lib /usr/share/man/man1 - make \ + emake \ prefix="${D}"/usr \ MANDEST="${D}"/usr/share/man \ infodir="${D}"/usr/share/info \ - install || die - dobin hfsck/hfsck || die + install + dobin hfsck/hfsck dodoc BLURB CHANGES README TODO doc/*.txt } |