Version bump, bug #119377. Also fix bug #221421 wrt runtime-deps in 4.19. AND, remove old versions

(Portage version: 2.2_rc1/cvs/Linux 2.6.22-gentoo-r2 i686)

5 files changed, 34 insertions, 144 deletions

diff --git a/dev-util/aegis/ChangeLog b/dev-util/aegis/ChangeLog
index bf81e3e9c6a9..97cd6d85244b 100644
--- a/dev-util/aegis/ChangeLog
+++ b/dev-util/aegis/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/aegis
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/ChangeLog,v 1.23 2008/01/27 10:15:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/ChangeLog,v 1.24 2008/06/30 01:43:53 darkside Exp $
+
+*aegis-4.24 (30 Jun 2008)
+
+  30 Jun 2008; Jeremy Olexa <darkside@gentoo.org> -aegis-4.9.ebuild,
+  -aegis-4.11.ebuild, -aegis-4.16.ebuild, aegis-4.19.ebuild,
+  +aegis-4.24.ebuild:
+  Version bump, bug #119377. Also fix bug #221421 wrt runtime-deps in 4.19.
+  AND, remove old versions
 
   27 Jan 2008; Fabian Groffen <grobian@gentoo.org> aegis-4.9.ebuild,
   aegis-4.19.ebuild:
diff --git a/dev-util/aegis/aegis-4.16.ebuild b/dev-util/aegis/aegis-4.16.ebuild
deleted file mode 100644
index 8121be049989..000000000000
--- a/dev-util/aegis/aegis-4.16.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/aegis-4.16.ebuild,v 1.6 2007/04/09 15:37:42 cardoe Exp $
-
-IUSE="tk"
-
-DESCRIPTION="A transaction based revision control system"
-SRC_URI="mirror://sourceforge/aegis/${P}.tar.gz"
-HOMEPAGE="http://aegis.sourceforge.net"
-
-DEPEND="sys-libs/zlib
-	sys-devel/gettext
-	sys-apps/groff
-	sys-devel/bison
-	tk? ( >=dev-lang/tk-8.3 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-
-src_compile() {
-	# By default aegis configure puts shareable read/write files (locks etc)
-	# in ${prefix}/com/aegis but the FHS says /var/lib/aegis can be shared.
-
-	myconf="${myconf} --with-nlsdir=/usr/share/locale"
-
-	econf \
-		--sharedstatedir=/var/lib/aegis \
-		${myconf} || die "./configure failed"
-
-	# Second ebuild causes redefined/undefined function errors
-	make clean
-
-	# not emake safe, I think
-	make || die
-}
-
-src_install () {
-	make RPM_BUILD_ROOT=${D} install || die
-
-	# Alas gentoo appears to have no profile.d mechanism, so:
-	rm ${D}/etc/profile.d/aegis.sh
-	rm ${D}/etc/profile.d/aegis.csh
-	rmdir ${D}/etc/profile.d
-	rmdir ${D}/etc
-
-	# OK so ${D}/var/lib/aegis gets UID=3, but for some
-	# reason so do the files under /usr/share, even though
-	# they are read-only.
-	chown -R root:root ${D}/usr/share
-	dodoc lib/en/*
-
-	# Link to share dir so user has a chance of noticing it.
-	dosym /usr/share/aegis /usr/share/doc/${PF}/scripts
-
-	# Config file examples are documentation.
-	mv ${D}/usr/share/aegis/config.example ${D}/usr/share/doc/${PF}/
-
-	dodoc LICENSE BUILDING MANIFEST README
-}
diff --git a/dev-util/aegis/aegis-4.19.ebuild b/dev-util/aegis/aegis-4.19.ebuild
index 0c1793f56e9e..e36b89b9e117 100644
--- a/dev-util/aegis/aegis-4.19.ebuild
+++ b/dev-util/aegis/aegis-4.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/aegis-4.19.ebuild,v 1.7 2008/01/27 10:15:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/aegis-4.19.ebuild,v 1.8 2008/06/30 01:43:53 darkside Exp $
 
 IUSE="tk"
 
@@ -13,6 +13,7 @@ DEPEND="sys-libs/zlib
 	sys-apps/groff
 	sys-devel/bison
 	tk? ( >=dev-lang/tk-8.3 )"
+RDEPEND="" #221421
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -55,5 +56,5 @@ src_install () {
 	# Config file examples are documentation.
 	mv "${D}"/usr/share/aegis/config.example "${D}"/usr/share/doc/${PF}/
 
-	dodoc LICENSE BUILDING MANIFEST README
+	dodoc BUILDING MANIFEST README
 }
diff --git a/dev-util/aegis/aegis-4.11.ebuild b/dev-util/aegis/aegis-4.24.ebuild
index 95ba8fdf38d0..33b5f2b0a0dc 100644
--- a/dev-util/aegis/aegis-4.11.ebuild
+++ b/dev-util/aegis/aegis-4.24.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/aegis-4.11.ebuild,v 1.7 2007/04/09 15:37:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/aegis-4.24.ebuild,v 1.1 2008/06/30 01:43:53 darkside Exp $
+
+inherit autotools
 
 IUSE="tk"
 
@@ -12,11 +14,23 @@ DEPEND="sys-libs/zlib
 	sys-devel/gettext
 	sys-apps/groff
 	sys-devel/bison
+	dev-libs/libxml2
 	tk? ( >=dev-lang/tk-8.3 )"
+RDEPEND="" #221421
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#FIXME: ? Not sure what effect this has. Only way to get it to compile.
+	sed -i 's/$(SH) etc\/compat.2.3//' Makefile.in || \
+		die "sed Makefile.in failed"
+	eautomake || die "eautomake failed"
+}
 
 src_compile() {
 	# By default aegis configure puts shareable read/write files (locks etc)
@@ -29,32 +43,26 @@ src_compile() {
 		${myconf} || die "./configure failed"
 
 	# Second ebuild causes redefined/undefined function errors
-	make clean
+	#make clean
 
 	# not emake safe, I think
 	make || die
 }
 
 src_install () {
-	make RPM_BUILD_ROOT=${D} install || die
-
-	# Alas gentoo appears to have no profile.d mechanism, so:
-	rm ${D}/etc/profile.d/aegis.sh
-	rm ${D}/etc/profile.d/aegis.csh
-	rmdir ${D}/etc/profile.d
-	rmdir ${D}/etc
+	make RPM_BUILD_ROOT="${D}" install || die
 
 	# OK so ${D}/var/lib/aegis gets UID=3, but for some
 	# reason so do the files under /usr/share, even though
 	# they are read-only.
-	chown -R root:root ${D}/usr/share
+	chown -R root:root "${D}"/usr/share
 	dodoc lib/en/*
 
 	# Link to share dir so user has a chance of noticing it.
 	dosym /usr/share/aegis /usr/share/doc/${PF}/scripts
 
 	# Config file examples are documentation.
-	mv ${D}/usr/share/aegis/config.example ${D}/usr/share/doc/${PF}/
+	mv "${D}"/usr/share/aegis/config.example "${D}"/usr/share/doc/"${PF}"/
 
-	dodoc LICENSE BUILDING MANIFEST README
+	dodoc BUILDING README
 }
diff --git a/dev-util/aegis/aegis-4.9.ebuild b/dev-util/aegis/aegis-4.9.ebuild
deleted file mode 100644
index 8cf3ed03c23b..000000000000
--- a/dev-util/aegis/aegis-4.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/aegis/aegis-4.9.ebuild,v 1.13 2008/01/27 10:15:36 grobian Exp $
-
-IUSE="tk"
-
-DESCRIPTION="A transaction based revision control system"
-SRC_URI="http://aegis.sourceforge.net/${P}.tar.gz"
-HOMEPAGE="http://aegis.sourceforge.net"
-
-DEPEND="sys-libs/zlib
-	sys-devel/gettext
-	sys-apps/groff
-	sys-devel/bison
-	tk? ( >=dev-lang/tk-8.3 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	# By default aegis configure puts shareable read/write files (locks etc)
-	# in ${prefix}/com/aegis but the FHS says /var/lib/aegis can be shared.
-
-	econf \
-		--sharedstatedir=/var/lib/aegis \
-		--with-nlsdir=/usr/share/locale \
-		|| die "./configure failed"
-
-	# Second ebuild causes redefined/undefined function errors
-	make clean
-
-	# not emake safe, I think
-	make || die
-}
-
-src_install () {
-	make RPM_BUILD_ROOT="${D}" install || die
-
-	# Alas gentoo appears to have no profile.d mechanism, so:
-	rm "${D}"/etc/profile.d/aegis.sh
-	rm "${D}"/etc/profile.d/aegis.csh
-	rmdir "${D}"/etc/profile.d
-	rmdir "${D}"/etc
-
-	# OK so ${D}/var/lib/aegis gets UID=3, but for some
-	# reason so do the files under /usr/share, even though
-	# they are read-only.
-	chown -R root:0 "${D}"/usr/share
-
-	# Remove duplicate documention etc.
-	rm -r "${D}"/usr/share/aegis/en
-	rm -r "${D}"/usr/share/aegis/de
-	rm -r "${D}"/usr/share/aegis/man1
-
-	# Leaving out the .dvi versions and junk.
-	dodoc lib/en/*.txt
-	dodoc lib/en/*.ps
-
-	# Link to share dir so user has a chance of noticing it.
-	dosym /usr/share/aegis /usr/share/doc/${PF}/scripts
-
-	# Config file examples are documentation.
-	mv "${D}"/usr/share/aegis/config.example "${D}"/usr/share/doc/${PF}/
-
-	dodoc LICENSE BUILDING MANIFEST README
-}