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 | f89907768387ee97ee346812b181dda6a7428186 (patch) | |
| tree | 575e6673b147e6a24e4cda2a3fcb7045f05a9434 /dev-games/cegui | |
| parent | Marked ~hppa (bug #326999). (diff) | |
| download | historical-f89907768387ee97ee346812b181dda6a7428186.tar.gz historical-f89907768387ee97ee346812b181dda6a7428186.tar.bz2 historical-f89907768387ee97ee346812b181dda6a7428186.zip | |
remove dups to work with newer coreutils with patch from Thomas Fischer via bug #327779
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'dev-games/cegui')
| -rw-r--r-- | dev-games/cegui/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-games/cegui/Manifest | 15 | ||||
| -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 |
4 files changed, 27 insertions, 17 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/Manifest b/dev-games/cegui/Manifest index a0199842478f..1f5abfde9204 100644 --- a/dev-games/cegui/Manifest +++ b/dev-games/cegui/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX cegui-0.6.2b-dups.patch 660 RMD160 908321a10f0917f9ef30fa8a67145bbcc2e28620 SHA1 5bbdbfaec76121daa450817cfedf7f5c38e00b7a SHA256 d3d9a5af79f49df8c5bff41c3d61034640c9e774e4a01bb28a0891684c95eaf0 AUX cegui-0.6.2b-gcc43.patch 241 RMD160 d0b104b161a655da3ffb9aff0e53cc355beccd8e SHA1 521978347c5ad85c64a6c0727ddcef441fc349d9 SHA256 b2a2e715d4a0a6cdb2f0975c9474ce82edd97a34cdb3fe4d5c3ddbde0440db66 DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 RMD160 f3b010ce170973c126be27495636de4e808d3e65 SHA1 33e1ebfa0ab4e7fe2a91c0bb0affb6dccb49a94c SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8 DIST CEGUI-0.6.2b.tar.gz 2628081 RMD160 890a8af12eb1ed4b7de0765c1f1a521ad5b1d213 SHA1 ac373b0779ab4b6289cf1e6aa2e6717d8a348747 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f -EBUILD cegui-0.6.2b.ebuild 2436 RMD160 cf835603b0ae9eb4cfe6c983d81fff13446b2083 SHA1 4b1256ff29e724e70a499fedda9438785aeaef16 SHA256 1a275412b5eae9629b04d45ffcf354c9f2a05105b73e0e432490747f262aeef2 -MISC ChangeLog 3565 RMD160 719ba7a7b666662ec3c7e4e1ed430b40c5e0714f SHA1 74abcb148e3c64c6d40a51306a78c57efc23e041 SHA256 b0ebb82daf48657594ac4113a221b661d3b36b316788cd7780f216ff7ed174fd +EBUILD cegui-0.6.2b.ebuild 2479 RMD160 5847adc56206f0e32de238408604c65ff43c8425 SHA1 5034f2d7b5a8b157b6e4049115fac844a77a00cd SHA256 ba20b89338bbe4e057f4e860c31510c5cc03a23cd4c282edbda3bdca1d956fad +MISC ChangeLog 3773 RMD160 63d91af3c70cae681e9a9dfc6f90337d38fea95c SHA1 78f452d2e29291e27ee82106269b8c57c6e0869c SHA256 efb934b1e5fd843fc0024913959b29b69b6126c6bf389c31b3092d0bf598ad5a MISC metadata.xml 373 RMD160 b4cf972cfe56743d1bd9c667481debd4565a8ed7 SHA1 ab195601fed8d0c986ffadf62081c286410eabba SHA256 df5ab1122b5f537f96505a13e6182ab225edc7e3a0a51394bf6c334896b72961 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.12 (GNU/Linux) - -iEYEARECAAYFAkryLRIACgkQdz7hIScOURGs8gCgoqaITLYTbgzCf3vpYmTdgcyZ -QkEAnA978mYSSbss1Gmou6p5sBUtXVz+ -=Agg3 ------END PGP SIGNATURE----- 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 \ |