old

(Portage version: 2.2_rc98/cvs/Linux x86_64)

3 files changed, 5 insertions, 77 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 9b980b52fceb..6734364cf079 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.76 2010/10/21 01:20:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.77 2010/10/21 14:04:05 scarabeus Exp $
+
+  21 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pixman-0.17.2.ebuild, -files/pixman-0.17.2-armv7.patch:
+  old
 
   21 Oct 2010; Brent Baude <ranger@gentoo.org> pixman-0.18.2.ebuild:
   Marking pixman-0.18.2 ppc stable for bug 239063
diff --git a/x11-libs/pixman/files/pixman-0.17.2-armv7.patch b/x11-libs/pixman/files/pixman-0.17.2-armv7.patch
deleted file mode 100644
index ee62521108a6..000000000000
--- a/x11-libs/pixman/files/pixman-0.17.2-armv7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a47b5167c4c1b55b2f51e29ab0782c2659bec312 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
-Date: Tue, 08 Dec 2009 06:52:34 +0000
-Subject: ARM: added '.arch armv7a' directive to NEON assembly file
-
-This fix prevents build failure due to not accepting PLD instruction when
-compiling for armv4 cpu with the relevant -mcpu/-march options set in CFLAGS.
----
-diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
-index e8ccf77..e66fb86 100644
---- a/pixman/pixman-arm-neon-asm.S
-+++ b/pixman/pixman-arm-neon-asm.S
-@@ -41,6 +41,7 @@
- 
-     .text
-     .fpu neon
-+    .arch armv7a
-     .altmacro
- 
- #include "pixman-arm-neon-asm.h"
---
-cgit v0.8.3-6-g21f6
diff --git a/x11-libs/pixman/pixman-0.17.2.ebuild b/x11-libs/pixman/pixman-0.17.2.ebuild
deleted file mode 100644
index 0095adb81d6a..000000000000
--- a/x11-libs/pixman/pixman-0.17.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.17.2.ebuild,v 1.11 2010/01/19 20:26:38 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular toolchain-funcs versionator
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
-DESCRIPTION="Low-level pixel manipulation routines"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="altivec mmx sse2"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="
-		$(use_enable altivec vmx)
-		--disable-gtk"
-
-	local enable_mmx="$(use mmx && echo 1 || echo 0)"
-	local enable_sse2="$(use sse2 && echo 1 || echo 0)"
-
-	# this block fixes bug #260287
-	if use x86; then
-		if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
-			ewarn "SSE2 instructions require GCC 4.2 or higher."
-			ewarn "pixman will be built *without* SSE2 support"
-			enable_sse2="0"
-		fi
-	fi
-
-	# this block fixes bug #236558
-	case "$enable_mmx,$enable_sse2" in
-	'1,1')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --enable-sse2" ;;
-	'1,0')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --disable-sse2" ;;
-	'0,1')
-		ewarn "You enabled SSE2 but have MMX disabled. This is an invalid."
-		ewarn "pixman will be built *without* MMX/SSE2 support."
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
-	'0,0')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
-	esac
-}
-
-src_unpack() {
-	x-modular_src_unpack
-	cd "${S}"
-
-	# Late fix for ARM
-	epatch "${FILESDIR}"/${P}-armv7.patch
-}