Version bumped

7 files changed, 19 insertions, 46 deletions

diff --git a/net-www/ci/ChangeLog b/net-www/ci/ChangeLog
index 11bf6aa25c81..81910314ada7 100644
--- a/net-www/ci/ChangeLog
+++ b/net-www/ci/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/ci
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ci/ChangeLog,v 1.4 2004/01/11 17:36:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ci/ChangeLog,v 1.5 2004/01/31 16:59:49 usata Exp $
+
+*ci-1.1.4 (01 Feb 2004)
+
+  01 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ci-1.1.4.ebuild:
+  Version bumped
 
 *ci-1.1.3 (12 Jan 2004)
 
diff --git a/net-www/ci/Manifest b/net-www/ci/Manifest
index 3ecd524d605a..ccf58cd0d109 100644
--- a/net-www/ci/Manifest
+++ b/net-www/ci/Manifest
@@ -1,11 +1,8 @@
-MD5 a345d6b0605fba198e277ee499c5d836 ci-1.1.2-r1.ebuild 1946
 MD5 c8e7916571d4dcb297521c499b14ed7a ci-1.0.0.ebuild 1486
-MD5 7c6aac92fead45b4080fce209de0844b ci-1.1.4.ebuild 1838
-MD5 6244ffb9f94fbb82292a995e0ef9de69 ChangeLog 848
+MD5 4cd05ec6bfde09fb167d16526cb56743 ci-1.1.4.ebuild 1838
+MD5 b687a236e8798ab10468e4dfcec474c5 ChangeLog 957
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 7c6aac92fead45b4080fce209de0844b ci-1.1.3.ebuild 1838
+MD5 09567de04dd2d460db83653d71a10ca6 ci-1.1.3.ebuild 1837
 MD5 41e4c44dfe9080815ed2d43627ca75cc files/digest-ci-1.0.0 58
 MD5 f35681225376a9bd77dfa2e8fc4ff1fb files/digest-ci-1.1.4 61
-MD5 ab143961dc235dfa27891c0eb2b35283 files/digest-ci-1.1.2-r1 61
-MD5 a681a1cafe47da1d3802a5efcb1cb12b files/ci-1.1.2-gentoo.diff 639
 MD5 f59f82001cb773b6c849f014310afb0e files/digest-ci-1.1.3 61
diff --git a/net-www/ci/ci-1.1.3.ebuild b/net-www/ci/ci-1.1.3.ebuild
index 405f7ae855b2..abaeb746103c 100644
--- a/net-www/ci/ci-1.1.3.ebuild
+++ b/net-www/ci/ci-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ci/ci-1.1.3.ebuild,v 1.1 2004/01/11 17:36:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ci/ci-1.1.3.ebuild,v 1.2 2004/01/31 16:59:49 usata Exp $
 
 IUSE=""
 
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND=">=sys-apps/sed-4"
 RDEPEND="dev-lang/ruby
diff --git a/net-www/ci/ci-1.1.2-r1.ebuild b/net-www/ci/ci-1.1.4.ebuild
index 1195897961ea..5c4a9136d6ca 100644
--- a/net-www/ci/ci-1.1.2-r1.ebuild
+++ b/net-www/ci/ci-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/ci/ci-1.1.2-r1.ebuild,v 1.2 2004/01/11 17:36:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/ci/ci-1.1.4.ebuild,v 1.1 2004/01/31 16:59:49 usata Exp $
 
 IUSE=""
 
@@ -9,17 +9,19 @@ HOMEPAGE="http://wids.net/lab/Ci.html"
 if [ "${P/_/}" = "${P}" ] ; then
 	# normal release
 	#MY_P=${PN}.nr${PV%%.*}
-	MY_P=${PN}.delta${PV##*.}
+	MY_PV=delta${PV##*.}
+	MY_P=${PN}.${MY_PV}
 	SRC_URI="http://wids.net/archive/Ci/${MY_P}.tar.gz"
 else
 	# snapshot
-	MY_P=${PN}.snapshot-${PV#*_p}
+	MY_PV=${PV#*_p}
+	MY_P=${PN}.snapshot-${MY_PV}
 	SRC_URI="http://wids.net/archive/Ci/snapshot/${MY_P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND=">=sys-apps/sed-4"
 RDEPEND="dev-lang/ruby
@@ -27,18 +29,7 @@ RDEPEND="dev-lang/ruby
 	>=dev-ruby/ruby-gtk-0.28
 	media-fonts/monafont"
 
-if [ "${P/_/}" = "${P}" ] ; then
-	S=${WORKDIR}/Ci
-else
-	S=${WORKDIR}/Ci-${PV#*_p}
-fi
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
+S=${WORKDIR}/Ci-${MY_PV}
 
 src_compile() {
 
diff --git a/net-www/ci/files/ci-1.1.2-gentoo.diff b/net-www/ci/files/ci-1.1.2-gentoo.diff
deleted file mode 100644
index 74a18774f253..000000000000
--- a/net-www/ci/files/ci-1.1.2-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN Ci/httpext.rb Ci-20031219/httpext.rb
---- Ci/httpext.rb	2003-12-17 23:55:23.000000000 +0900
-+++ Ci-20031219/httpext.rb	2003-12-19 08:30:03.000000000 +0900
-@@ -1,6 +1,6 @@
- #
- #
--# $Id: ci-1.1.2-gentoo.diff,v 1.1 2003/12/19 08:29:01 usata Exp $
-+# $Id: ci-1.1.2-gentoo.diff,v 1.1 2003/12/19 08:29:01 usata Exp $
- #
- #
- $KCODE = 'e'
-@@ -113,7 +113,7 @@
- 			fh.write response.body
- 			fh.close
- 			if GZIP
--				x = system("#{GZIP} #{local}.gz 2>1")
-+				x = system("#{GZIP} #{local}.gz >/dev/null 2>&1")
- 				File.rename("#{local}.gz", local) unless x
- 			end
- 			CacheInfo.write(response.header['Last-Modified'], local + POST_LAST)
diff --git a/net-www/ci/files/digest-ci-1.1.2-r1 b/net-www/ci/files/digest-ci-1.1.2-r1
deleted file mode 100644
index 7c01fc123f88..000000000000
--- a/net-www/ci/files/digest-ci-1.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6c1506e287dd77fa137a601aacf4cc1 ci.delta2.tar.gz 125309
diff --git a/net-www/ci/files/digest-ci-1.1.4 b/net-www/ci/files/digest-ci-1.1.4
new file mode 100644
index 000000000000..a735bbea8c32
--- /dev/null
+++ b/net-www/ci/files/digest-ci-1.1.4
@@ -0,0 +1 @@
+MD5 3bbfd9e9dafed11936e86a1c706db010 ci.delta4.tar.gz 125818