Ebuild cleanups, bumped stable on x86 and removed old versions.

8 files changed, 14 insertions, 104 deletions

diff --git a/x11-misc/ami/ChangeLog b/x11-misc/ami/ChangeLog
index 6dca3ee005f1..8661339fe3d4 100644
--- a/x11-misc/ami/ChangeLog
+++ b/x11-misc/ami/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/ami
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ami/ChangeLog,v 1.9 2003/12/06 16:31:29 tseng Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ami/ChangeLog,v 1.10 2004/01/24 11:44:41 pyrania Exp $
+
+  24 Jan 2004; Markus Nigbur <pyrania@gentoo.org> ami-1.0.11-r1.ebuild,
+  ami-1.0.11-r2.ebuild, ami-1.1.0.ebuild, ami-1.2.2.ebuild, metadata.xml:
+  Ebuild cleanups, bumped stable on x86 and removed old versions.
 
   06 Dec 2003; Brandon Hale <tseng@gentoo.org> ami-1.2.2.ebuild:
   Fixing bad DEPEND line, closes 34582.
diff --git a/x11-misc/ami/ami-1.0.11-r1.ebuild b/x11-misc/ami/ami-1.0.11-r1.ebuild
deleted file mode 100644
index 65531ece442f..000000000000
--- a/x11-misc/ami/ami-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,43 +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-misc/ami/ami-1.0.11-r1.ebuild,v 1.3 2003/09/05 23:18:18 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Korean IMS Ami"
-SRC_URI="http://www.kr.freebsd.org/~hwang/ami/${P}.tar.gz
-	http://www.kr.freebsd.org/~hwang/ami/hanja.dic.gz
-	ftp://ftp.nnongae.com/pub/gentoo/${P}.patch"
-HOMEPAGE="http://www.kr.freebsd.org/~hwang/ami/index.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND=">=media-libs/gdk-pixbuf-0.7.0"
-
-src_unpack() {
-	unpack ${A}
-	patch -p0 < ${DISTDIR}/${P}.patch || die
-}
-
-src_compile() {
-	local config
-
-	use gnome && config="--enable-gnome-applet"
-
-	econf --with-hangul-keyboard=2
-
-	emake || die
-
-	cd ${S}/hanjadic
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	gzip -d -c ${DISTDIR}/hanja.dic.gz > ${D}/usr/share/ami/hanja.dic
-
-	dobin ${S}/hanjadic/hanja-hwp2ami
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README README.en NEWS THANKS
-}
diff --git a/x11-misc/ami/ami-1.0.11-r2.ebuild b/x11-misc/ami/ami-1.0.11-r2.ebuild
deleted file mode 100644
index 7c7b12ebccc6..000000000000
--- a/x11-misc/ami/ami-1.0.11-r2.ebuild
+++ /dev/null
@@ -1,44 +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-misc/ami/ami-1.0.11-r2.ebuild,v 1.3 2003/02/13 17:05:40 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Korean IMS Ami"
-SRC_URI="http://www.kr.freebsd.org/~hwang/ami/${P}.tar.gz
-	http://www.kr.freebsd.org/~hwang/ami/hanja.dic.gz
-	ftp://ftp.nnongae.com/pub/gentoo/${P}.patch"
-HOMEPAGE="http://www.kr.freebsd.org/~hwang/ami/index.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND=">=media-libs/gdk-pixbuf-0.7.0"
-
-src_unpack() {
-	unpack ${A}
-	patch -p0 < ${DISTDIR}/${P}.patch || die
-}
-
-src_compile() {
-	local config
-
-	# remove gnome-applet for GNOME2
-	#use gnome && config="--enable-gnome-applet"
-
-	econf --with-hangul-keyboard=2
-
-	emake || die
-
-	cd ${S}/hanjadic
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	gzip -d -c ${DISTDIR}/hanja.dic.gz > ${D}/usr/share/ami/hanja.dic
-
-	dobin ${S}/hanjadic/hanja-hwp2ami
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README README.en NEWS THANKS
-}
diff --git a/x11-misc/ami/ami-1.1.0.ebuild b/x11-misc/ami/ami-1.1.0.ebuild
index afe19b283202..17c4f0c22926 100644
--- a/x11-misc/ami/ami-1.1.0.ebuild
+++ b/x11-misc/ami/ami-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ami/ami-1.1.0.ebuild,v 1.3 2003/02/13 17:05:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ami/ami-1.1.0.ebuild,v 1.4 2004/01/24 11:44:41 pyrania Exp $
 
 IUSE="gtk2"
 S=${WORKDIR}/${P}
@@ -12,7 +12,7 @@ HOMEPAGE="http://ami.kldp.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND=">=media-libs/gdk-pixbuf-0.7.0"
 
diff --git a/x11-misc/ami/ami-1.2.2.ebuild b/x11-misc/ami/ami-1.2.2.ebuild
index dbd684aec41c..eb07698e2edf 100644
--- a/x11-misc/ami/ami-1.2.2.ebuild
+++ b/x11-misc/ami/ami-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ami/ami-1.2.2.ebuild,v 1.2 2003/12/06 16:31:29 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ami/ami-1.2.2.ebuild,v 1.3 2004/01/24 11:44:41 pyrania Exp $
 
 IUSE="gtk2"
 S=${WORKDIR}/${P}
@@ -12,14 +12,15 @@ HOMEPAGE="http://ami.kldp.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND="!gtk2 ( >=media-libs/gdk-pixbuf-0.7.0 )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
 	if [ -n "`use gtk2`" ]
-	then patch -p0 < ${DISTDIR}/${P}-imhangul_status.patch
+	then
+		epatch ${DISTDIR}/${P}-imhangul_status.patch
 	fi
 }
 
diff --git a/x11-misc/ami/files/digest-ami-1.0.11-r1 b/x11-misc/ami/files/digest-ami-1.0.11-r1
deleted file mode 100644
index 4807d073644f..000000000000
--- a/x11-misc/ami/files/digest-ami-1.0.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bc2c27d41186f7c180bc2b720fbd7256 ami-1.0.11.tar.gz 296596
-MD5 f6a14d1988c9d59f844ebe4052f079d6 hanja.dic.gz 10809
-MD5 0747ed100e4df94541086e1e4875896d ami-1.0.11.patch 571
diff --git a/x11-misc/ami/files/digest-ami-1.0.11-r2 b/x11-misc/ami/files/digest-ami-1.0.11-r2
deleted file mode 100644
index 4807d073644f..000000000000
--- a/x11-misc/ami/files/digest-ami-1.0.11-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bc2c27d41186f7c180bc2b720fbd7256 ami-1.0.11.tar.gz 296596
-MD5 f6a14d1988c9d59f844ebe4052f079d6 hanja.dic.gz 10809
-MD5 0747ed100e4df94541086e1e4875896d ami-1.0.11.patch 571
diff --git a/x11-misc/ami/metadata.xml b/x11-misc/ami/metadata.xml
index 2e745d20d6d7..40838bc36783 100644
--- a/x11-misc/ami/metadata.xml
+++ b/x11-misc/ami/metadata.xml
@@ -1,5 +1,3 @@
- * Generated metadata.xml:
-
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>