Version bump to 2.1 and 1.5.8

Package-Manager: portage-2.1.4_rc12

7 files changed, 106 insertions, 13 deletions

diff --git a/dev-util/qgit/ChangeLog b/dev-util/qgit/ChangeLog
index 04ba02b9d677..c4ee1e580916 100644
--- a/dev-util/qgit/ChangeLog
+++ b/dev-util/qgit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/qgit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qgit/ChangeLog,v 1.36 2007/10/09 09:46:34 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qgit/ChangeLog,v 1.37 2007/12/31 16:48:32 jokey Exp $
+
+*qgit-2.1 (31 Dec 2007)
+*qgit-1.5.8 (31 Dec 2007)
+
+  31 Dec 2007; Markus Ullmann <jokey@gentoo.org> +qgit-1.5.8.ebuild,
+  +qgit-2.1.ebuild:
+  Version bump to 2.1 and 1.5.8
 
 *qgit-2.0-r1 (09 Oct 2007)
 
diff --git a/dev-util/qgit/Manifest b/dev-util/qgit/Manifest
index 0061b09de2d8..b38900684e88 100644
--- a/dev-util/qgit/Manifest
+++ b/dev-util/qgit/Manifest
@@ -2,19 +2,29 @@
 Hash: SHA1
 
 DIST qgit-1.5.7.tar.bz2 206601 RMD160 d9ca8c0ba0aad4f501a561f7f286f53955ceeaa7 SHA1 4ac4ea72b9377f8719c6195a3f07501ad3cfea3a SHA256 5bfc18ade9ebaee216fc59b88fc71dd12f2b973aed2a1ecdf547c8b8cbb91542
+DIST qgit-1.5.8.tar.bz2 209730 RMD160 6564ff1f47457dfb144de062f94037d049b79a77 SHA1 582daa28098801095dfb1bfe9e113f51590690ef SHA256 58df6bf1af447e225473eaf3e3447b97eef63e5bc2ee2b6964aa782b5968af62
 DIST qgit-2.0.tar.bz2 154520 RMD160 5ef74b3bce60466a2ddf62ce0fcd577bcf987500 SHA1 e4b62ece886a49587fe11bf6ea6fb3dcec39cd60 SHA256 aac40c338994a3e7c4004f4d08a1344864072bbaedc59959a05b142bcf3725c6
+DIST qgit-2.1.tar.bz2 177971 RMD160 992f8532dd0b483ef1e230341f76edb5ac5d8465 SHA1 1cc5cb0704be9a3faf9497e628ca50ef2d149b8d SHA256 5bbfac187c6abe7a4b9ed28f352bdadb856a32a363c219474c0540ca63384b3d
 EBUILD qgit-1.5.7.ebuild 628 RMD160 78b2204ec65f8cab1687277adcde8bd6b9deb2bb SHA1 863aa50022b892528d613d64a9b0a7f19c47ed96 SHA256 4ba0fd4b8aa92abaf6a70211e4605edd46c463872b99dee0677f842f03c88b95
 MD5 144467cfd8df79f744ca11cea414ccbc qgit-1.5.7.ebuild 628
 RMD160 78b2204ec65f8cab1687277adcde8bd6b9deb2bb qgit-1.5.7.ebuild 628
 SHA256 4ba0fd4b8aa92abaf6a70211e4605edd46c463872b99dee0677f842f03c88b95 qgit-1.5.7.ebuild 628
+EBUILD qgit-1.5.8.ebuild 631 RMD160 78cd5f63387f8110a91a924d8e08a4965ccf2941 SHA1 f65589ed242a7e0bcfc888c93ee58e2d06c62b18 SHA256 eeb842cb70b8adc10586d9fa897ffd3fa2ca46df9c18fbecfa2d2119bd6f4a84
+MD5 cc29c57a530e8a9f84fbcbb9f9dd4c82 qgit-1.5.8.ebuild 631
+RMD160 78cd5f63387f8110a91a924d8e08a4965ccf2941 qgit-1.5.8.ebuild 631
+SHA256 eeb842cb70b8adc10586d9fa897ffd3fa2ca46df9c18fbecfa2d2119bd6f4a84 qgit-1.5.8.ebuild 631
 EBUILD qgit-2.0-r1.ebuild 819 RMD160 a7ae94c0237aa8d020e496bd2443b87200b32165 SHA1 6bebe4038a4bd440d159cf8acafbcbabf62b8854 SHA256 85240650f9d11dc4c2ba0748c590eb59742db9ef240920adf74feb81e36bd2a1
 MD5 fbc4d1f8956d56458bf81a4b2d4b6035 qgit-2.0-r1.ebuild 819
 RMD160 a7ae94c0237aa8d020e496bd2443b87200b32165 qgit-2.0-r1.ebuild 819
 SHA256 85240650f9d11dc4c2ba0748c590eb59742db9ef240920adf74feb81e36bd2a1 qgit-2.0-r1.ebuild 819
-MISC ChangeLog 4904 RMD160 65fa2114d621bf1e19b4adf71e28a3ea89892884 SHA1 489f16339ce42cd7538e9c0088c78cfd08e1ba38 SHA256 d41804c759c17d41820f4ff8806c22eb37e67f3037251b3f083747f3065449a1
-MD5 7d3cdac63803a84e1d70cd1de4a5cd3f ChangeLog 4904
-RMD160 65fa2114d621bf1e19b4adf71e28a3ea89892884 ChangeLog 4904
-SHA256 d41804c759c17d41820f4ff8806c22eb37e67f3037251b3f083747f3065449a1 ChangeLog 4904
+EBUILD qgit-2.1.ebuild 816 RMD160 6daaf29ce8f253744dca1bde80910cc7c3feaaa2 SHA1 0fd13ad03120f1d3c58fe65286e542d7b7810d9a SHA256 65e97941711b1a5cbe6497bc1b736de0ba050e1a881ff781ff18c48cad72c881
+MD5 d2cec89081aa5630dfb666f7b5adaf58 qgit-2.1.ebuild 816
+RMD160 6daaf29ce8f253744dca1bde80910cc7c3feaaa2 qgit-2.1.ebuild 816
+SHA256 65e97941711b1a5cbe6497bc1b736de0ba050e1a881ff781ff18c48cad72c881 qgit-2.1.ebuild 816
+MISC ChangeLog 5077 RMD160 cd058b3e5656a4713d436f71e80ac083ebda735b SHA1 edd91239a439b626680c40bfb9d5139340352474 SHA256 2c515cad3256a9ef3753a8911b732877ebff474cb76fe0659352509440f01ae2
+MD5 9756680d01163f0656e132026fc8dfd5 ChangeLog 5077
+RMD160 cd058b3e5656a4713d436f71e80ac083ebda735b ChangeLog 5077
+SHA256 2c515cad3256a9ef3753a8911b732877ebff474cb76fe0659352509440f01ae2 ChangeLog 5077
 MISC metadata.xml 355 RMD160 40095a95a3da87fbeb90935a3cb87f127e69da73 SHA1 593165765748f984713db01571743c95aaa52748 SHA256 97365c6b6404edf5aff35ba59dcf22517d9f32704de74a23ed1974f46e61b88a
 MD5 341fb0a60f92bdfc876c8a0798b38979 metadata.xml 355
 RMD160 40095a95a3da87fbeb90935a3cb87f127e69da73 metadata.xml 355
@@ -22,13 +32,19 @@ SHA256 97365c6b6404edf5aff35ba59dcf22517d9f32704de74a23ed1974f46e61b88a metadata
 MD5 b8cdfddd693710d25d4248bb4c74b7db files/digest-qgit-1.5.7 235
 RMD160 c85ad52a105cefebfa55b93d5a9715b1c8d48c79 files/digest-qgit-1.5.7 235
 SHA256 5fb6bbfd470df85eb13ced20ac26418db6aac1629b2d1f8645fb77e261f604be files/digest-qgit-1.5.7 235
-MD5 e1693275f969b2e77d0422a8bad8a351 files/digest-qgit-2.0-r1 229
-RMD160 64731deb2c22d78f71e5393c68c1125409b2ab4a files/digest-qgit-2.0-r1 229
-SHA256 c07fa1c208933dc4a6b198f4177701debebd2b2e45fe7b670c9a3a022f284abd files/digest-qgit-2.0-r1 229
+MD5 bf9c8e41bef0f30850e8ce276ca7d1d6 files/digest-qgit-1.5.8 235
+RMD160 b947513473cc60faef37b4dd8dd406b2cb3e09c8 files/digest-qgit-1.5.8 235
+SHA256 cb7430e5517159d336706041cf978496ee2b274f9cf21399902be7ed2a25184d files/digest-qgit-1.5.8 235
+MD5 7c06bc399f23cca950aad80c65ea2e9a files/digest-qgit-2.0-r1 168
+RMD160 bc5bfcbb3bb2123bf68ebfd09faeecc9f762ee99 files/digest-qgit-2.0-r1 168
+SHA256 09acef75d0964e912fd9c4c67513ed1f62af7d51af519258312423acdaad4fe4 files/digest-qgit-2.0-r1 168
+MD5 cb034fa0b956038fba5a32a0c9304602 files/digest-qgit-2.1 229
+RMD160 0b64d62c1d94fb6f0fd770e3725267446b219852 files/digest-qgit-2.1 229
+SHA256 387934ea4dd9fbc5c73f21d401a30a4441b961c4d254f46e864fc79eda25818a files/digest-qgit-2.1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHC04Dz974XjDVpbkRAkl9AKDQikM3pwb7F1x4AThYeM0TfNNHWwCfYk/d
-+fAjaMUfLJ6rNFgRd6kk8nU=
-=vU6v
+iEYEARECAAYFAkd5HYMACgkQz974XjDVpbnXowCggbkGFewdVo/j75Cz5HMheZOQ
+r+4An3s5tufgTILX2yOJ/55Ixc7cK/T7
+=ON9Y
 -----END PGP SIGNATURE-----
diff --git a/dev-util/qgit/files/digest-qgit-1.5.8 b/dev-util/qgit/files/digest-qgit-1.5.8
new file mode 100644
index 000000000000..6ab53da33519
--- /dev/null
+++ b/dev-util/qgit/files/digest-qgit-1.5.8
@@ -0,0 +1,3 @@
+MD5 bdbf2b4ba99f6110daf3118859bce21b qgit-1.5.8.tar.bz2 209730
+RMD160 6564ff1f47457dfb144de062f94037d049b79a77 qgit-1.5.8.tar.bz2 209730
+SHA256 58df6bf1af447e225473eaf3e3447b97eef63e5bc2ee2b6964aa782b5968af62 qgit-1.5.8.tar.bz2 209730
diff --git a/dev-util/qgit/files/digest-qgit-2.0-r1 b/dev-util/qgit/files/digest-qgit-2.0-r1
index f953ba183477..74ab609bc051 100644
--- a/dev-util/qgit/files/digest-qgit-2.0-r1
+++ b/dev-util/qgit/files/digest-qgit-2.0-r1
@@ -1,3 +1,2 @@
-MD5 b5ae49a6d5855d5cfda4e58d44a9f647 qgit-2.0.tar.bz2 154520
 RMD160 5ef74b3bce60466a2ddf62ce0fcd577bcf987500 qgit-2.0.tar.bz2 154520
 SHA256 aac40c338994a3e7c4004f4d08a1344864072bbaedc59959a05b142bcf3725c6 qgit-2.0.tar.bz2 154520
diff --git a/dev-util/qgit/files/digest-qgit-2.1 b/dev-util/qgit/files/digest-qgit-2.1
new file mode 100644
index 000000000000..0342bf65a757
--- /dev/null
+++ b/dev-util/qgit/files/digest-qgit-2.1
@@ -0,0 +1,3 @@
+MD5 f22787c814fbe832d6da7c6a2436c3c0 qgit-2.1.tar.bz2 177971
+RMD160 992f8532dd0b483ef1e230341f76edb5ac5d8465 qgit-2.1.tar.bz2 177971
+SHA256 5bbfac187c6abe7a4b9ed28f352bdadb856a32a363c219474c0540ca63384b3d qgit-2.1.tar.bz2 177971
diff --git a/dev-util/qgit/qgit-1.5.8.ebuild b/dev-util/qgit/qgit-1.5.8.ebuild
new file mode 100644
index 000000000000..d0406b32ccda
--- /dev/null
+++ b/dev-util/qgit/qgit-1.5.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qgit/qgit-1.5.8.ebuild,v 1.1 2007/12/31 16:48:32 jokey Exp $
+
+inherit qt3
+
+MY_PV=${PV//_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="GUI interface for git/cogito SCM"
+HOMEPAGE="http://digilander.libero.it/mcostalba/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=x11-libs/qt-3*"
+RDEPEND="${DEPEND}
+	>=dev-util/git-1.5"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	dobin src/qgit
+	dodoc README ChangeLog
+}
diff --git a/dev-util/qgit/qgit-2.1.ebuild b/dev-util/qgit/qgit-2.1.ebuild
new file mode 100644
index 000000000000..3ee9aa398132
--- /dev/null
+++ b/dev-util/qgit/qgit-2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qgit/qgit-2.1.ebuild,v 1.1 2007/12/31 16:48:32 jokey Exp $
+
+inherit qt4
+
+MY_PV=${PV//_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="GUI interface for git/cogito SCM"
+HOMEPAGE="http://digilander.libero.it/mcostalba/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="$(qt4_min_version 4.3)"
+RDEPEND="${DEPEND}
+	>=dev-util/git-1.5.3"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	eqmake4 || die "eqmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	newbin bin/qgit qgit4
+	dodoc README
+}
+
+pkg_postinst() {
+	elog "This is installed as qgit4 now so you can still use 1.5 series (Qt3-based)"
+}