summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2011-06-07 13:48:56 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2011-06-07 13:48:56 +0000
commitf0db3e756f278b9bccce2acd3d0b38ef2d7a0158 (patch)
tree273c8cd4fe5f23f6a5a0ca551d34093bb0198d05 /gnustep-base/gnustep-make
parentRevision bump. Renaming the game binary for backwards compatibility was ill-a... (diff)
downloadgentoo-2-f0db3e756f278b9bccce2acd3d0b38ef2d7a0158.tar.gz
gentoo-2-f0db3e756f278b9bccce2acd3d0b38ef2d7a0158.tar.bz2
gentoo-2-f0db3e756f278b9bccce2acd3d0b38ef2d7a0158.zip
Block libobjc2 in current ebuilds
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-base/gnustep-make')
-rw-r--r--gnustep-base/gnustep-make/ChangeLog7
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild7
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild5
-rw-r--r--gnustep-base/gnustep-make/gnustep-make-2.6.1.ebuild5
4 files changed, 16 insertions, 8 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index f00bac660a54..14a6ac525156 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnustep-base/gnustep-make
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.99 2011/06/06 19:27:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.100 2011/06/07 13:48:56 voyageur Exp $
+
+ 07 Jun 2011; Bernard Cafarelli <voyageur@gentoo.org>
+ gnustep-make-2.4.0.ebuild, gnustep-make-2.6.0.ebuild,
+ gnustep-make-2.6.1.ebuild:
+ Block libobjc2 in current ebuilds
*gnustep-make-2.6.1 (06 Jun 2011)
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild
index 9457bd2a68aa..6ffac3f639f6 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild,v 1.6 2010/08/13 17:28:28 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.4.0.ebuild,v 1.7 2011/06/07 13:48:56 voyageur Exp $
EAPI="3"
@@ -17,7 +17,8 @@ LICENSE="GPL-2"
DEPEND="${GNUSTEP_CORE_DEPEND}
>=sys-devel/gcc-3.3[objc]
- >=sys-devel/make-3.75"
+ >=sys-devel/make-3.75
+ !gnustep-base/libobjc2"
RDEPEND="${DEPEND}"
src_prepare() {
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild
index ed8cafdfcc2d..d8bf555d1151 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.0.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/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild,v 1.3 2011/05/04 14:41:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild,v 1.4 2011/06/07 13:48:56 voyageur Exp $
EAPI="3"
@@ -17,7 +17,8 @@ LICENSE="GPL-2"
DEPEND="${GNUSTEP_CORE_DEPEND}
>=sys-devel/gcc-3.3[objc]
- >=sys-devel/make-3.75"
+ >=sys-devel/make-3.75
+ !gnustep-base/libobjc2"
RDEPEND="${DEPEND}"
src_prepare() {
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.1.ebuild
index 13256685c658..cbf313fbeb00 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.1.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/gnustep-base/gnustep-make/gnustep-make-2.6.1.ebuild,v 1.1 2011/06/06 19:27:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.1.ebuild,v 1.2 2011/06/07 13:48:56 voyageur Exp $
EAPI="3"
@@ -17,7 +17,8 @@ LICENSE="GPL-2"
DEPEND="${GNUSTEP_CORE_DEPEND}
>=sys-devel/gcc-3.3[objc]
- >=sys-devel/make-3.75"
+ >=sys-devel/make-3.75
+ !gnustep-base/libobjc2"
RDEPEND="${DEPEND}"
src_prepare() {