restore old version for no-ntpl/2.4 profiles

Package-Manager: portage-2.1.4_rc14
RepoMan-Options: --force

6 files changed, 232 insertions, 5 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 313291180027..2eaa7982c679 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/pango
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.204 2008/01/04 04:56:47 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.205 2008/01/04 07:31:21 compnerd Exp $
+
+  04 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/pango-1.10.2-slighthint.patch, +files/pango-1.11.3-xfonts.patch,
+  +pango-1.12.3.ebuild:
+  Restore old version for no-nptl/2.4 profile
 
   04 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
   -files/pango-1.0.99.020606-xfonts.patch,
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index d6ab85b3ef49..8288d163db44 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,9 +1,22 @@
+AUX pango-1.10.2-slighthint.patch 1069 RMD160 cce55e17f29aff964e25870e7123a892e4b34b30 SHA1 abb115e6c9c8cd94dbdbc4f2d3e9305a82a40a15 SHA256 6a9b67aec4c2c0d3c9b6e626117ce31e48f4d280f04f6b880bd36005523069f0
+MD5 40faa11ac45a2600e6b3c7eeec64cc50 files/pango-1.10.2-slighthint.patch 1069
+RMD160 cce55e17f29aff964e25870e7123a892e4b34b30 files/pango-1.10.2-slighthint.patch 1069
+SHA256 6a9b67aec4c2c0d3c9b6e626117ce31e48f4d280f04f6b880bd36005523069f0 files/pango-1.10.2-slighthint.patch 1069
+AUX pango-1.11.3-xfonts.patch 4540 RMD160 1e0f2ed25a0c461554139f647d004298c5b7cc9c SHA1 5158ca73b2ef873816719dacf735cbc100a92351 SHA256 8c4ac42e9a61eb9d174420b8bdc22e41bab06de758200f2e3a036a5d82282fa8
+MD5 b6a4250ddaea4f18ec8d7e05663cce83 files/pango-1.11.3-xfonts.patch 4540
+RMD160 1e0f2ed25a0c461554139f647d004298c5b7cc9c files/pango-1.11.3-xfonts.patch 4540
+SHA256 8c4ac42e9a61eb9d174420b8bdc22e41bab06de758200f2e3a036a5d82282fa8 files/pango-1.11.3-xfonts.patch 4540
 AUX pango-1.2.5-lib64.patch 1107 RMD160 1a0ceb7f6b0cbf7c1a62ad9920fa91713a767809 SHA1 1df21274d31a5281aafc236312415f4cca02e578 SHA256 010aa771c0662b056e1668d0607397f670cb030da252d7d95a9eea270fbc9ec9
 MD5 2c7eef6720e5a5aecb7406200c6ede31 files/pango-1.2.5-lib64.patch 1107
 RMD160 1a0ceb7f6b0cbf7c1a62ad9920fa91713a767809 files/pango-1.2.5-lib64.patch 1107
 SHA256 010aa771c0662b056e1668d0607397f670cb030da252d7d95a9eea270fbc9ec9 files/pango-1.2.5-lib64.patch 1107
+DIST pango-1.12.3.tar.bz2 1226579 RMD160 7692828276e9b5a54b0b8c32fa07d7db6ac45bed SHA1 ad493c4560c0ffd9dcdb8a1724d5bff058ef112c SHA256 73ac1b956ff16df41c41355231aae3f757500c83ab912108370ea7b70c43fd18
 DIST pango-1.16.5.tar.bz2 1345977 RMD160 98f38b2f8062e8f11e95a22824fa8c89664ffbb3 SHA1 a23899b16a95294dfa739825c81f3858787127e8 SHA256 78ffda1dd67b16c6f558c918d2473de284091bfab075777a4f81e33752bc444d
 DIST pango-1.18.3.tar.bz2 1394980 RMD160 f57f92e81ba279bb1bb456e0d6075d3b4bf0e3d3 SHA1 b7b9e8dee0111dc877ceec33b8a47e17d3466ce7 SHA256 a1547a88ba9330956ce9f2f9e2ab74491e7344cc25fee4310b7f72c7e5f38db3
+EBUILD pango-1.12.3.ebuild 1850 RMD160 80af1506bf41ed01c6e29210665273f388487573 SHA1 27068a1be456902e159946dc287670f7ee7afc4a SHA256 03f0a35b58fb085880c1f890581c78725eaa8d515f374d3b51ec00f3c6c77ff5
+MD5 238ed2f11ade307ee4bd99fac812b5d8 pango-1.12.3.ebuild 1850
+RMD160 80af1506bf41ed01c6e29210665273f388487573 pango-1.12.3.ebuild 1850
+SHA256 03f0a35b58fb085880c1f890581c78725eaa8d515f374d3b51ec00f3c6c77ff5 pango-1.12.3.ebuild 1850
 EBUILD pango-1.16.5.ebuild 1589 RMD160 c95c901c5c23a43de8a60e779c80be31f092aecb SHA1 6656cd4d3e7a7ac319d7c8ba70ed107f753fd84d SHA256 f9b7c3926e449352d5ff1d402dcf024e15754a8c9634c68c4da3229f2a184729
 MD5 f9243182159541983719a3fc12892272 pango-1.16.5.ebuild 1589
 RMD160 c95c901c5c23a43de8a60e779c80be31f092aecb pango-1.16.5.ebuild 1589
@@ -12,14 +25,17 @@ EBUILD pango-1.18.3.ebuild 1591 RMD160 5ecc8f0440eded9d2328ff11b4c9d3160dc8692b
 MD5 2565a9aaf1ddfac88b0b8a52f04a6462 pango-1.18.3.ebuild 1591
 RMD160 5ecc8f0440eded9d2328ff11b4c9d3160dc8692b pango-1.18.3.ebuild 1591
 SHA256 715ebd8319e6d7805d01efceb8414902f28a81bd1fc8d6c55714036530da5f41 pango-1.18.3.ebuild 1591
-MISC ChangeLog 24158 RMD160 9ba90ed6178e228a9c1b42b374ac5f69e294ad7b SHA1 4e50df3d8c9a05c4962b9233892fbdbae6829485 SHA256 037a2ed8b035279e95a466f7b7fe086e78225013970cb21dfd01edf8b8a9f0ef
-MD5 1bccc48dc502ada4ea350ed46168d829 ChangeLog 24158
-RMD160 9ba90ed6178e228a9c1b42b374ac5f69e294ad7b ChangeLog 24158
-SHA256 037a2ed8b035279e95a466f7b7fe086e78225013970cb21dfd01edf8b8a9f0ef ChangeLog 24158
+MISC ChangeLog 24359 RMD160 c02bfa27548cb3b4a50c9c3a0a3ed243b206b9a7 SHA1 690df9fd4ebc5007e710ec9c3e0121a20aa9408d SHA256 cd2b7a0654dcbf87072c638bd450d308cd50a228909ed685f388baa1e7d35b7f
+MD5 96971bfc2bb8503b3c3cd452673c403c ChangeLog 24359
+RMD160 c02bfa27548cb3b4a50c9c3a0a3ed243b206b9a7 ChangeLog 24359
+SHA256 cd2b7a0654dcbf87072c638bd450d308cd50a228909ed685f388baa1e7d35b7f ChangeLog 24359
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+MD5 2b61e5e75c7feb1ee88f118be322600c files/digest-pango-1.12.3 244
+RMD160 86bf3be6d7b98b8406d10ad1c1363ffe6dedc54b files/digest-pango-1.12.3 244
+SHA256 4b414ac978c0ddb0b2907a6a4736756d89d7725ffb278f6f07e9c3d07ff04475 files/digest-pango-1.12.3 244
 MD5 414ebc92c24ef25d468baf2645d0b45c files/digest-pango-1.16.5 244
 RMD160 deff8440622230d38999bccff941f237be0b4191 files/digest-pango-1.16.5 244
 SHA256 c441dfdb05efa7da7e1d19648f93e4a9bcfd413dc17f83282ba262d23ce214ae files/digest-pango-1.16.5 244
diff --git a/x11-libs/pango/files/digest-pango-1.12.3 b/x11-libs/pango/files/digest-pango-1.12.3
new file mode 100644
index 000000000000..0c9460cba8db
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.12.3
@@ -0,0 +1,3 @@
+MD5 c8178e11a895166d86990bb2c38d831b pango-1.12.3.tar.bz2 1226579
+RMD160 7692828276e9b5a54b0b8c32fa07d7db6ac45bed pango-1.12.3.tar.bz2 1226579
+SHA256 73ac1b956ff16df41c41355231aae3f757500c83ab912108370ea7b70c43fd18 pango-1.12.3.tar.bz2 1226579
diff --git a/x11-libs/pango/files/pango-1.10.2-slighthint.patch b/x11-libs/pango/files/pango-1.10.2-slighthint.patch
new file mode 100644
index 000000000000..337ecb08c731
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.10.2-slighthint.patch
@@ -0,0 +1,34 @@
+--- pango/pangoft2.c.orig	2005-12-09 23:37:11.000000000 -0600
++++ pango/pangoft2.c	2005-12-09 23:40:17.000000000 -0600
+@@ -171,6 +171,7 @@
+   FcPattern *pattern;
+   FcChar8 *filename;
+   FcBool antialias, hinting, autohint;
++  int hintstyle;
+   int id;
+ 
+   pattern = fcfont->font_pattern;
+@@ -194,8 +195,21 @@
+                             FC_HINTING, 0, &hinting) != FcResultMatch)
+ 	hinting = FcTrue;
+ 
+-      if (!hinting)
+-        ft2font->load_flags |= FT_LOAD_NO_HINTING;
++      if (FcPatternGetInteger (pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch)
++         hintstyle = FC_HINT_FULL;
++
++      if (!hinting || hintstyle == FC_HINT_NONE)
++         ft2font->load_flags |= FT_LOAD_NO_HINTING;
++
++      switch (hintstyle) {
++         case FC_HINT_SLIGHT:
++         case FC_HINT_MEDIUM:
++            ft2font->load_flags |= FT_LOAD_TARGET_LIGHT;
++            break;
++         default:
++            ft2font->load_flags |= FT_LOAD_TARGET_NORMAL;
++            break;
++      }
+ 
+       /* force autohinting if requested */
+       if (FcPatternGetBool (pattern,
diff --git a/x11-libs/pango/files/pango-1.11.3-xfonts.patch b/x11-libs/pango/files/pango-1.11.3-xfonts.patch
new file mode 100644
index 000000000000..0e29cb9cd49a
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.11.3-xfonts.patch
@@ -0,0 +1,98 @@
+--- pango-1.1.13/pango/pangox.aliases.xfonts	Mon Jun 24 20:19:34 2002
++++ pango-1.1.13/pango/pangox.aliases	Mon Jun 24 20:26:34 2002
+@@ -4,6 +4,7 @@
+ 
+ sans normal normal normal normal \
+   "-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -22,6 +23,7 @@
+ 
+ sans italic normal normal normal \
+   "-*-helvetica-medium-o-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-medium-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -40,6 +42,7 @@
+ 
+ sans normal normal bold normal \
+   "-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -58,6 +61,7 @@
+ 
+ sans italic normal bold normal \
+   "-*-helvetica-bold-o-normal--*-*-*-*-*-*-*-*,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-gulim-bold-o-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+@@ -78,6 +82,7 @@
+ serif normal normal normal normal \
+   "-*-times-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -96,6 +101,7 @@
+ serif italic normal normal normal \
+   "-*-times-medium-i-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -114,6 +120,7 @@
+ serif normal normal bold normal \
+   "-*-times-bold-r-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -132,6 +139,7 @@
+ serif italic normal bold normal \
+   "-*-times-bold-i-normal--*-*-*-*-*-*-*-*,\
+    -*-batang-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -150,6 +158,7 @@
+ monospace normal normal normal normal \
+   "-*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -168,6 +177,7 @@
+ monospace italic normal normal normal \
+   "-*-fixed-medium-i-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -186,6 +196,7 @@
+ monospace normal normal bold normal \
+   "-*-fixed-bold-r-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
+@@ -204,6 +215,7 @@
+ monospace italic normal bold normal \
+   "-*-fixed-bold-i-normal--*-*-*-*-*-*-*-*,\
+    -*-dotum-bold-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
++   -*-gulimbdf-medium-r-normal--*-*-*-*-*-*-ksc5601.1987-0,\
+    -*-clearlyu-medium-r-normal--*-*-*-*-*-*-iso10646-1,\
+    -*-fixed-medium-r-normal--*-*-*-*-*-*-*-*,\
+    -kaist-iyagi-bold-r-normal--*-*-*-*-*-*-johab-1,\
diff --git a/x11-libs/pango/pango-1.12.3.ebuild b/x11-libs/pango/pango-1.12.3.ebuild
new file mode 100644
index 000000000000..a8b693fb386a
--- /dev/null
+++ b/x11-libs/pango/pango-1.12.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.12.3.ebuild,v 1.15 2008/01/04 07:31:21 compnerd Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2 FTL"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXft
+	>=dev-libs/glib-2.10.0
+	>=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2
+	>x11-libs/cairo-1.0.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	x11-proto/xproto
+	doc? (
+		>=dev-util/gtk-doc-1
+		~app-text/docbook-xml-dtd-4.1.2 )"
+
+DOCS="AUTHORS ChangeLog* NEWS README TODO*"
+
+src_unpack() {
+
+	unpack "${A}"
+	cd "${S}"
+
+	# Some enhancements from Redhat
+	# These NEED to go upstream.
+	epatch "${FILESDIR}/pango-1.11.3-xfonts.patch"
+	epatch "${FILESDIR}/${PN}-1.10.2-slighthint.patch"
+
+	# make config file location host specific so that a 32bit and 64bit pango
+	# wont fight with each other on a multilib system
+	use amd64 && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
+	# and this line is just here to make building emul-linux-x86-gtklibs a bit
+	# easier, so even this should be amd64 specific.
+	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch "${FILESDIR}/pango-1.2.5-lib64.patch"
+
+	epunt_cxx
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	rm "${D}/etc/pango/pango.modules"
+}
+
+pkg_postinst() {
+
+	if [ "${ROOT}" == "/" ] ; then
+		einfo "Generating modules listing..."
+		use amd64 && PANGO_CONFDIR="/etc/pango/${CHOST}"
+		use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && PANGO_CONFDIR="/etc/pango/${CHOST}"
+		PANGO_CONFDIR=${PANGO_CONFDIR:=/etc/pango}
+		mkdir -p ${PANGO_CONFDIR}
+		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
+	fi
+
+}