fixing XFS-related CVS snapshot versioning policy violations, which caused

an old version to be considered newer than the new version. 20020330 -> 2.0.x_p20020330
fixed things.

7 files changed, 8 insertions, 89 deletions

diff --git a/sys-apps/xfsprogs/ChangeLog b/sys-apps/xfsprogs/ChangeLog
index 956e0e4d424e..d76f68adb259 100644
--- a/sys-apps/xfsprogs/ChangeLog
+++ b/sys-apps/xfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/xfsprogs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/ChangeLog,v 1.10 2002/12/16 21:05:06 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/ChangeLog,v 1.11 2002/12/22 05:29:35 drobbins Exp $
+
+  21 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: renamed xfsprogs version
+  20020330-r1 to 2.0.1_p20020330 to bring in line with CVS ebuild policy and
+  fix version comparison snafu.
 
 *xfsprogs-2.3.6-r1 (16 Dec 2002)
 
diff --git a/sys-apps/xfsprogs/files/digest-xfsprogs-20020330 b/sys-apps/xfsprogs/files/digest-xfsprogs-2.0.1_p20020330
index 2993709f2f6e..2993709f2f6e 100644
--- a/sys-apps/xfsprogs/files/digest-xfsprogs-20020330
+++ b/sys-apps/xfsprogs/files/digest-xfsprogs-2.0.1_p20020330
diff --git a/sys-apps/xfsprogs/files/digest-xfsprogs-20020124-r2 b/sys-apps/xfsprogs/files/digest-xfsprogs-20020124-r2
deleted file mode 100644
index d7cc34717c82..000000000000
--- a/sys-apps/xfsprogs/files/digest-xfsprogs-20020124-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3b538a21f9d98f0cf7ab1ddde9086623 xfs-cmd-20020124.tar.bz2 1562212
diff --git a/sys-apps/xfsprogs/files/digest-xfsprogs-20020330-r1 b/sys-apps/xfsprogs/files/digest-xfsprogs-20020330-r1
deleted file mode 100644
index 2993709f2f6e..000000000000
--- a/sys-apps/xfsprogs/files/digest-xfsprogs-20020330-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18bbd9b036cae38073bcaeef8b89ecf6 xfs-cmd-20020330.tar.bz2 1546532
diff --git a/sys-apps/xfsprogs/xfsprogs-20020330-r1.ebuild b/sys-apps/xfsprogs/xfsprogs-2.0.1_p20020330.ebuild
index f0e498fcabc8..040a5add2784 100644
--- a/sys-apps/xfsprogs/xfsprogs-20020330-r1.ebuild
+++ b/sys-apps/xfsprogs/xfsprogs-2.0.1_p20020330.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-20020330-r1.ebuild,v 1.5 2002/10/19 17:08:06 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-2.0.1_p20020330.ebuild,v 1.1 2002/12/22 05:29:35 drobbins Exp $
 
 S=${WORKDIR}/cmd/${PN}
+OPV=20020330
 DESCRIPTION="xfs filesystem utilities"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${PV}.tar.bz2"
+SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${OPV}.tar.bz2"
 HOMEPAGE="http://oss.sgi.com/projects/xfs"
 KEYWORDS="x86 ppc alpha"
 SLOT="0"
diff --git a/sys-apps/xfsprogs/xfsprogs-20020124-r2.ebuild b/sys-apps/xfsprogs/xfsprogs-20020124-r2.ebuild
deleted file mode 100644
index ce630630bf66..000000000000
--- a/sys-apps/xfsprogs/xfsprogs-20020124-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-20020124-r2.ebuild,v 1.4 2002/10/04 06:32:30 vapier Exp $
-
-S=${WORKDIR}/cmd/${PN}
-DESCRIPTION="xfs filesystem utilities"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${PV}.tar.bz2"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="LGPL-2.1"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc sys-devel/autoconf sys-devel/make sys-apps/e2fsprogs"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	cd ${S}
-	export OPTIMIZER="${CFLAGS}"
-	export DEBUG=-DNDEBUG
-	autoconf || die
-	./configure --prefix=/usr || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} DK_INC_DIR=${D}/usr/include/disk install install-dev || die
-	dodir /lib
-	cd ${D}/usr/lib
-	local x
-	for x in libhandle*
-	do
-	ln -s ../usr/lib/${x} ${D}/lib/${x}
-	done
-}
diff --git a/sys-apps/xfsprogs/xfsprogs-20020330.ebuild b/sys-apps/xfsprogs/xfsprogs-20020330.ebuild
deleted file mode 100644
index ab59f93203a2..000000000000
--- a/sys-apps/xfsprogs/xfsprogs-20020330.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xfsprogs/xfsprogs-20020330.ebuild,v 1.12 2002/10/04 06:32:35 vapier Exp $
-
-S=${WORKDIR}/cmd/${PN}
-DESCRIPTION="xfs filesystem utilities"
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/xfs-cmd-${PV}.tar.bz2"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-DEPEND="virtual/glibc sys-devel/autoconf sys-devel/make sys-apps/e2fsprogs"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-	cd ${S}
-	export OPTIMIZER="${CFLAGS}"
-	export DEBUG=-DNDEBUG
-	autoconf || die
-	./configure --prefix=/usr || die
-	# 1) add a ${DESTDIR} prefix to all install paths so we can relocate during the "install" phase
-	# 2) we also set the /usr/share/doc/ directory to the correct value.
-	# 3) we remove a hard-coded "-O1"
-	# 4) we fix some Makefile-created library symlinks that contains absolute paths
-	cp include/builddefs include/builddefs.orig
-	sed -e "s:/usr/share/doc/${PN}:/usr/share/doc/${PF}:" \
-	-e 's:-O1::' \
-	-e '/-S $(PKG/d' \
-	-e 's:^PKG_\(.*\)_DIR = \(.*\)$:PKG_\1_DIR = ${DESTDIR}\2:' \
-	include/builddefs.orig > include/builddefs || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} DK_INC_DIR=${D}/usr/include/disk install install-dev || die
-	cat ${S}/libhandle/.libs/libhandle.la | sed -e 's:installed=no:installed=yes:g' > ${D}/usr/lib/libhandle.la
-	dodir /usr/lib /lib
-	insinto /usr/lib
-	doins libhandle.a
-	exeinto /lib
-	doins libhandle.so.1.0.0
-	cd ${D}/lib
-	ln -sf ../usr/lib/libhandle.a libhandle.a
-	ln -sf libhandle.so.1.0.0 libhandle.so.1
-	ln -sf libhandle.so.1 libhandle.so
-	cd ${D}/usr/lib
-	ln -sf ../../lib/libhandle.so libhandle.so
-}