Version bump (bug #396705), also fixes bug #373689. Install icon and desktop file (bug #271953). Remove old.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

5 files changed, 61 insertions, 51 deletions

diff --git a/dev-vcs/qgit/ChangeLog b/dev-vcs/qgit/ChangeLog
index 3d19456ded1c..e2803680b8a6 100644
--- a/dev-vcs/qgit/ChangeLog
+++ b/dev-vcs/qgit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/qgit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qgit/ChangeLog,v 1.1 2011/02/10 21:35:11 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qgit/ChangeLog,v 1.2 2012/02/17 18:08:32 pesa Exp $
+
+*qgit-2.4 (17 Feb 2012)
+
+  17 Feb 2012; Davide Pesavento <pesa@gentoo.org> +qgit-2.4.ebuild,
+  -qgit-2.2.ebuild, metadata.xml:
+  Version bump (bug #396705), also fixes bug #373689. Install icon and desktop
+  file (bug #271953). Remove old.
 
   10 Feb 2011; Ulrich Mueller <ulm@gentoo.org> +qgit-2.2.ebuild,
   +qgit-2.3.ebuild, +qgit-2.3-r1.ebuild, +metadata.xml:
diff --git a/dev-vcs/qgit/Manifest b/dev-vcs/qgit/Manifest
index 11c73ec7c632..e4ed4ed335f8 100644
--- a/dev-vcs/qgit/Manifest
+++ b/dev-vcs/qgit/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST qgit-2.2.tar.bz2 159928 RMD160 5e6bc2ce05e944e539121df1628a7a0a8c90e5c4 SHA1 8397569830f657df364412516f495e4626e5d672 SHA256 82adcc59b2a9d3a3e54eef9e6a76ac6583e459b6f5c97050d26b0593d11c3d32
 DIST qgit-2.3.tar.bz2 206812 RMD160 c117cb7f9985045891f20981ce64f00c5741699e SHA1 6a75079e786a55d1d23a2752c0d93099af8aafd3 SHA256 a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64
-EBUILD qgit-2.2.ebuild 815 RMD160 199b59551abea006514f1f9c7a4fb3aa1a45f3a9 SHA1 9cbc36036ef74fd1f081e7de3ac7e00c38c634db SHA256 df03dc99cd9c60a3faa556a30498b56fc741235206b8d585b361c4e7b2ad4ac2
+DIST qgit-2.4.tar.gz 247352 RMD160 ab9a366c98daa321b0b0dfaed7dee812ab780e44 SHA1 f9aeb6a2e9083d3b15441a23776d9bfe9a9d7358 SHA256 be98282439cc85fd207a5f81162b88d46b78a19a7ce091ba8ed05bbe6bb9c848
 EBUILD qgit-2.3-r1.ebuild 675 RMD160 442bc2692efae33690a013d7c9cff098a0618f62 SHA1 471c2cae1fbf3f5817498252b0130598857d833c SHA256 bd96e717142af2a4121b19f04354071d07acd77c3a7fefb8ac4bece02acfb386
 EBUILD qgit-2.3.ebuild 710 RMD160 9b38b3cd0bc470fa5f6f14ef25aaf3067a4d0606 SHA1 f812fb7a0b3667515107db95affdf1343e751773 SHA256 062610502b556421e74c6b5e8aafe6baab2c0ef159f37673707c01877721de21
-MISC ChangeLog 7118 RMD160 957aaeb504ef5683fafdccd332feef68a5e4288b SHA1 a251392d5c00b2704e9bed7cc4f48cf2850db218 SHA256 d858971dc1b3c019d9ef6ec2cf3a514683a6dee8c69483af98ffcf59e85fba94
-MISC metadata.xml 238 RMD160 a25b04945f4f48b2dc87f18e9e6d598384dfb3bd SHA1 ca2f94f3cc5635cf382a5fdef527fec97dac7933 SHA256 fc95978ebf8987552a702693e9405eb828bd59c24c72aa030a2b66f1fa3fc08b
+EBUILD qgit-2.4.ebuild 734 RMD160 e7b7c3e963cab5b7c79413823693d61154b51119 SHA1 50ff52fc99db8d36ac38c8a6d4a3ead7ce46c29c SHA256 b45d6557b9b7cddc8e62db66d674084967fd43faea9ff2bded6057355228871a
+MISC ChangeLog 7360 RMD160 2c187dc92cb34bc6c8a434c5c8ac259a93b60cfe SHA1 141fdc23410bd72743462dd16ad29ef5d9c33ad3 SHA256 88998214f37e31bd4cf655212a0eafb969418c620ab17e542af049f0338f2f33
+MISC metadata.xml 338 RMD160 34aee088edc027025e35eab9ac608cf70a0e7a4d SHA1 6110f524aebe370823879935868c0a9bba4541fd SHA256 3da6940d3602207eae779990e99cfcb1c574981744dc3e9f7e2a71852b0aabdd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59nKMACgkQfXuS5UK5QB2ecQQAqQ878xaM5b+8qkUt+LPHfO8Y
-Ve8QwQsXRHPrF4KJw7Zu0JdxKuGuwA697O7YtZ9xDf9gyaq3CmYMe3cJe1iTu1NV
-iPiKxOGEzNY61NmCTiEMaOK0wRF56JUUVU4Mw3FwpU5bgpcmvEaxTZgAO1GNmqyr
-X1q1fNZUZmvb0+Ml3WY=
-=pcDZ
+iQIcBAEBCgAGBQJPPpemAAoJENXLsxwXqFxycRUP/iDMyYLjThaLtS2Vghmh1pg0
+at5LuqSC0bSPOOEKgkKBNQuVwgvmKGi9GxRHjQfLpATo+z+E9Xnq3rMt/N+E4BKF
+mBuvZomSUOz1KZD03YxsJL1m30edINtfM97fYN4SNTqFrx43RP3ae7eJhFBx+9R8
+JFtU8miF2Y87ZzbPjXPMKc0lycQKQO7e6jcaAT8QHMa56JPKjX3mgkIPLSUdDG3P
+ddSLpStXVLQ/u2HBc9PyhVKDkwQkNYtTFWUme+oQC40ayGZmKCu0ATxmIuTJL++m
+yescbAe1yPFm3277pMw+0jzjQnUWjs1DjBKMI/yAJsLs8qtg2pZQsC+QVJGiwgYT
+CtyV5GK2n0ySB32nJlDqfp9aBghpqwW0ZKkD8g9YpUzftY67yDCKDaNb20zjxtDT
+DUOnPjQ9T3dWqGQuIOFNcoRbOmZMHMtMMCtyrZ9z08WIefmCg+geG6JchpSHvzts
+kt48nj1oTFbTDfQHtt+jFipOF/4jKtRaFc1kG8fNA/TGo77+xOvYNNdQgjSc6tKT
+1a1uXwtJe3RW5sQxJUc0FWfHPmYmGY3SRgYJArcStnXbHhShJVmCHcsjZWDzXKUK
+OCQ5Y4cErP2i4AWi5h23G2AhLfzGRjF0qEVzBMTaj9yVggIxBzp8uu0GbDy+b4vu
+DJfBAi9Wv51cng1RSadf
+=+Uc6
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/qgit/metadata.xml b/dev-vcs/qgit/metadata.xml
index 289b41e5daab..e591418472cb 100644
--- a/dev-vcs/qgit/metadata.xml
+++ b/dev-vcs/qgit/metadata.xml
@@ -5,4 +5,8 @@
     <email>jokey@gentoo.org</email>
     <name>Markus Ullmann</name>
   </maintainer>
+  <maintainer>
+    <email>pesa@gentoo.org</email>
+    <name>Davide Pesavento</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-vcs/qgit/qgit-2.2.ebuild b/dev-vcs/qgit/qgit-2.2.ebuild
deleted file mode 100644
index 43d0cee08e71..000000000000
--- a/dev-vcs/qgit/qgit-2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qgit/qgit-2.2.ebuild,v 1.1 2011/02/10 21:35:11 ulm Exp $
-
-EAPI="1"
-
-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="x11-libs/qt-gui:4"
-RDEPEND="${DEPEND}
-	>=dev-vcs/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)"
-}
diff --git a/dev-vcs/qgit/qgit-2.4.ebuild b/dev-vcs/qgit/qgit-2.4.ebuild
new file mode 100644
index 000000000000..489792f28a65
--- /dev/null
+++ b/dev-vcs/qgit/qgit-2.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qgit/qgit-2.4.ebuild,v 1.1 2012/02/17 18:08:32 pesa Exp $
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Qt4 GUI for git repositories"
+HOMEPAGE="http://libre.tibirna.org/projects/qgit/wiki/QGit"
+SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}
+	>=dev-vcs/git-1.6
+"
+
+S=${WORKDIR}/redivivus
+
+src_install() {
+	newbin bin/qgit qgit4
+	newicon src/resources/qgit.png qgit4.png
+	make_desktop_entry qgit4 QGit qgit4
+	dodoc README
+}