new version

7 files changed, 60 insertions, 15 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 2953ffa9e6c6..3622d90f94ab 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,9 +1,9 @@
-MD5 a2f600e338db9d218b418cd1c7d68bc9 pango-1.2.2.ebuild 1106
-MD5 f6a8a81456e3faaca06637389222f101 pango-1.2.1-r1.ebuild 1351
-MD5 3ee62128f16f81558eec66c7f09dd344 pango-1.2.1.ebuild 1242
-MD5 03a5581395c8fb77b5da68672f4657c3 pango-1.2.3.ebuild 1115
-MD5 ae5d655a7c9e58ba808584815f5ee7e4 ChangeLog 5006
-MD5 03a5581395c8fb77b5da68672f4657c3 pango-1.2.5.ebuild 1115
+MD5 1eab53167b06726899d25f60a1c93861 pango-1.2.2.ebuild 1105
+MD5 4309f268359cf9494919cd9eb964c350 pango-1.2.1-r1.ebuild 1350
+MD5 68d4edfed77315aac474cfb45eeb87d4 pango-1.2.1.ebuild 1241
+MD5 3f91963772f8436377fbcdc78b5f4652 pango-1.2.3.ebuild 1117
+MD5 41620a5f8170c44d25bd7eb9a8473fbf ChangeLog 5138
+MD5 77f9712c3b63aeb0dab0ebfdde7abfdb pango-1.2.5.ebuild 1086
 MD5 1c60a9e92e200e3cbbf35cb04bef509a files/pango-1.2.0-slighthint-gentoo.patch 1551
 MD5 d138eae4f16dd08fcf0a7672f7f01aac files/pango-1.2.1-slighthint-gentoo.patch 1551
 MD5 3c7438764bd841669fe85d3d6e084ccb files/pango-1.2.1-cvs_fontset_caching.patch 21897
@@ -13,5 +13,4 @@ MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
 MD5 c90b82eaac831982779465487509fe47 files/digest-pango-1.2.1 64
 MD5 a3195fabc91118586f1c9da0f73b81de files/digest-pango-1.2.2 64
 MD5 5270b3745127542f5321e7a64b60b531 files/digest-pango-1.2.3 64
-MD5 eb54a52fbd8231a9a1a44a405e2e45c4 files/digest-pango-1.2.4 64
 MD5 4ec9b3ca0295d4425d222c02ed4c32ee files/digest-pango-1.2.5 64
diff --git a/x11-libs/pango/files/digest-pango-1.2.5 b/x11-libs/pango/files/digest-pango-1.2.5
new file mode 100644
index 000000000000..1fe0dfe90932
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.2.5
@@ -0,0 +1 @@
+MD5 df00fe3e71cd297010f24f439b6c8ee6 pango-1.2.5.tar.bz2 865495
diff --git a/x11-libs/pango/pango-1.2.1-r1.ebuild b/x11-libs/pango/pango-1.2.1-r1.ebuild
index 362393323910..cf0e04777917 100644
--- a/x11-libs/pango/pango-1.2.1-r1.ebuild
+++ b/x11-libs/pango/pango-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.1-r1.ebuild,v 1.8 2003/08/03 04:55:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.1-r1.ebuild,v 1.9 2003/08/27 17:33:35 foser Exp $
 
 inherit eutils libtool
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pango.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="1"
+SLOT="0"
 KEYWORDS="x86 ppc alpha ~sparc hppa amd64"
 IUSE="doc debug"
 
diff --git a/x11-libs/pango/pango-1.2.1.ebuild b/x11-libs/pango/pango-1.2.1.ebuild
index 17e613a4f60f..124ad2b18b65 100644
--- a/x11-libs/pango/pango-1.2.1.ebuild
+++ b/x11-libs/pango/pango-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.1.ebuild,v 1.7 2003/08/03 04:55:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.1.ebuild,v 1.8 2003/08/27 17:33:35 foser Exp $
 
 inherit eutils libtool
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pango.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="1"
+SLOT="0"
 KEYWORDS="x86 ~ppc alpha sparc"
 IUSE="doc debug"
 
diff --git a/x11-libs/pango/pango-1.2.2.ebuild b/x11-libs/pango/pango-1.2.2.ebuild
index 3f0c1df60cdf..78cac33987d6 100644
--- a/x11-libs/pango/pango-1.2.2.ebuild
+++ b/x11-libs/pango/pango-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.2.ebuild,v 1.3 2003/08/03 04:55:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.2.ebuild,v 1.4 2003/08/27 17:33:35 foser Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pango.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="1"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
 IUSE="doc"
 
diff --git a/x11-libs/pango/pango-1.2.3.ebuild b/x11-libs/pango/pango-1.2.3.ebuild
index df8890bd7583..69b1694bfe5d 100644
--- a/x11-libs/pango/pango-1.2.3.ebuild
+++ b/x11-libs/pango/pango-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.3.ebuild,v 1.5 2003/08/24 17:15:45 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.3.ebuild,v 1.6 2003/08/27 17:33:35 foser Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pango.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
-SLOT="1"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 IUSE="doc"
 
diff --git a/x11-libs/pango/pango-1.2.5.ebuild b/x11-libs/pango/pango-1.2.5.ebuild
new file mode 100644
index 000000000000..e0071e135dcb
--- /dev/null
+++ b/x11-libs/pango/pango-1.2.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.2.5.ebuild,v 1.1 2003/08/27 17:33:35 foser Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Text rendering and layout library"
+HOMEPAGE="http://www.pango.org/"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+IUSE="doc"
+
+RDEPEND="virtual/x11
+	virtual/xft
+	>=dev-libs/glib-2.1.3
+	>=media-libs/fontconfig-2
+	>=media-libs/freetype-2.1.2-r2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.10 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Some enhancements from Redhat
+	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
+	epatch ${FILESDIR}/${PN}-1.2.2-slighthint.patch
+}
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO*"
+
+src_install() {
+	gnome2_src_install
+	rm ${D}/etc/pango/pango.modules
+}
+
+pkg_postinst() {
+	einfo "Generating modules listing..."
+	pango-querymodules > /etc/pango/pango.modules
+}