Version bumps. Drop old.

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

6 files changed, 17 insertions, 83 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index dae23d007248..974cc8dbded1 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,15 @@
 # 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.62 2010/01/19 20:26:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.63 2010/01/22 09:24:07 scarabeus Exp $
+
+*pixman-0.17.4 (22 Jan 2010)
+*pixman-0.16.4 (22 Jan 2010)
+
+  22 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pixman-0.10.0.ebuild, -pixman-0.12.0.ebuild,
+  -files/pixman-0.12.0-sse.patch, -pixman-0.14.0-r1.ebuild,
+  -pixman-0.16.2.ebuild, +pixman-0.16.4.ebuild, +pixman-0.17.4.ebuild:
+  Version bumps. Drop old.
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> pixman-0.17.2.ebuild:
   s390 stable wrt #294958
diff --git a/x11-libs/pixman/files/pixman-0.12.0-sse.patch b/x11-libs/pixman/files/pixman-0.12.0-sse.patch
deleted file mode 100644
index 1f6ee92eeaa1..000000000000
--- a/x11-libs/pixman/files/pixman-0.12.0-sse.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.orig	2008-09-25 20:34:22.000000000 -0700
-+++ configure.ac	2008-09-25 20:43:57.000000000 -0700
-@@ -191,10 +191,8 @@
- CFLAGS="$CFLAGS -msse2 $SSE2_CFLAGS"
- 
- AC_COMPILE_IFELSE([
--#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
--#   if !defined(__amd64__) && !defined(__x86_64__)
-+#if !defined(__GNUC__) && !(__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
- #      error "Need GCC >= 4.2 for SSE2 intrinsics on x86"
--#   endif
- #endif
- #include <mmintrin.h>
- #include <xmmintrin.h>
diff --git a/x11-libs/pixman/pixman-0.10.0.ebuild b/x11-libs/pixman/pixman-0.10.0.ebuild
deleted file mode 100644
index 083af2d01832..000000000000
--- a/x11-libs/pixman/pixman-0.10.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.10.0.ebuild,v 1.9 2009/05/04 15:21:42 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Low-level pixel manipulation routines"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
diff --git a/x11-libs/pixman/pixman-0.12.0.ebuild b/x11-libs/pixman/pixman-0.12.0.ebuild
deleted file mode 100644
index bee917eeeb0e..000000000000
--- a/x11-libs/pixman/pixman-0.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.12.0.ebuild,v 1.11 2009/09/01 18:39:20 jer Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular toolchain-funcs versionator
-
-DESCRIPTION="Low-level pixel manipulation routines"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="altivec mmx sse sse2"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable altivec vmx) $(use_enable mmx)
-	$(use_enable sse2) --disable-gtk"
-
-	if use sse2 && ! use sse; then
-		eerror "You enabled SSE2 but have SSE disabled. This is an invalid"
-		eerror "configuration. Either do USE='sse' or USE='-sse2'"
-		die "SSE2 selected without SSE"
-	fi
-
-	if use x86; then
-		if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
-			eerror "SSE2 instructions require GCC 4.2 or higher. Either use"
-			eerror "GCC 4.2 or higher or USE='-sse2'"
-			die "SSE2 instructions require GCC 4.2 or higher"
-		fi
-	fi
-}
-
-src_unpack() {
-	x-modular_src_unpack
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-sse.patch
-
-	eautoreconf
-	elibtoolize
-}
diff --git a/x11-libs/pixman/pixman-0.16.2.ebuild b/x11-libs/pixman/pixman-0.16.4.ebuild
index 4d1a03c81964..d809f2c257a0 100644
--- a/x11-libs/pixman/pixman-0.16.2.ebuild
+++ b/x11-libs/pixman/pixman-0.16.4.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-libs/pixman/pixman-0.16.2.ebuild,v 1.2 2010/01/12 20:47:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.16.4.ebuild,v 1.1 2010/01/22 09:24:07 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="altivec mmx sse2"
 
 pkg_setup() {
diff --git a/x11-libs/pixman/pixman-0.14.0-r1.ebuild b/x11-libs/pixman/pixman-0.17.4.ebuild
index 31031a7f54cc..ba536c869904 100644
--- a/x11-libs/pixman/pixman-0.14.0-r1.ebuild
+++ b/x11-libs/pixman/pixman-0.17.4.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.14.0-r1.ebuild,v 1.9 2009/05/15 14:37:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.17.4.ebuild,v 1.1 2010/01/22 09:24:07 scarabeus 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"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="altivec mmx sse2"
 
 pkg_setup() {
@@ -42,13 +44,3 @@ pkg_setup() {
 		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
 	esac
 }
-
-src_unpack() {
-	x-modular_src_unpack
-	cd "${S}"
-
-	epatch "${FILESDIR}"/pixman-0.12.0-sse.patch
-
-	eautoreconf
-	elibtoolize
-}