gentoo resync : 29.10.2017

3 files changed, 3 insertions, 74 deletions

diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index eeab78b266f3..69dd4782247a 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,10 +1,8 @@
 AUX gitea.confd 74 SHA256 edf43ca063fccf9951cd1e3975fdfa7ba0e26b47d7442596ce27bc5f2fd21e4c SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25 WHIRLPOOL 7cfce49d1b3053dc07318c2f2626bf2d6029f9dead23c800a775277928c486225297668a34e6e7d322e506b3c3b68652a3aa31514e30e49ef9a1dc72ea3fb738
 AUX gitea.initd 681 SHA256 d54242e9f1f8854f97cc0acf47242a2ace8ee388c9af7d152ef831ca57bbf3c0 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986 WHIRLPOOL afc8b379026eb28360ef92671ffff1930dec68817653766ce7d3c108912aee33e6e2b3b3b33bedc39edcd5c0a9ac57012130f423be1bf7589465544d471b9050
 AUX gitea.logrotated 87 SHA256 19538aff00c6ad5377df593391f33f59b28333ebe7a95eb9848ce663a6f7c9ba SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4 WHIRLPOOL 7d8d3dea943948757803a4091a6950a2f9b2859570ee5783bf524c248557e72625042ecdaa9d694177c9a6e3e942dacf5a06e1298994ba009269d3417c299026
-DIST gitea-1.0.2.tar.gz 13448604 SHA256 f75e220f8c44a9b7c67d2d5339479e690df9f03ec3337eede3aab0c7e8e55c87 SHA512 1826e60961adc585fd54a2c913e6cfaa9754052a932981f83eb6a1f2521d09eb7165545f80494439763c8f13bb1f4ffc24b791162cae7b739fd9eb96f7db530c WHIRLPOOL 3afcfbf4d15b94b4b8e5fde511626ce6acfbf201a58b54f3cd077b6c6487f62b3a0b3e4ef7c3c4526a432e0aa4833e038ca7d69e2e09cf9fe329ea65607f42ab
-DIST gitea-1.1.3.tar.gz 13018735 SHA256 c36b96707585d5395b10145d81e732c29e1d1476e7bff55ee6e131a3e516f1de SHA512 c674699bc51ad367d4e47aa1b65e2025d57747cd516df6a7d7e715bf7467a3504dcf461823db15365a61ac91a35b68bce2486b645d09708a6e952fff379c12e4 WHIRLPOOL 1134cf37e09a9e20a927ef9119eb92c2e716af092717ffcce1003d62c08f95452e054820e8392b6797d89c045d8ae317b3d0f50385367e2eb4c636e404e16073
 DIST gitea-1.1.4.tar.gz 13018104 SHA256 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7 SHA512 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524 WHIRLPOOL 14ad4d092348f8058ccb2438a9bca4dd3223305a9e8575aac808ef5bf15d1b27fc8c54b6a0b890244fe28761c31a633c7050d77b63410086fb1e03cba3e3d569
-EBUILD gitea-1.0.2.ebuild 2450 SHA256 c762c14a7819401d1232d6f7c7109d8918f9ce0f23f11d0303ca13b183b94b1b SHA512 e2980081bb3b30cc046853ba6ea9a7fe8c0f9ed72329b79f06db4e86e3c6608e7b7b669a1e2337c19fa21dda7262f3de7072afedc4e9a5d3144e5976c7f100c3 WHIRLPOOL c2a8dd8c086ee9b1ed15a25bb0d0082295b889e6e5a36580f0dbda01100a368e6fb0ff720fbb3b763696fac206f56e914e2077026f0b10674a5353e8a3470bc5
-EBUILD gitea-1.1.3.ebuild 2450 SHA256 1a549f918363bbae88e0ddd8156593087a28e0e332f8027910d3064ca9b53c31 SHA512 47845442511a19ef76572a01199d32b1fad93540addad3578152e457a78eeac7ec941ea1bd19c134b6514c729230492d8f68f2b3693fea9ecaa21d881176530b WHIRLPOOL afc3eace56cdf14f695db3ba012d0311b829a28d2d40cee1e7297f2c16dd349337e194b7c94a2631e7d6de51fbda714236688329466cefbd336589d4760ad526
+DIST gitea-1.2.1.tar.gz 14326562 SHA256 a18e0390d2c2ca956e94e98294707c9ac1d926763d00e2da682a3e72db393612 SHA512 a8c446361d69fb71d4ee2b6476dd49b84cd88d0eb53b3f6b86a7dbd8c7189a81f65d6178aed96fb6a15dfba5940ec2026c8ff104a249405e3e14a76cd9bb8103 WHIRLPOOL 3a2e7f32fdbd3d4a03c45d08de64b37269f7bde92c42d9825fe56788003a49b4c9fcc56b62116207fd6e0b44db358b065eac9787db3a7ed4f5dd191bafa7bcd3
 EBUILD gitea-1.1.4.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
+EBUILD gitea-1.2.1.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
 MISC metadata.xml 324 SHA256 cf95cc2d754abaf77062d71409b6cb4bc9cd630637518db74d8f8af0bfa1effd SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee WHIRLPOOL 4694b3b159f487e2fbeccadd34cb56080888a5422fd8bd0c39db9e18b82bbd0ea1772ba6c2a068968f80c02babd74780e158b790b9b2d260d0ff466a2808e3db
diff --git a/www-apps/gitea/gitea-1.0.2.ebuild b/www-apps/gitea/gitea-1.0.2.ebuild
deleted file mode 100644
index 48f821befd27..000000000000
--- a/www-apps/gitea/gitea-1.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="code.gitea.io/gitea/..."
-EGIT_COMMIT="e2c8d6fcb2c4073ed5cf164d88e7b5d44d95943c"
-ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="A painless self-hosted Git service, written in Go"
-HOMEPAGE="https://github.com/go-gitea/gitea"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata"
-RDEPEND="dev-vcs/git"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitea git
-}
-
-src_prepare() {
-	default
-	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
-	sed -i -e "s/git rev-parse --short HEAD/echo ${EGIT_COMMIT:0:7}/"\
-		-e "s/^LDFLAGS += -X \"main.Version.*$/LDFLAGS += -X \"main.Version=${PV}\"/"\
-		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN%/*}/Makefile || die
-	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
-		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
-		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
-		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
-		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
-		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
-		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" src/${EGO_PN%/*}/conf/app.ini || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} generate
-	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} build
-}
-
-src_install() {
-	pushd src/${EGO_PN%/*} || die
-	dobin gitea
-	insinto /var/lib/gitea/conf
-	newins conf/app.ini app.ini.example
-	popd || die
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/gitea.logrotated gitea
-	newinitd "${FILESDIR}"/gitea.initd gitea
-	newconfd "${FILESDIR}"/gitea.confd gitea
-	keepdir /var/log/gitea /var/lib/gitea/data
-	fowners -R git:git /var/log/gitea /var/lib/gitea/
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
-		elog "No app.ini found, copying the example over"
-		cp "${EROOT}"/var/lib/gitea/conf/app.ini{.example,} || die
-	else
-		elog "app.ini found, please check example file for possible changes"
-	fi
-}
diff --git a/www-apps/gitea/gitea-1.1.3.ebuild b/www-apps/gitea/gitea-1.2.1.ebuild
index 45ea9f668ac8..56e96b9e348b 100644
--- a/www-apps/gitea/gitea-1.1.3.ebuild
+++ b/www-apps/gitea/gitea-1.2.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="06a554c"
+GIT_COMMIT="34182c8"
 ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~arm"