Cleaned up the ebuilds a little (removed old versions), and i

added the new SLOT variables to them, so older versions will
auto-unmerge when a new version is merged

5 files changed, 6 insertions, 144 deletions

diff --git a/media-libs/freetype/freetype-1.3.1-r2.ebuild b/media-libs/freetype/freetype-1.3.1-r2.ebuild
deleted file mode 100644
index 92778ade09b1..000000000000
--- a/media-libs/freetype/freetype-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r2.ebuild,v 1.2 2001/02/22 14:41:18 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="TTF-Library"
-SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${A}"
-HOMEPAGE="http://www.freetype.org/"
-
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
-  local myconf
-
-  if [ -z "`use nls`" ]
-  then
-    myconf="${myconf} --disable-nls"
-  fi
-
-  try ./configure --host=${CHOST} --prefix=/usr ${myconf}
-
-  # Make a small fix to disable tests
-  # Now xfree is no longer required
-  cp Makefile Makefile.orig
-  sed -e "s:ttlib tttest ttpo:ttlib ttpo:" Makefile.orig > Makefile
-
-  try make
-
-}
-
-src_install() {
-
-  cd lib
-
-  # Seems to require a shared libintl (getetxt comes only with a static one
-  # But it seems to work without problems
-
-  try make -f arch/unix/Makefile prefix=${D}/usr install
-  cd ../po
-  try make prefix=${D}/usr install
-  cd ..
-  dodoc announce PATENTS README readme.1st
-  dodoc docs/*.txt docs/FAQ docs/TODO
-  docinto html
-  dodoc docs/*.htm
-  docinto html/image
-  dodoc docs/image/*.gif docs/image/*.png
-
-}
-
-
-
-
diff --git a/media-libs/freetype/freetype-1.3.1-r3.ebuild b/media-libs/freetype/freetype-1.3.1-r3.ebuild
index 638e1df07325..1958b71ec4a8 100644
--- a/media-libs/freetype/freetype-1.3.1-r3.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.1 2001/07/21 09:01:46 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.2 2002/02/06 22:23:05 verwilst Exp $
 
 # r3 change by me (danarmak): there's a contrib dir inside the freetype1
 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -23,6 +23,8 @@ SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${A1}
 	 ftp://ftp.freetype.org/pub/freetype1/${A2}"
 HOMEPAGE="http://www.freetype.org/"
 
+SLOT="0"
+
 DEPEND="virtual/glibc
         nls? ( sys-devel/gettext )"
 
diff --git a/media-libs/freetype/freetype-2.0.1-r1.ebuild b/media-libs/freetype/freetype-2.0.1-r1.ebuild
deleted file mode 100644
index 572003f62141..000000000000
--- a/media-libs/freetype/freetype-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# /home/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.1-r1.ebuild,v 1.2 2001/02/13 14:29:40 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.1-r1.ebuild,v 1.6 2001/08/31 03:23:39 pm Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="TTF-Library"
-SRC_URI="ftp://freetype.sourceforge.net/pub/freetype/freetype2/${P}.tar.bz2"
-HOMEPAGE="http://www.freetype.org/"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-
-  unpack ${P}.tar.bz2
-  cd ${S}
-  cp ${FILESDIR}/config.mk .
-
-}
-src_compile() {
-
-  cd builds/unix
-  try ./configure --prefix=/usr
-  cd ${S}
-  export CFG="--host=${CHOST} --prefix=/usr"
-  #try make
-  try make
-
-}
-
-src_install() {
-
-  try make prefix=${D}/usr install
-
-  dodoc CHANGES LICENSE.TXT
-  dodoc docs/*.txt
-
-  docinto html
-  dodoc docs/*.html
-
-  local i 
-  for i in design glyphs image tutorial
-  do
-    docinto html/${i}
-    dodoc docs/${i}/*
-  done
-
-}
-
-
-
-
-
diff --git a/media-libs/freetype/freetype-2.0.5-r1.ebuild b/media-libs/freetype/freetype-2.0.5-r1.ebuild
index 56bfd176128f..aabd4afe7772 100644
--- a/media-libs/freetype/freetype-2.0.5-r1.ebuild
+++ b/media-libs/freetype/freetype-2.0.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.5-r1.ebuild,v 1.1 2001/12/13 17:36:05 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.5-r1.ebuild,v 1.2 2002/02/06 22:23:05 verwilst Exp $
 
 
 S=${WORKDIR}/${P}
@@ -9,6 +9,8 @@ DESCRIPTION="TTF-Library"
 SRC_URI="http://download.sourceforge.net/freetype/${P}.tar.bz2"
 HOMEPAGE="http://www.freetype.org/"
 
+SLOT="1"
+
 DEPEND="virtual/glibc"
 
 src_unpack() {
diff --git a/media-libs/freetype/freetype-2.0.5.ebuild b/media-libs/freetype/freetype-2.0.5.ebuild
deleted file mode 100644
index 747f5fc49927..000000000000
--- a/media-libs/freetype/freetype-2.0.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.5.ebuild,v 1.2 2001/10/27 20:48:24 lordjoe Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="TTF-Library"
-SRC_URI="http://download.sourceforge.net/freetype/${P}.tar.bz2"
-HOMEPAGE="http://www.freetype.org/"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-  make CFG="--host=${CHOST} --prefix=/usr" || die
-  emake || die
-
-}
-
-src_install() {
-
-  make prefix=${D}/usr install || die
-
-  dodoc ChangeLog README 
-  dodoc docs/{BUILD,CHANGES,*.txt,PATENTS,readme.vms,todo}
-
-}