Revert mistakenly deleted 9999 ebuild, fix webconfig postinstall (bug 382979 by Alon Bar-Lev), drop old. Thank Nikoli for this job.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 24 insertions, 20 deletions

diff --git a/www-apps/cgit/ChangeLog b/www-apps/cgit/ChangeLog
index 187bdfff63e0..fb2149dea5ad 100644
--- a/www-apps/cgit/ChangeLog
+++ b/www-apps/cgit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/cgit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.9 2011/09/11 11:39:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/ChangeLog,v 1.10 2011/09/16 08:25:02 pva Exp $
+
+  16 Sep 2011; Peter Volkov <pva@gentoo.org> -cgit-0.9.ebuild,
+  cgit-0.9.0.2-r1.ebuild, +cgit-9999.ebuild:
+  Revert mistakenly deleted 9999 ebuild, fix webconfig postinstall (bug 382979
+  by Alon Bar-Lev), drop old. Thank Nikoli for this job.
 
 *cgit-0.9.0.2-r1 (11 Sep 2011)
 
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
index 3ab228413dde..b23f535b4e17 100644
--- a/www-apps/cgit/Manifest
+++ b/www-apps/cgit/Manifest
@@ -3,11 +3,10 @@ AUX cgitrc 2514 RMD160 614cb050acc97caaa1da7caa6a60e74b457bba37 SHA1 376d65e71ab
 AUX postinstall-en.txt 1844 RMD160 8b6048db73f2b806335ac76a672784a46ba19394 SHA1 f74f0ee924bf91bb9699e83fd947cdd26b0e4f5f SHA256 2bfadbe531386c9f2b9fd6b346c9542dd367f86f1ffc1be1a43d9aa182a0118b
 DIST cgit-0.8.3.5.tar.bz2 54844 RMD160 f47efaa9de8e6d6af85cdf29bfa95a7c17b2d4e5 SHA1 4e3d8a28688efe4372a7945db8ec96b383e8e88b SHA256 2ca856a3ceae1c58e1c066bd06f4112c604a9395ae46f69db524ada1b71d8298
 DIST cgit-0.9.0.2.tar.bz2 64203 RMD160 3eae71b4232308ca62767529c25e9710dd46c80b SHA1 0ae0dcb07001c0e231355f5bb9634e8ebcd6e889 SHA256 97e0f78f5d4aabe59e3795849c6e1a72900cd558a94d88cb236fee12d72b528c
-DIST cgit-0.9.tar.bz2 63580 RMD160 01e2bf7a5f4f385a0a6cda18292f3f9a55337622 SHA1 acdea79a880521fcfd0d359b41fdd59abf76170d SHA256 530eaf702b8ca0a44750f5ed1f27b1d74b317441cce9d2d4bb340c7dbea8a48f
 DIST git-1.7.3.tar.bz2 2629734 RMD160 4b0f95b4d114f5b7a4eb61c0f73b2f9a533637a0 SHA1 32e231fd10b85265487f0c2cc50d6d889b71de78 SHA256 0035a4a7906f65812072457b65c609f24c66f31593d0ad372b7c18894a26b07d
 DIST git-1.7.4.tar.bz2 2703735 RMD160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 SHA1 57b783627d9a9515ce3ef8f79128074de6197b2e SHA256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51
 EBUILD cgit-0.8.3.5.ebuild 1851 RMD160 08c348a38f50a15cd480556d8cfce4ce11ab45bc SHA1 7bb2865b2c92f6e0cb4543e6477c6245c950f3a0 SHA256 9d264701a4f2d94e44d45497ded6d9d49d12703d1c029fd332f929c9fb8d11ee
-EBUILD cgit-0.9.0.2-r1.ebuild 1869 RMD160 d4d92eda537ed076823f410524c605867afc687c SHA1 a1d1396f43803f8cd6dc19c638db1744fa7a8622 SHA256 1578240e483c7877933188ad40a40ed134691db6dcc9973d676335814a085b5c
-EBUILD cgit-0.9.ebuild 1830 RMD160 478a79bc043b4e766a3cf94538ad4dc065c09c97 SHA1 0aa15bda1672aaa95651caeebe11827ef87317de SHA256 844245a0a5d0c7a97cea53c095723aa01da90e59ab85b23c3f43184c5faed634
-MISC ChangeLog 2200 RMD160 ce0dedee2f2a383caa6507fbd5d00a1074f7fd61 SHA1 1a727bab99bb567389d4ca426d39be03d68849f1 SHA256 d2cc62272badcf33a59a290590aaabd500aad4947b34e37e62be2b415f8c27f8
+EBUILD cgit-0.9.0.2-r1.ebuild 1890 RMD160 a7e9f46651b7229e28aa2dba27b4bc4807a54208 SHA1 599bea95513182f54bf0633a029f0fe73866e9e8 SHA256 0ba7e798cd79ad11e141c2e77f6cfe747aa68ac8213277fe1523d67b441d1f7d
+EBUILD cgit-9999.ebuild 1834 RMD160 2813fa19500df18b2b44791413af50ce98fe2b79 SHA1 73e645e850d94d0632ecef3c2c373e2890a0401e SHA256 df4685af184d48124ca64b74abdee0dfd63ded61c49db15a0ac7260a73a898af
+MISC ChangeLog 2446 RMD160 0367a21fa01b766490bd3141214b8ac70fefaeb7 SHA1 d4cc55d2c6967717c7723562b465472d46a8de05 SHA256 d46904ade024cde259042287ed30f0b15cdb80983ceb57550bdccea03f920a0b
 MISC metadata.xml 708 RMD160 9d4dec58ea4db0d424fa1fcdc98879bfac455205 SHA1 2bec92f38a0ff9ef4288093974a04c0dd3a02ee4 SHA256 d19c132bfeebaa0b6eddfc589f49eed3f03fe326e10ebbde8571f4cb97bfadfa
diff --git a/www-apps/cgit/cgit-0.9.0.2-r1.ebuild b/www-apps/cgit/cgit-0.9.0.2-r1.ebuild
index 9ecf4627a779..71a51be9a6f4 100644
--- a/www-apps/cgit/cgit-0.9.0.2-r1.ebuild
+++ b/www-apps/cgit/cgit-0.9.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.0.2-r1.ebuild,v 1.1 2011/09/11 11:39:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.0.2-r1.ebuild,v 1.2 2011/09/16 08:25:02 pva Exp $
 
 EAPI="4"
 
@@ -82,6 +82,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	webapp_pkg_postinst
 	ewarn "If you intend to run cgit using web server's user"
 	ewarn "you should change ${CGIT_CACHEDIR} permissions."
 }
diff --git a/www-apps/cgit/cgit-0.9.ebuild b/www-apps/cgit/cgit-9999.ebuild
index 936db11fbc2b..2ff6dcc20118 100644
--- a/www-apps/cgit/cgit-0.9.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-0.9.ebuild,v 1.1 2011/04/29 19:02:19 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/cgit/cgit-9999.ebuild,v 1.4 2011/09/16 08:25:02 pva Exp $
 
-EAPI="2"
+EAPI="4"
 
 WEBAPP_MANUAL_SLOT="yes"
 
-inherit webapp eutils multilib
+inherit webapp eutils multilib git-2
 
 [[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
 
@@ -14,12 +14,12 @@ GIT_V="1.7.4"
 
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="http://hjemli.net/git/cgit/about/"
-SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2
-	http://hjemli.net/git/cgit/snapshot/${P}.tar.bz2"
+SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2"
+EGIT_REPO_URI="git://hjemli.net/pub/git/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="doc highlight"
 
 RDEPEND="
@@ -51,21 +51,19 @@ src_prepare() {
 }
 
 src_compile() {
-	emake || die
-	if use doc ; then
-		emake doc-man || die
-	fi
+	emake
+	use doc && emake doc-man
 }
 
 src_install() {
 	webapp_src_preinst
 
 	emake \
-		prefix=/usr \
-		libdir=/usr/$(get_libdir) \
+		prefix="${EPREFIX}"/usr \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
 		CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \
 		CGIT_DATA_PATH="${MY_HTDOCSDIR}" \
-		DESTDIR="${D}" install || die
+		DESTDIR="${D}" install
 
 	insinto /etc
 	doins "${FILESDIR}"/cgitrc
@@ -82,6 +80,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	webapp_pkg_postinst
 	ewarn "If you intend to run cgit using web server's user"
-	ewarn "you should change /var/cache/cgit/ permissions."
+	ewarn "you should change ${CGIT_CACHEDIR} permissions."
 }