pango: bump to 1.40.2, reorder sections. (#803)

x11-libs/pango/pango-1.40.2.recipe

@@ -1,39 +1,34 @@
 SUMMARY="Multi-platform 2D graphics library"
-DESCRIPTION="
-Pango is a library for laying out and rendering of text, with an emphasis on \
-internationalization.
-"
-HOMEPAGE="http://www.pango.org"
-COPYRIGHT="
-	1999-2007,2010 Red Hat Software
+DESCRIPTION="Pango is a library for laying out and rendering of text, with an \
+emphasis on internationalization."
+HOMEPAGE="http://www.pango.org/"
+COPYRIGHT="1999-2007,2010 Red Hat Software
 	2001,2002 Behdad Esfahbod
 	1999-2002 International Business Machines
 	2005-2007 Imendio AB
 	2008 Jürg Billeter
 	1999,2000 Dov Grobgeld
 	2005 Keith Packard
-	2010  Kristian Rietveld
+	2010 Kristian Rietveld
 	2000-2002 Tor Lillqvist
 	2007 Novell, Inc.
 	2001 Alexander Larsson
-	2000 SuSE Linux Ltd
-"
-LICENSE="
-GNU LGPL v2.1
-"
-SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-$portVersion.tar.xz"
-CHECKSUM_SHA256="da17985df314cb07d066ab5424f59c21ce973ece05b7de4df04d798ec8511c8b"
-PATCHES="pango-$portVersion.patchset"
+	2000 SuSE Linux Ltd"
+LICENSE="GNU LGPL v2.1"
 REVISION="1"
+SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-$portVersion.tar.xz"
+CHECKSUM_SHA256="90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1"
+PATCHES="pango-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PROVIDES="
 	pango$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:pango_view$secondaryArchSuffix
-	lib:libpango_1.0$secondaryArchSuffix = 0.4000.0 compat >= 0
-	lib:libpangocairo_1.0$secondaryArchSuffix = 0.4000.0 compat >= 0
-	lib:libpangoft2_1.0$secondaryArchSuffix = 0.4000.0 compat >= 0
+	lib:libpango_1.0$secondaryArchSuffix = 0.4000.2 compat >= 0
+	lib:libpangocairo_1.0$secondaryArchSuffix = 0.4000.2 compat >= 0
+	lib:libpangoft2_1.0$secondaryArchSuffix = 0.4000.2 compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -57,6 +52,18 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	pango${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libpango_1.0$secondaryArchSuffix = 0.4000.2 compat >= 0
+	devel:libpangocairo_1.0$secondaryArchSuffix = 0.4000.2 compat >= 0
+	devel:libpangoft2_1.0$secondaryArchSuffix = 0.4000.2 compat >= 0
+	"
+REQUIRES_devel="
+	pango$secondaryArchSuffix == $portVersion base
+	devel:libharfbuzz$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcairo$secondaryArchSuffix
@@ -78,7 +85,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:gtkdocize
@@ -98,7 +105,7 @@ INSTALL()
 	make install
 
 	# remove libtool library files
-	rm $libDir/lib*.la
+	rm $libDir/libpango*.la
 
 	prepareInstalledDevelLibs libpango-1.0 \
 		libpangocairo-1.0 libpangoft2-1.0
@@ -113,16 +120,3 @@ TEST()
 {
 	make check
 }
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	pango${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libpango_1.0$secondaryArchSuffix = 0.4000.0 compat >= 0
-	devel:libpangocairo_1.0$secondaryArchSuffix = 0.4000.0 compat >= 0
-	devel:libpangoft2_1.0$secondaryArchSuffix = 0.4000.0 compat >= 0
-	"
-REQUIRES_devel="
-	pango$secondaryArchSuffix == $portVersion base
-	devel:libharfbuzz$secondaryArchSuffix
-	"