gettext added as required dep

9 files changed, 88 insertions, 205 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 12534f6d9d6c..42abc6ddbee4 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.5 2002/07/16 00:52:14 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.6 2002/07/24 01:41:48 seemant Exp $
+
+*rpm-4.0.4-r3 (23 Jul 2002)
+
+  23 Jul 2002; Seemant Kulleen <seemant@gentoo.org> rpm-4.0.4-r3.ebuild :
+
+  In keeping with RH tradition, this package requires bloat.  As such,
+  gettext is not optional, it is _required_.  Go figure.  Takes care of part
+  of bug #5425, as reported by: Balaji Rangaswamy <krab@rediffmail.com>
 
 *rpm-4.0.4-r2 (29 Jun 2002)
 
diff --git a/app-arch/rpm/files/digest-rpm-3.0.6-r1 b/app-arch/rpm/files/digest-rpm-3.0.6-r1
deleted file mode 100644
index be78512dfcbf..000000000000
--- a/app-arch/rpm/files/digest-rpm-3.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71961a796fbb04d2cf22a37337b63da8 rpm-3.0.6.tar.gz 1646191
diff --git a/app-arch/rpm/files/digest-rpm-4.0.4-r1 b/app-arch/rpm/files/digest-rpm-4.0.4-r1
deleted file mode 100644
index 5e661a951e56..000000000000
--- a/app-arch/rpm/files/digest-rpm-4.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0c3093d2f0d850760e59ac1db9bf152 rpm-4.0.4.tar.gz 5865692
diff --git a/app-arch/rpm/files/digest-rpm-4.0.4 b/app-arch/rpm/files/digest-rpm-4.0.4-r3
index 5e661a951e56..5e661a951e56 100644
--- a/app-arch/rpm/files/digest-rpm-4.0.4
+++ b/app-arch/rpm/files/digest-rpm-4.0.4-r3
diff --git a/app-arch/rpm/rpm-3.0.6-r1.ebuild b/app-arch/rpm/rpm-3.0.6-r1.ebuild
deleted file mode 100644
index 770b793026ec..000000000000
--- a/app-arch/rpm/rpm-3.0.6-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-3.0.6-r1.ebuild,v 1.8 2002/07/17 20:44:57 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Red Hat Package Management Utils"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${P}.tar.gz"
-SLOT="0"
-HOMEPAGE="http://www.rpm.org/"
-LICENSE="GPL|LGPL"
-
-RDEPEND="=sys-libs/db-1.85-r1
-	>=sys-libs/zlib-1.1.3
-	>=sys-apps/bzip2-1.0.1"
-
-DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
-
-src_unpack() {
-
-  unpack ${A}
-  cd ${S}
-  patch -p0 < ${FILESDIR}/${P}-popt-popt.c-gentoo.diff
-  # Suppress pointer warnings
-  cp configure configure.orig
-  sed -e "s:-Wpointer-arith::" configure.orig > configure
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man ${myconf}
-    try make
-}
-
-src_install() {
-
-    try make DESTDIR=${D} install
-    mv ${D}/bin/rpm ${D}/usr/bin
-    rm -rf ${D}/bin
-
-    dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
-}
-
-pkg_postinst() {
-
-  ${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
-
-}
-
-
-
diff --git a/app-arch/rpm/rpm-4.0.4-r1.ebuild b/app-arch/rpm/rpm-4.0.4-r1.ebuild
deleted file mode 100644
index 3e07b8250ff4..000000000000
--- a/app-arch/rpm/rpm-4.0.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r1.ebuild,v 1.5 2002/07/17 20:44:57 drobbins Exp $
-
-# note to self: check for java deps
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Red Hat Package Management Utils"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
-SLOT="0"
-HOMEPAGE="http://www.rpm.org/"
-LICENSE="GPL|LGPL"
-
-RDEPEND="=sys-libs/db-3.2.3h-r4
-	>=sys-libs/zlib-1.1.3
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/popt-1.6"
-
-DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
-KEYWORDS="x86 ppc"
-
-src_unpack() {
-
-  unpack ${A}
-  cd ${S}
-  patch -p1 < ${FILESDIR}/${P}-system-popt.diff
-  rm -rf ${S}/popt
-  # Suppress pointer warnings
-  cp configure configure.orig
-  sed -e "s:-Wpointer-arith::" configure.orig > configure
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man ${myconf}
-    try make
-}
-
-src_install() {
-
-    try make DESTDIR=${D} install
-    mv ${D}/bin/rpm ${D}/usr/bin
-    rm -rf ${D}/bin
-
-    dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
-}
-
-pkg_postinst() {
-
-  ${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
-
-}
-
-
-
diff --git a/app-arch/rpm/rpm-4.0.4-r2.ebuild b/app-arch/rpm/rpm-4.0.4-r2.ebuild
index 4b4db12a2fb3..1639af2646a6 100644
--- a/app-arch/rpm/rpm-4.0.4-r2.ebuild
+++ b/app-arch/rpm/rpm-4.0.4-r2.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r2.ebuild,v 1.7 2002/07/17 20:44:57 drobbins Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r2.ebuild,v 1.8 2002/07/24 01:41:48 seemant Exp $
 
 # note to self: check for java deps
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Red Hat Package Management Utils"
 SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
-SLOT="0"
 HOMEPAGE="http://www.rpm.org/"
-LICENSE="GPL|LGPL"
+
+SLOT="0"
+LICENSE="GPL-2 | LGPL-2"
+KEYWORDS="x86 ppc"
 
 RDEPEND="=sys-libs/db-3.2*
 	>=sys-libs/zlib-1.1.3
@@ -17,45 +19,38 @@ RDEPEND="=sys-libs/db-3.2*
 	>=dev-libs/popt-1.6.3"
 
 DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
-KEYWORDS="x86 ppc"
 
 src_unpack() {
 
-  unpack ${A}
-  cd ${S}
-  patch -p1 < ${FILESDIR}/${P}-system-popt.diff
-  rm -rf ${S}/popt
-  # Suppress pointer warnings
-  cp configure configure.orig
-  sed -e "s:-Wpointer-arith::" configure.orig > configure
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-system-popt.diff || die
+	rm -rf ${S}/popt
+	# Suppress pointer warnings
+	cp configure configure.orig
+	sed -e "s:-Wpointer-arith::" configure.orig > configure
 
 }
 
 src_compile() {
 
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man ${myconf}
-    try make
+	local myconf
+	use nls || myconf="--disable-nls"
+	econf ${myconf} || die
+	make || die
 }
 
 src_install() {
 
-    try make DESTDIR=${D} install
-    mv ${D}/bin/rpm ${D}/usr/bin
-    rm -rf ${D}/bin
+	make DESTDIR=${D} install || die
+	mv ${D}/bin/rpm ${D}/usr/bin
+	rm -rf ${D}/bin
 
-    dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+	dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
 }
 
 pkg_postinst() {
 
-  ${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+	${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
 
 }
-
-
-
diff --git a/app-arch/rpm/rpm-4.0.4-r3.ebuild b/app-arch/rpm/rpm-4.0.4-r3.ebuild
new file mode 100644
index 000000000000..f95bbadd382b
--- /dev/null
+++ b/app-arch/rpm/rpm-4.0.4-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r3.ebuild,v 1.1 2002/07/24 01:41:48 seemant Exp $
+
+# note to self: check for java deps
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Red Hat Package Management Utils"
+SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
+HOMEPAGE="http://www.rpm.org/"
+
+SLOT="0"
+LICENSE="GPL-2 | LGPL-2"
+KEYWORDS="x86 ppc"
+
+RDEPEND="=sys-libs/db-3.2*
+	>=sys-libs/zlib-1.1.3
+	>=sys-apps/bzip2-1.0.1
+	>=dev-libs/popt-1.6.3"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-system-popt.diff || die
+	rm -rf ${S}/popt
+	# Suppress pointer warnings
+	cp configure configure.orig
+	sed -e "s:-Wpointer-arith::" configure.orig > configure
+}
+
+src_compile() {
+
+	local myconf
+	use nls || myconf="--disable-nls"
+
+	econf ${myconf} || die
+	make || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+	mv ${D}/bin/rpm ${D}/usr/bin
+	rm -rf ${D}/bin
+
+	dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
+}
+
+pkg_postinst() {
+
+	${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+}
diff --git a/app-arch/rpm/rpm-4.0.4.ebuild b/app-arch/rpm/rpm-4.0.4.ebuild
deleted file mode 100644
index 43aa088028d3..000000000000
--- a/app-arch/rpm/rpm-4.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4.ebuild,v 1.6 2002/07/17 20:44:57 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Red Hat Package Management Utils"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/${P}.tar.gz"
-SLOT="0"
-HOMEPAGE="http://www.rpm.org/"
-LICENSE="GPL|LGPL"
-
-RDEPEND="=sys-libs/db-3.2.3h-r4
-	>=sys-libs/zlib-1.1.3
-	>=sys-apps/bzip2-1.0.1"
-
-DEPEND="$RDEPEND nls? ( sys-devel/gettext )"
-KEYWORDS="x86 ppc"
-
-src_unpack() {
-
-  unpack ${A}
-  cd ${S}
-  patch -p0 < ${FILESDIR}/${P}-popt-popt.c-gentoo.diff
-  # Suppress pointer warnings
-  cp configure configure.orig
-  sed -e "s:-Wpointer-arith::" configure.orig > configure
-
-}
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ]
-    then
-      myconf="--disable-nls"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man ${myconf}
-    try make
-}
-
-src_install() {
-
-    try make DESTDIR=${D} install
-    mv ${D}/bin/rpm ${D}/usr/bin
-    rm -rf ${D}/bin
-
-    dodoc CHANGES COPYING CREDITS GROUPS README* RPM* TODO
-}
-
-pkg_postinst() {
-
-  ${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
-
-}
-
-
-