diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2011-06-25 08:42:20 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2011-06-25 08:42:20 +0000 |
| commit | e8b23829fb0ead84c69a2c772c80b7334ed265ba (patch) | |
| tree | cdcc7e32c2857a58796ad75eaced01a8ab9075d6 /app-text/xchm | |
| parent | [bump] dev-perl/Test-Inter-1.20.0 (diff) | |
| download | gentoo-2-e8b23829fb0ead84c69a2c772c80b7334ed265ba.tar.gz gentoo-2-e8b23829fb0ead84c69a2c772c80b7334ed265ba.tar.bz2 gentoo-2-e8b23829fb0ead84c69a2c772c80b7334ed265ba.zip | |
Version bump (bug #369751). Remove old.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'app-text/xchm')
| -rw-r--r-- | app-text/xchm/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/xchm/files/xchm-1.16-gcc44.patch | 22 | ||||
| -rw-r--r-- | app-text/xchm/xchm-1.20.ebuild (renamed from app-text/xchm/xchm-1.16.ebuild) | 19 |
3 files changed, 14 insertions, 35 deletions
diff --git a/app-text/xchm/ChangeLog b/app-text/xchm/ChangeLog index 4cee7bc2a65a..78c560dc86fc 100644 --- a/app-text/xchm/ChangeLog +++ b/app-text/xchm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/xchm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/ChangeLog,v 1.16 2011/03/04 01:27:18 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/ChangeLog,v 1.17 2011/06/25 08:42:19 dirtyepic Exp $ + +*xchm-1.20 (25 Jun 2011) + + 25 Jun 2011; Ryan Hill <dirtyepic@gentoo.org> -xchm-1.16.ebuild, + -files/xchm-1.16-gcc44.patch, +xchm-1.20.ebuild: + Version bump (bug #369751). Remove old. 04 Mar 2011; Brent Baude <ranger@gentoo.org> xchm-1.18.ebuild: stable ppc, bug 352477 diff --git a/app-text/xchm/files/xchm-1.16-gcc44.patch b/app-text/xchm/files/xchm-1.16-gcc44.patch deleted file mode 100644 index 49b5483ea5ce..000000000000 --- a/app-text/xchm/files/xchm-1.16-gcc44.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=2792822&group_id=87007&atid=581690 - ---- xchm-1.16-orig/src/bitfiddle.inl -+++ xchm-1.16/src/bitfiddle.inl -@@ -22,6 +22,7 @@ - */ - - -+#include <stdint.h> - #include <wx/string.h> - - ---- xchm-1.16-orig/src/chmfile.h -+++ xchm-1.16/src/chmfile.h -@@ -24,6 +24,7 @@ - #define __CHMFILE_H_ - - #include <config.h> -+#include <stdint.h> - #include <chm_lib.h> - #include <wx/filefn.h> - #include <wx/string.h> diff --git a/app-text/xchm/xchm-1.16.ebuild b/app-text/xchm/xchm-1.20.ebuild index 759551140cd0..165f1bad8540 100644 --- a/app-text/xchm/xchm-1.16.ebuild +++ b/app-text/xchm/xchm-1.20.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.16.ebuild,v 1.4 2009/09/27 20:00:09 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xchm/xchm-1.20.ebuild,v 1.1 2011/06/25 08:42:19 dirtyepic Exp $ -EAPI=2 +EAPI="4" WX_GTK_VER="2.8" @@ -14,26 +14,21 @@ SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls" DEPEND=">=dev-libs/chmlib-0.36 x11-libs/wxGTK:2.8[X]" RDEPEND=${DEPEND} -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc44.patch - append-flags -fno-strict-aliasing -} - src_configure() { + append-flags -fno-strict-aliasing econf ${myconf} \ - $(use_enable nls) \ - || die "econf failed" + $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS README ChangeLog |