summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2011-02-21 06:17:02 +0000
committerJeremy Olexa <darkside@gentoo.org>2011-02-21 06:17:02 +0000
commit22a54b5257f2bd767b73a4cb2300eaed739b4383 (patch)
tree6c27d841303d8fc7bf6de1e131f00422eb87f2c8 /app-editors/nedit
parentUpdated with patch for bug 339751 (adds gdk-pixbuf2 detection). (diff)
downloadhistorical-22a54b5257f2bd767b73a4cb2300eaed739b4383.tar.gz
historical-22a54b5257f2bd767b73a4cb2300eaed739b4383.tar.bz2
historical-22a54b5257f2bd767b73a4cb2300eaed739b4383.zip
Fixes for macos, bug 352991 by Johan Hattne
Package-Manager: portage-2.1.9.40/cvs/Linux x86_64
Diffstat (limited to 'app-editors/nedit')
-rw-r--r--app-editors/nedit/ChangeLog6
-rw-r--r--app-editors/nedit/Manifest14
-rw-r--r--app-editors/nedit/nedit-5.5_p20110116.ebuild18
3 files changed, 22 insertions, 16 deletions
diff --git a/app-editors/nedit/ChangeLog b/app-editors/nedit/ChangeLog
index f359a720d9ce..8b43733c17a7 100644
--- a/app-editors/nedit/ChangeLog
+++ b/app-editors/nedit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/nedit
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.63 2011/01/16 20:20:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.64 2011/02/21 06:17:02 darkside Exp $
+
+ 21 Feb 2011; Jeremy Olexa <darkside@gentoo.org>
+ nedit-5.5_p20110116.ebuild:
+ Fixes for macos, bug 352991 by Johan Hattne
*nedit-5.5_p20110116 (16 Jan 2011)
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index d96ca8c94813..55d96b1b08ea 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX nedit-5.5-argbvisuals.patch 1462 RMD160 3d87969386ca8ca83b4e87d823d6298129d62dd8 SHA1 4ec157bc4e98a00f5152f67ed5f5e384822497c1 SHA256 ddf22535a85293e3be1453160305f926a1d9233a76febcb1380a2228ec82e1fe
AUX nedit-5.5-motif23.patch 526 RMD160 462ef04c1bd14b9164eecf6646250b2e353ffc66 SHA1 1603079b4ed4eaac08fc58fa8abf54627e5ec9fa SHA256 29e7bbbc4828422344790eb8663d9b872bc9deb6bb5966c8ee54e81f29c018eb
AUX nedit-5.5-off-by-one.patch 568 RMD160 d7d4b60e2957803544d8673f6d364e4291343d95 SHA1 bcf18944a788eb50c0c90e47250cee6097e23917 SHA256 d79c41129d549dde88cd35dd37c1f17e95d0f9c4fab515babe6883a8c24a4687
@@ -11,13 +8,6 @@ DIST nedit-5.5_p20090914.tar.bz2 1029707 RMD160 817d18c5c115d1cd654513f40f8ef36a
DIST nedit-5.5_p20110116.tar.bz2 1030011 RMD160 dd17b08671a7b5cd4f04051add5369674200c7c5 SHA1 acd60b64df4f4d8fccff8a54eb8172ef44dcdab6 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8
EBUILD nedit-5.5-r1.ebuild 1340 RMD160 8f38fb5a1bf1ef88087768523e9f6a2d42039918 SHA1 a08b5b2f9cc4dea4767afcdca5acf1a9b0573f2a SHA256 dff351539b3d4384b736183488247df304e80710b0479de3ba201c98d2fa8914
EBUILD nedit-5.5_p20090914.ebuild 1447 RMD160 c7483422ddbad4e95f7164c26fb043c2acafd3d5 SHA1 cb1d8180cd16b1603bfc0fdb017bdbfb1c5593a2 SHA256 67cedf7bc1689fd98463639d6acb921371d28daab40a5e7ad52d3cb09cbe8828
-EBUILD nedit-5.5_p20110116.ebuild 1560 RMD160 ede270c5a81725701da761ce4e92d4a03a66b2ba SHA1 ae88e60f5d228940497ebe207e3367d3a6f0f9ee SHA256 bbc12da626440e84768ab819c06d7183fb4f1256aa59b1c10f78f7b35463a6d5
-MISC ChangeLog 8822 RMD160 aa5cc4f6ccbded05fce75b1acad5a05404abf514 SHA1 736ca67ed5a3d33d4c297fda9052780c60b48d7d SHA256 3a766f7edd7eaca2c2f47acd5f7ff46a95be6edde0db7a4472b5236e78dbedd7
+EBUILD nedit-5.5_p20110116.ebuild 1952 RMD160 b7279ef75d8748d3941e74b8de226c0f4c1ff0ce SHA1 be1c65838d92aa6a69dd1e0dce3c4991be350d76 SHA256 75f19c92fd1615ed5df4956f38cf5d866fbb397abaedeb53e989ffab2d027ab1
+MISC ChangeLog 8953 RMD160 25dd7261aad4f3629b2f539c197aa07f078b7340 SHA1 a5d2d6c296fbae185d9ddac08c04bb67015148db SHA256 b2642eef8b820fbdfff4d552c369cf24359f04e21496e44ac082065116a2ecc9
MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0zUyMACgkQgAnW8HDreRZkvgCfa1n2fayIu0VL6PfNdFcb7gpA
-3C4AnR+8vcq7lMRPltsOFSBQ7giEYN1g
-=W3yx
------END PGP SIGNATURE-----
diff --git a/app-editors/nedit/nedit-5.5_p20110116.ebuild b/app-editors/nedit/nedit-5.5_p20110116.ebuild
index 4e939cecf412..5d2478dc93ae 100644
--- a/app-editors/nedit/nedit-5.5_p20110116.ebuild
+++ b/app-editors/nedit/nedit-5.5_p20110116.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v 1.1 2011/01/16 20:20:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v 1.2 2011/02/21 06:17:02 darkside Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="spell"
RDEPEND="spell? ( virtual/aspell-dict )
@@ -40,10 +40,22 @@ src_prepare() {
src_configure() {
sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
makefiles/Makefile.linux || die
+ sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \
+ -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
+ -e "s:-lX11:-lX11 -lXmu -liconv:" \
+ -e "s:check_tif_rule::" \
+ makefiles/Makefile.macosx || die
}
src_compile() {
- emake CC="$(tc-getCC)" linux || die
+ case ${CHOST} in
+ *-darwin*)
+ emake CC="$(tc-getCC)" macosx || die
+ ;;
+ *-linux*)
+ emake CC="$(tc-getCC)" linux || die
+ ;;
+ esac
emake VERSION="NEdit ${PV}" -j1 -C doc all || die
}