new version 'n cleanup

15 files changed, 85 insertions, 346 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 4233867d1417..bbabafa5ebbd 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,22 +1,12 @@
-MD5 537346b94b4ca2c51982628ba60bedd5 pango-1.0.4-r1.ebuild 1108
-MD5 e0c51eba42ef12fa4940ec02413c94fa pango-1.2.2.ebuild 1367
-MD5 31596a9dcb04ae850958eb127a2e09b2 pango-1.0.3-r1.ebuild 1378
+MD5 49e1ca4f1982890d97c56caef48feebc pango-1.2.2.ebuild 1100
 MD5 0ccac7358dd9c9823865b46ec8923cb5 pango-1.2.1-r1.ebuild 1465
-MD5 587391d1231a0749d7abc70caa6dbff9 pango-1.0.5.ebuild 1105
-MD5 213c1f18da9b80e6843a761661c94fe7 pango-1.1.3.ebuild 1325
 MD5 e0c51eba42ef12fa4940ec02413c94fa pango-1.2.1.ebuild 1367
-MD5 35a077bd54df7edc4f841e4d7709a622 ChangeLog 4464
-MD5 d90011a46c3f8ff9422cad82bebffa96 pango-1.2.0.ebuild 1388
+MD5 7e4ceb2da3f6d7e7dd0c262eef669ff2 ChangeLog 4623
 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
-MD5 ea49998c34efaa0abda66a0520dc32c9 files/digest-pango-1.0.3-r1 64
-MD5 3022adc58e1723bf9ed46ef580caf467 files/digest-pango-1.0.4-r1 64
 MD5 c90b82eaac831982779465487509fe47 files/digest-pango-1.2.1-r1 64
-MD5 858bcadfd874c37825cc76b20d124493 files/pango-1.1.0-slighthint.patch 1314
+MD5 ee91ace9933dbdbea591e08b6a82bb44 files/pango-1.2.2-slighthint.patch 1124
 MD5 54a56a572951b08340d08e10e4d93414 files/pango-1.0.99.020606-xfonts.patch 4560
-MD5 3afe3ccf230f8c03b83ef0cd3165b067 files/digest-pango-1.0.5 64
-MD5 b301a578aed5e908898f2c5c6ce61d53 files/digest-pango-1.1.3 64
-MD5 8229f431707ed4e06781ce5b26673947 files/digest-pango-1.2.0 64
 MD5 c90b82eaac831982779465487509fe47 files/digest-pango-1.2.1 64
 MD5 a3195fabc91118586f1c9da0f73b81de files/digest-pango-1.2.2 64
diff --git a/x11-libs/pango/files/digest-pango-1.0.3-r1 b/x11-libs/pango/files/digest-pango-1.0.3-r1
deleted file mode 100644
index 37bdaa2586a0..000000000000
--- a/x11-libs/pango/files/digest-pango-1.0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5bb1904c4a7837ec5b8007501646302d pango-1.0.3.tar.bz2 763585
diff --git a/x11-libs/pango/files/digest-pango-1.0.4-r1 b/x11-libs/pango/files/digest-pango-1.0.4-r1
deleted file mode 100644
index b45aee0abff7..000000000000
--- a/x11-libs/pango/files/digest-pango-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9147cdbe3c4eac36047257e552665a65 pango-1.0.4.tar.bz2 769548
diff --git a/x11-libs/pango/files/digest-pango-1.0.5 b/x11-libs/pango/files/digest-pango-1.0.5
deleted file mode 100644
index 01bb3d61c6f9..000000000000
--- a/x11-libs/pango/files/digest-pango-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e300e5c163bc28e180e45c8e20543b4b pango-1.0.5.tar.bz2 773255
diff --git a/x11-libs/pango/files/digest-pango-1.1.3 b/x11-libs/pango/files/digest-pango-1.1.3
deleted file mode 100644
index d83c5c887b83..000000000000
--- a/x11-libs/pango/files/digest-pango-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34f4c5486b9428d8c738acc0c76ed669 pango-1.1.3.tar.bz2 766579
diff --git a/x11-libs/pango/files/digest-pango-1.2.0 b/x11-libs/pango/files/digest-pango-1.2.0
deleted file mode 100644
index e9bb51786b85..000000000000
--- a/x11-libs/pango/files/digest-pango-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e84cce50628021c596202a186d66024 pango-1.2.0.tar.bz2 788709
diff --git a/x11-libs/pango/files/digest-pango-1.2.2 b/x11-libs/pango/files/digest-pango-1.2.2
new file mode 100644
index 000000000000..7cbe22c6b6f5
--- /dev/null
+++ b/x11-libs/pango/files/digest-pango-1.2.2
@@ -0,0 +1 @@
+MD5 b8858106b9c7c9b040fc466c95909713 pango-1.2.2.tar.bz2 849132
diff --git a/x11-libs/pango/files/pango-1.1.0-slighthint.patch b/x11-libs/pango/files/pango-1.1.0-slighthint.patch
deleted file mode 100644
index 4cbcb454997c..000000000000
--- a/x11-libs/pango/files/pango-1.1.0-slighthint.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- pango-1.1.0/pango/pangoft2.c.slighthint	Thu Aug  8 19:13:38 2002
-+++ pango-1.1.0/pango/pangoft2.c	Tue Aug 13 00:42:17 2002
-@@ -205,6 +205,8 @@
-   FcPattern *pattern;
-   FcChar8 *filename;
-   FcBool hinting, autohint;
-+  FT_ULong hint_flags;
-+  int hintstyle;
-   int id;
- 
-   pattern = ft2font->font_pattern;
-@@ -220,8 +222,22 @@
-       if (FcPatternGetBool (pattern, 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:
-+ 	hint_flags = FT_HINT_NO_INTEGER_STEM | FT_HINT_NO_VSTEM_ALIGN;
-+ 	break;
-+      case FC_HINT_MEDIUM:
-+ 	hint_flags = FT_HINT_NO_INTEGER_STEM;
-+ 	break;
-+      default:
-+ 	hint_flags = 0;
-+      }
- 
-       /* force autohinting if requested */
-       if (FcPatternGetBool (pattern, FC_AUTOHINT, 0, &autohint) != FcResultMatch)
-@@ -243,6 +259,9 @@
- 	bail0:
- 	  load_fallback_face (ft2font, filename);
- 	}
-+
-+      FT_Set_Hint_Flags (ft2font->face, hint_flags);
-+      
-       ft2font->face->generic.data = 0;
-     }
- 
diff --git a/x11-libs/pango/files/pango-1.2.2-slighthint.patch b/x11-libs/pango/files/pango-1.2.2-slighthint.patch
new file mode 100644
index 000000000000..b1c1d99a45b2
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.2.2-slighthint.patch
@@ -0,0 +1,35 @@
+diff -ur pango-1.2.2/pango/pangoft2.c pango-1.2.2.slighthint/pango/pangoft2.c
+--- pango-1.2.2/pango/pangoft2.c	2003-05-30 00:34:36.000000000 +0200
++++ pango-1.2.2.slighthint/pango/pangoft2.c	2003-06-02 18:09:37.000000000 +0200
+@@ -210,6 +210,7 @@
+   FcPattern *pattern;
+   FcChar8 *filename;
+   FcBool antialias, hinting, autohint;
++  int hintstyle;
+   int id;
+ 
+   pattern = ft2font->font_pattern;
+@@ -233,8 +234,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/pango-1.0.3-r1.ebuild b/x11-libs/pango/pango-1.0.3-r1.ebuild
deleted file mode 100644
index f0f17c8c6450..000000000000
--- a/x11-libs/pango/pango-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.0.3-r1.ebuild,v 1.6 2003/02/13 17:00:50 vapier Exp $
-
-IUSE="doc"
-
-
-inherit debug
-inherit libtool
-
-SLOT="1"
-KEYWORDS="x86 ppc sparc "
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Text rendering and Layout library"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.pango.org/"
-LICENSE="LGPL-2.1"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.0.4
-	>=media-libs/freetype-2.0.9"
-	
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-
-src_compile() {
-	elibtoolize
-	local myconf
-	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} \
-		--without-qt \
-		--enable-debug || die
-	# turn on debug again, glib dislikes not having it.
-	emake || make || die "paralell make and serial make failed" 
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-	rm ${D}/etc/pango/pango.modules
-
-
- 	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO*
-}
-
-pkg_postinst() {
-	pango-querymodules >/etc/pango/pango.modules
-}
-
diff --git a/x11-libs/pango/pango-1.0.4-r1.ebuild b/x11-libs/pango/pango-1.0.4-r1.ebuild
deleted file mode 100644
index eb8444bf2be5..000000000000
--- a/x11-libs/pango/pango-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.0.4-r1.ebuild,v 1.11 2003/02/13 17:00:56 vapier Exp $
-
-IUSE="doc"
-
-inherit libtool
-
-SLOT="1"
-KEYWORDS="x86 ppc sparc alpha"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Text rendering and Layout library"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.pango.org/"
-LICENSE="LGPL-2.1"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.0.6-r1
-	>=media-libs/freetype-2.1.2"
-	
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-
-src_compile() {
-	elibtoolize
-	local myconf
-	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug"
-	fi
-				
-	
-	econf ${myconf} --without-qt  || die
-	make || die "serial make failed" 
-}
-
-src_install() {
-	einstall
-	rm ${D}/etc/pango/pango.modules
-
-
- 	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS NEWS.pre-1-3 TODO*
-}
-
-pkg_postinst() {
-	pango-querymodules >/etc/pango/pango.modules
-}
-
diff --git a/x11-libs/pango/pango-1.0.5.ebuild b/x11-libs/pango/pango-1.0.5.ebuild
deleted file mode 100644
index 63a4ee3a7f4a..000000000000
--- a/x11-libs/pango/pango-1.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.0.5.ebuild,v 1.7 2003/02/13 17:01:02 vapier Exp $
-
-IUSE="doc"
-
-inherit libtool
-
-SLOT="1"
-KEYWORDS="x86 ppc sparc alpha"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Text rendering and Layout library"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.pango.org/"
-LICENSE="LGPL-2.1"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/freetype-2.0.1"
-	
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9
-		app-text/sgmltools-lite )"
-
-src_compile() {
-	elibtoolize
-	local myconf
-	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug"
-	fi
-				
-	
-	econf ${myconf} --without-qt  || die
-	make || die "serial make failed" 
-}
-
-src_install() {
-	einstall
-	rm ${D}/etc/pango/pango.modules
-
-
- 	dodoc AUTHORS ChangeLog COPYING README INSTALL NEWS TODO*
-}
-
-pkg_postinst() {
-	pango-querymodules >/etc/pango/pango.modules
-}
-
diff --git a/x11-libs/pango/pango-1.1.3.ebuild b/x11-libs/pango/pango-1.1.3.ebuild
deleted file mode 100644
index 617186324796..000000000000
--- a/x11-libs/pango/pango-1.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.1.3.ebuild,v 1.12 2003/02/13 17:01:08 vapier Exp $
-
-IUSE="doc"
-
-inherit eutils libtool
-
-SLOT="1"
-KEYWORDS="~x86 ~ppc"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Text rendering and Layout library"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.1/${P}.tar.bz2"
-HOMEPAGE="http://www.pango.org/"
-LICENSE="LGPL-2.1"
-
-RDEPEND="virtual/x11
-	virtual/xft
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2.0
-	>=media-libs/freetype-2.1.2-r2"
-	
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9
-		app-text/sgmltools-lite )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	#epatch ${FILESDIR}/pango-1.1.0-slighthint.patch
-}
-
-src_compile() {
-	elibtoolize
-	local myconf=""
-	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug"
-	fi
-	
-	econf ${myconf} --without-qt  || die
-	make || die "serial make failed" 
-}
-
-src_install() {
-	einstall
-	rm ${D}/etc/pango/pango.modules
-
-
- 	dodoc AUTHORS ChangeLog COPYING README INSTALL NEWS TODO*
-}
-
-pkg_postinst() {
-	pango-querymodules >/etc/pango/pango.modules
-}
-
diff --git a/x11-libs/pango/pango-1.2.0.ebuild b/x11-libs/pango/pango-1.2.0.ebuild
deleted file mode 100644
index 2f3d15e97dce..000000000000
--- a/x11-libs/pango/pango-1.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.0.ebuild,v 1.7 2003/02/13 17:01:14 vapier Exp $
-
-inherit eutils libtool
-
-IUSE="doc"
-SLOT="1"
-KEYWORDS="x86 ~ppc alpha"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Text rendering and Layout library"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
-HOMEPAGE="http://www.pango.org/"
-LICENSE="LGPL-2.1"
-
-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.9
-		app-text/sgmltools-lite )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Some enhancements from Redhat
-	epatch ${FILESDIR}/pango-1.0.99.020606-xfonts.patch
-	# patch adapted from RH initial patch by <foser@gentoo.org>
-	epatch ${FILESDIR}/${P}-slighthint-gentoo.patch
-}
-
-src_compile() {
-	elibtoolize
-	local myconf=""
-	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-	if [ -n "$DEBUGBUILD" ]; then
-		myconf="${myconf}  --enable-debug"
-	fi
-	
-	econf ${myconf} --without-qt  || die
-	make || die "serial make failed" 
-}
-
-src_install() {
-	einstall
-	rm ${D}/etc/pango/pango.modules
-
- 	dodoc AUTHORS ChangeLog COPYING README INSTALL NEWS TODO*
-}
-
-pkg_postinst() {
-	pango-querymodules >/etc/pango/pango.modules
-}
diff --git a/x11-libs/pango/pango-1.2.2.ebuild b/x11-libs/pango/pango-1.2.2.ebuild
new file mode 100644
index 000000000000..563902e51bd0
--- /dev/null
+++ b/x11-libs/pango/pango-1.2.2.ebuild
@@ -0,0 +1,46 @@
+# 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.1 2003/06/02 22:19:25 foser Exp $
+
+inherit gnome2 eutils
+
+IUSE="doc"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+
+DESCRIPTION="Text rendering and Layout library"
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
+HOMEPAGE="http://www.pango.org/"
+LICENSE="LGPL-2.1"
+
+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}/${P}-slighthint.patch
+}
+
+G2CONF="${G2CONF} --without-qt "
+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
+}