diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-07-14 17:51:25 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-07-14 17:51:25 +0000 |
| commit | 307baf81b75d7b8cef7e503b5ee2355bc4fc9625 (patch) | |
| tree | 1acb0beae2115852845e91a7b128b2018eddb50a /dev-games | |
| parent | Marked ~hppa (bug #326999). (diff) | |
| download | gentoo-2-307baf81b75d7b8cef7e503b5ee2355bc4fc9625.tar.gz gentoo-2-307baf81b75d7b8cef7e503b5ee2355bc4fc9625.tar.bz2 gentoo-2-307baf81b75d7b8cef7e503b5ee2355bc4fc9625.zip | |
remove dups to work with newer coreutils with patch from Thomas Fischer via bug #327779
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/cegui/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-games/cegui/cegui-0.6.2b.ebuild | 8 | ||||
| -rw-r--r-- | dev-games/cegui/files/cegui-0.6.2b-dups.patch | 12 |
3 files changed, 24 insertions, 5 deletions
diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog index a6979751ccc7..cf66e1bf0e7e 100644 --- a/dev-games/cegui/ChangeLog +++ b/dev-games/cegui/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-games/cegui -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.27 2009/11/05 01:40:28 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.28 2010/07/14 17:51:25 mr_bones_ Exp $ + + 14 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org> cegui-0.6.2b.ebuild, + +files/cegui-0.6.2b-dups.patch: + remove dups to work with newer coreutils with patch from Thomas Fischer + via bug #327779 05 Nov 2009; Tristan Heaven <nyhm@gentoo.org> cegui-0.6.2b.ebuild: Remove masked freeimage USE flag diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild index 27acbbdbd9aa..390e312f5faa 100644 --- a/dev-games/cegui/cegui-0.6.2b.ebuild +++ b/dev-games/cegui/cegui-0.6.2b.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.6 2009/11/05 01:40:28 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.7 2010/07/14 17:51:25 mr_bones_ Exp $ EAPI=2 inherit autotools eutils @@ -40,7 +40,9 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch + epatch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-dups.patch sed -i \ -e 's/ILvoid/void/g' \ ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp \ diff --git a/dev-games/cegui/files/cegui-0.6.2b-dups.patch b/dev-games/cegui/files/cegui-0.6.2b-dups.patch new file mode 100644 index 000000000000..a4d80c4347dc --- /dev/null +++ b/dev-games/cegui/files/cegui-0.6.2b-dups.patch @@ -0,0 +1,12 @@ +diff -Naur _orig_CEGUI-0.6.2/include/elements/Makefile.am CEGUI-0.6.2/include/elements/Makefile.am +--- _orig_CEGUI-0.6.2/include/elements/Makefile.am 2008-01-02 15:26:05.000000000 +0100 ++++ CEGUI-0.6.2/include/elements/Makefile.am 2010-07-11 13:12:16.786338068 +0200 +@@ -21,8 +21,6 @@ + CEGUIItemListBaseProperties.h \ + CEGUIItemListbox.h \ + CEGUIItemListboxProperties.h \ +- CEGUIListHeader.h \ +- CEGUIListHeaderProperties.h \ + CEGUIListbox.h \ + CEGUIListboxItem.h \ + CEGUIListboxProperties.h \ |