Version bump. Drop dev. releases.

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

3 files changed, 11 insertions, 52 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 126817841af1..4e4c33fee599 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,12 @@
 # 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.64 2010/03/31 20:10:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.65 2010/04/02 10:29:30 scarabeus Exp $
+
+*pixman-0.18.0 (02 Apr 2010)
+
+  02 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -pixman-0.17.4.ebuild, -pixman-0.17.14.ebuild, +pixman-0.18.0.ebuild:
+  Version bump. Drop dev. releases.
 
 *pixman-0.17.14 (31 Mar 2010)
 
diff --git a/x11-libs/pixman/pixman-0.17.4.ebuild b/x11-libs/pixman/pixman-0.17.4.ebuild
deleted file mode 100644
index ba536c869904..000000000000
--- a/x11-libs/pixman/pixman-0.17.4.ebuild
+++ /dev/null
@@ -1,46 +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.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"
-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
-}
diff --git a/x11-libs/pixman/pixman-0.17.14.ebuild b/x11-libs/pixman/pixman-0.18.0.ebuild
index 7abb44b9b41a..05cf7c39171c 100644
--- a/x11-libs/pixman/pixman-0.17.14.ebuild
+++ b/x11-libs/pixman/pixman-0.18.0.ebuild
@@ -1,11 +1,9 @@
 # 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.14.ebuild,v 1.1 2010/03/31 20:10:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.18.0.ebuild,v 1.1 2010/04/02 10:29:30 scarabeus Exp $
 
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular toolchain-funcs versionator
+EAPI=3
+inherit xorg-2 toolchain-funcs versionator
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
@@ -14,6 +12,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="altivec mmx sse2"
 
 pkg_setup() {
+	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="
 		$(use_enable altivec vmx)
 		--disable-gtk"