Version bump. Drop dev. releases.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 24 insertions, 57 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/Manifest b/x11-libs/pixman/Manifest
index 48debfcf58b9..337c4b3e3538 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pixman-0.17.2-armv7.patch 698 RMD160 c88feced691854c5bca716205b9548b29855814b SHA1 5dbb6ce2cc61cdf44f5689b2c91958060ce79466 SHA256 fa73add6a6cc13bcd29ae22041c18cb13521ba12e0c9cae32c85fc40f2f42886
 DIST pixman-0.16.0.tar.bz2 402602 RMD160 436bca0dc3bec542da59db2a226e5217cdadd8f1 SHA1 7cf1f2261ba44b3c98cf3d2a32e9fd90b12ca19e SHA256 d1808fda5f4b3feb867cfb5a1a3311a713d21ce866eb38e9096841f7e241551d
 DIST pixman-0.16.4.tar.bz2 405709 RMD160 6db90aac24a1e7e3b8c4768ce8d229206ef428b2 SHA1 08fecbd065fa3792823818fcf715b97bc66d94cd SHA256 296e9358f125536624362c4b1502a92c81227d95cda278bbff84e5593bdfcd1e
-DIST pixman-0.17.14.tar.bz2 414858 RMD160 14b013d8b0e4bfbcf7b875175b7ec8a5107935d2 SHA1 7923aa190cd4960b310f8774e6fb757d093f61b2 SHA256 052aa4c93df8f0dc3f787b6464cbb0ee952dfe312a13589236464e1ba0d0524c
 DIST pixman-0.17.2.tar.bz2 399934 RMD160 56d9ef3c80af6fd91f247314cb9bb9d8bb8a65f0 SHA1 da17421f46b323af25906bb906cccd62f34799f6 SHA256 4adcf2f85de51ca02610c12d8ae335b4913f3c7962238713f0c9491e2830a998
-DIST pixman-0.17.4.tar.bz2 405683 RMD160 218c3641a599489e5d8ccdcc1911a311fd19d6f8 SHA1 85cfa05cc4ec2f4f09747c69903a2da52c344775 SHA256 c2251899271150c45eb310ddae7f16fc0b920724ad0e2d56d75654e663e796cb
+DIST pixman-0.18.0.tar.bz2 420974 RMD160 1dd9ae74173a3323dd29a169c17c8b9eb074eb97 SHA1 0ff0944b3335f156a94949842b429229e5ae1db4 SHA256 67dee3ab6246326a264aafbec2cd4e8b1b5786a31d6fe262c80bd62ce688c503
 EBUILD pixman-0.16.0.ebuild 1596 RMD160 ed752ce1c891c07e57f8886c878771e831f1af9b SHA1 c18f7615710b17a8423707d39b1faf67bae49744 SHA256 c2a66130820839dea3360c4d9f71d1afd7ca4aaf32286e164e173f477606595b
 EBUILD pixman-0.16.4.ebuild 1541 RMD160 f0e223ef99c892565e140fa80cd3dcf733bb20f1 SHA1 6984d5a3d73f8695372d32f72e2a3bb4ade30d94 SHA256 b7455d849c187928a695654ab190352a8e87ddc1d6a2a7db7ba7a448e44e074c
-EBUILD pixman-0.17.14.ebuild 1541 RMD160 b3fd85ce4088c686645f747daf5a5261f203e956 SHA1 882b476bc2a9dd2a38b6e6701383f3ce79d51009 SHA256 5dff554adb401b6a659f04effbc6b24f5b168f673ee3f2fbdd16fe9ce0c15ddd
 EBUILD pixman-0.17.2.ebuild 1640 RMD160 3dac45d552241fe51b75a7da6da4a631acbbdc32 SHA1 d8b81745b3a436cb58fc9e809fd4297a8e71414d SHA256 8475d56bb2b1c3932e8a285ca3fd00a4fa59ed39a613f7980f77d695c3296051
-EBUILD pixman-0.17.4.ebuild 1541 RMD160 ed9c785dc243d6e1e3d22fb3bf7cbfdd646245cf SHA1 a49c54bf751b79ef77a832f4a51d36d0450c400c SHA256 e60f99b0e5642216f2be52b8da60d22487625704019c8d74cc107f3256f4853b
-MISC ChangeLog 9409 RMD160 ef65e529b0897a39efe5087eacce224c65d22dc6 SHA1 0d30fe8cc1560c7ed669ca544e89b11a804facdc SHA256 56926200971bbd158ac9986e885fc2f297ec2e5150302e16f2d7393f1d881527
+EBUILD pixman-0.18.0.ebuild 1499 RMD160 aeb314dc5425758fb21beec2e6b54ffb6b70fbcf SHA1 859b3a2e22b921d189d9b8ce8dac4842d12c2e3a SHA256 6b3e55012a6602edefd7e3d69155eeca46f5c77f2301bbd635856477aff86e6b
+MISC ChangeLog 9604 RMD160 1ace709506d97b5bbb93ef5a23f72991e16ed010 SHA1 18ed49407b87e003f531425a93f8a79237760440 SHA256 d6b76b7229e3fe1fd56df281d700aab7ace5582f71418c6b9182394308234165
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku1xxAACgkQHB6c3gNBRYcWEACfSOl+i8CQy+mC/wSEwn4RbZhd
+aicAn0+iukWDk9E5BJg9XqDCQI8qRIl1
+=t/0q
+-----END PGP SIGNATURE-----
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"