summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-09-13 15:45:10 +0000
committerFabian Groffen <grobian@gentoo.org>2010-09-13 15:45:10 +0000
commit21262f9fcbf2e86d3e80cbc9dfb338933acae60d (patch)
treed13a133b82a8232de04d9245109a2c2aa2b7268e /app-text/pep
parentStable on alpha, bug #332361 (diff)
downloadhistorical-21262f9fcbf2e86d3e80cbc9dfb338933acae60d.tar.gz
historical-21262f9fcbf2e86d3e80cbc9dfb338933acae60d.tar.bz2
historical-21262f9fcbf2e86d3e80cbc9dfb338933acae60d.zip
Make compilation on Darwin working again (flag-o-matic inherit was dropped), move all Darwin logic to src_prepare
Package-Manager: portage-2.2.01.16365-prefix/cvs/Darwin powerpc
Diffstat (limited to 'app-text/pep')
-rw-r--r--app-text/pep/ChangeLog6
-rw-r--r--app-text/pep/Manifest4
-rw-r--r--app-text/pep/pep-2.8-r1.ebuild12
3 files changed, 13 insertions, 9 deletions
diff --git a/app-text/pep/ChangeLog b/app-text/pep/ChangeLog
index 5ef808959009..22247f8fda85 100644
--- a/app-text/pep/ChangeLog
+++ b/app-text/pep/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/pep
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pep/ChangeLog,v 1.18 2010/08/26 22:08:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pep/ChangeLog,v 1.19 2010/09/13 15:45:10 grobian Exp $
+
+ 13 Sep 2010; Fabian Groffen <grobian@gentoo.org> pep-2.8-r1.ebuild:
+ Make compilation on Darwin working again (flag-o-matic inherit was
+ dropped), move all Darwin logic to src_prepare
26 Aug 2010; Jeroen Roovers <jer@gentoo.org> files/pep-2.8-gentoo.patch,
files/pep-2.8-include.patch:
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 19aa0ddbb5c1..91e688984878 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,7 +1,7 @@
AUX pep-2.8-gentoo.patch 494 RMD160 37db375a7d3767f64caeb0a55ff350ae7414c7e0 SHA1 c90b191cb1fc4cce6ca8b5dbcc77f62e42ca6841 SHA256 2f9bebf7f3215667cbb6453c2d5766f226582c5149222a3362d89f679a8f7d78
AUX pep-2.8-include.patch 239 RMD160 ec403b4957ee96dd7f34a870ab76daf9abb80a7b SHA1 797600672ff77b280bee3890a84e59c0786b267a SHA256 e032043ce54de39dcd4b895f68237bae68e5915e0ee929e2b7287f46fac8dc58
DIST pep28.zip 83969 RMD160 034816e22d403918a3a37fadfbc42220c823452d SHA1 c2e4b1a2062eb16e29ed9b303a80256020873314 SHA256 108fe13e0038284c7939414687c7efee7af73f73c387048ac574e6196d295af4
-EBUILD pep-2.8-r1.ebuild 1264 RMD160 cece95e74a2af1af77a286056ac5e4f6e45bd8b4 SHA1 fa699be45fb36fc92bb253da30d775c9a1f66b7d SHA256 94704b78f39e4dd5768a34288ad119df71e942aa71af3ae9c927a3a63234e2a1
+EBUILD pep-2.8-r1.ebuild 1257 RMD160 1b938754b0f7cb2ae65121680822f9d4a2fff9fd SHA1 1a73eb238f16b1c81f895f4bc5fbbb14a39d65b0 SHA256 7e8c6335d0a6a6304bfd217eaf69358c9718e960ac0c845acbea058e68663fa0
EBUILD pep-2.8.ebuild 1230 RMD160 7e8a9d0698ab783c7765b0d4de16e4fa7feaa402 SHA1 a31168ea6b9b9f11a77fdc48f7e7a47ee7275740 SHA256 2f460df9778415c9e58c7a61ab8ceb9852c7b046faaf4c946100a520361eae5e
-MISC ChangeLog 2029 RMD160 d6c829ca66d3f5b35ea8bdafa6c4c5201466acf7 SHA1 9cd2f0c6ab5ac3e1c2a8769213c5e8bdcf9914aa SHA256 bc1022d57b933c25d01210c4e28175fad3979cef1f47b2b65603d709772ae8ba
+MISC ChangeLog 2222 RMD160 1a02bc951fe24d9010c110da4a61841a49e81c1e SHA1 a057bc16f5235b2af0c942b73823345d5185fb3d SHA256 4a541c842758a1a927a60d0dedddd1f6e3ad824c0da48911083a6d4633d17d24
MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/app-text/pep/pep-2.8-r1.ebuild b/app-text/pep/pep-2.8-r1.ebuild
index 10e02c3f4212..1d69f2af9f9c 100644
--- a/app-text/pep/pep-2.8-r1.ebuild
+++ b/app-text/pep/pep-2.8-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pep/pep-2.8-r1.ebuild,v 1.1 2010/08/26 22:05:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pep/pep-2.8-r1.ebuild,v 1.2 2010/09/13 15:45:10 grobian Exp $
EAPI="2"
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
DESCRIPTION="General purpose filter and file cleaning program"
HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
@@ -26,14 +26,14 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-include.patch
- # Darwin lacks stricmp
- [[ ${CHOST} == *-darwin* ]] && \
+ # Darwin lacks stricmp and DIRCHAR
+ if [[ ${CHOST} == *-darwin* ]] ; then
sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile
+ append-flags "-Dunix" -DSTRICMP
+ fi
}
src_compile() {
- [[ ${CHOST} == *-darwin* ]] && \
- append-flags "-DDIRCHAR=\\'/\\'" -DSTRICMP
# make man page too
make Doc/pep.1 || die "make man page failed"
emake CC="$(tc-getCC)" || die "emake failed"