Imported prefix changes, tested by me

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/imake/ChangeLog b/x11-misc/imake/ChangeLog
index e175654e49fb2b87516c688a9fc1e761acf67139..7bb438a9d0264dad43596c819280886cc23df361 100644 (file)
--- a/x11-misc/imake/ChangeLog
+++ b/x11-misc/imake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/imake
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/imake/ChangeLog,v 1.27 2010/04/17 13:30:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/imake/ChangeLog,v 1.28 2010/06/15 14:33:40 jlec Exp $
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> imake-1.0.3.ebuild:
+  Imported prefix changes, tested by me
 
 *imake-1.0.3 (17 Apr 2010)
 

diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 0e8f30c720c2828ddd6d187cf81c832656b76dc1..392ab74187dd7943cd5ec9a694a108408ef420ec 100644 (file)
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST imake-1.0.2.tar.bz2 112959 RMD160 e440ee22baca33d2831a3ecb8453dca43b3d862e SHA1 863a1015af41149e91a2f4b20858cb5d584c6943 SHA256 97cefff4ae76863ebce87496aca715371890505db4a0511d980e92bfe050ac7b
 DIST imake-1.0.3.tar.bz2 139230 RMD160 5cbd5f23fc8360a10cb36c367405f5950443349d SHA1 625a974dd0fe4c4e9d7ec036fc7b079ec05185f1 SHA256 90015244dd7a32594162d2be6e934a258894d1ca2c37422ef727a7f1c0b553ea
 EBUILD imake-1.0.2.ebuild 539 RMD160 2187aea37a5c1c883792476e9c181b79f5bd6ede SHA1 17637ae9a7baba76066c0e073a97175cb03f2c61 SHA256 f4f184a32af503a5bc5692ad1ae48250c7f9f10f112be9ce20692205967b0ba1
-EBUILD imake-1.0.3.ebuild 489 RMD160 5cf80aca0e702e0b8005ad75c9ba47af0999bfb4 SHA1 ae7e70c49daae92626c56bbe02819499c6e8c189 SHA256 2a3993c88c094264fa1f7798c33a60c37101f8dc819a7b225fd1e591bacd0c8c
-MISC ChangeLog 3679 RMD160 aa40d6f2f1ac0e3f39c9a6b9ddef0bcd3d74bca2 SHA1 ea0d3a936fff45c1910328abe82c508f6bf19301 SHA256 46fc5d7d75a8c39ededa37ac2b707455aa408675730ec38c3471f465e1d48c3e
+EBUILD imake-1.0.3.ebuild 770 RMD160 e93ed381f591c86ecb05fde63c4499888be4179d SHA1 da2c9f6eba92e13d83a088e6e726ee380a94ad31 SHA256 5cbbe757a14ff61a4bff518479bbc41fc7afd12bd80c2b7e12125a5718f3f391
+MISC ChangeLog 3782 RMD160 4dd430ab7f8533271ef873a4fedbef69d887f019 SHA1 009757120ccdd1a1fa409c9f16a926e8c8fdeae5 SHA256 981127fbd01e78ca4f0e92847ae5f358dc9e38dcfef353bfd1b32a4f9d08b3d8
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvJuAgACgkQHB6c3gNBRYdNWACdGHMyowYE1UWLDcjMPcQgHWLa
-DBYAnRjVuA3p/OqgSCVA9fVlATwG2pEJ
-=fvmZ
+iEYEARECAAYFAkwXj0sACgkQgAnW8HDreRZ4TQCgkywB31enPgR2UdEFfoX0DcVN
+NxYAoMhVzqxR9XLsMZjiIpV1nrjYhPfH
+=ll9P
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/imake/imake-1.0.3.ebuild b/x11-misc/imake/imake-1.0.3.ebuild
index a2df6db9e2101441b7bf3707580c0437d70a0c5c..0e9e8d96403f300eff802b307f97787aacd67ae4 100644 (file)
--- a/x11-misc/imake/imake-1.0.3.ebuild
+++ b/x11-misc/imake/imake-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/imake/imake-1.0.3.ebuild,v 1.1 2010/04/17 13:30:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/imake/imake-1.0.3.ebuild,v 1.2 2010/06/15 14:33:40 jlec Exp $
 
 EAPI=3
 
@@ -8,9 +8,16 @@ XORG_STATIC=no
 inherit xorg-2
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
 DEPEND="${RDEPEND}
        x11-proto/xproto"
+
+src_prepare() {
+       # don't use Sun compilers on Solaris, we want GCC from prefix
+       sed -i -e "1s/^.*$/#if defined(sun)\n# undef sun\n#endif/" \
+               imake.c imakemdep.h
+       xorg-2_src_prepare
+}