From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-688506-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 868E3138A1F
for <garchives@archives.gentoo.org>; Sun, 20 Apr 2014 20:39:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E62F0E08D9;
Sun, 20 Apr 2014 20:39:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7D16DE08D9
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Apr 2014 20:39:37 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9CD5F33FE67
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Apr 2014 20:39:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id A7E1A18181
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Apr 2014 20:39:34 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1398026346.6c86ae4c69a6b1baed8be02a6d1dc72d08d88e38.polynomial-c@gentoo>
Subject: [gentoo-commits] proj/apache:master commit in: /
X-VCS-Repository: proj/apache
X-VCS-Files: rolltarball.sh
X-VCS-Directories: /
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 6c86ae4c69a6b1baed8be02a6d1dc72d08d88e38
X-VCS-Branch: master
Date: Sun, 20 Apr 2014 20:39:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c7625204-331c-43dd-b43a-3b0d8633d710
X-Archives-Hash: 3b486ecc259bf491601730498c941849
commit: 6c86ae4c69a6b1baed8be02a6d1dc72d08d88e38
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 20:39:06 2014 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 20:39:06 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=6c86ae4c
Change GENTOO_PATCHNAME in ebuild as well
---
rolltarball.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/rolltarball.sh b/rolltarball.sh
index d296b5b..1962c00 100755
--- a/rolltarball.sh
+++ b/rolltarball.sh
@@ -16,7 +16,8 @@
#
# Changes:
# 05-Jun-2005 Complete rewrite to clean up code
-# 20-Apr-2014 Use git instead of svn
+# 20-Apr-2014 Use git instead of svn. Change patchname in ebuild as
+# well
#
# Please increase version number before each commit which includes changes to
@@ -373,6 +374,7 @@ edebug "Detecting settings for tarball based on ebuild name"
EBUILD_BASE=$(basename ${EBUILD})
EBUILD_NAME=${EBUILD_BASE/-[0-9]*/}
+TB_NAME="gentoo-${EBUILD_NAME}"
TB_VER=${EBUILD_BASE/${EBUILD_NAME}-/}
TB_VER=${TB_VER/.ebuild/}
DATESTAMP=${DATESTAMP:-$(date +%Y%m%d)}
@@ -380,8 +382,8 @@ DATESTAMP=${DATESTAMP:-$(date +%Y%m%d)}
case ${EBUILD_NAME} in
apache)
TREE=${TB_VER%.*}
- TB=gentoo-apache-${TB_VER}-${DATESTAMP}.tar.bz2
- TB_DIR=gentoo-apache-${TB_VER}
+ TB=${TB_NAME}-${TB_VER}-${DATESTAMP}.tar.bz2
+ TB_DIR=${TB_NAME}-${TB_VER}
;;
gentoo-webroot-default)
TREE=gentoo-webroot-default
@@ -496,11 +498,12 @@ build_tarball() {
then
if [ -r ${EBUILD} ]
then
- pretend && einfo " Update GENTOO_PATCHSTAMP and GENTOO_DEVELOPER"
+ pretend && einfo " Update GENTOO_PATCHSTAMP, GENTOO_DEVELOPER and GENTOO_PATCHNAME"
pretend || {
- ebegin "Updating GENTOO_PATCHSTAMP and GENTOO_DEVELOPER"
+ ebegin "Updating GENTOO_PATCHSTAMP, GENTOO_DEVELOPER and GENTOO_PATCHNAME"
sed -i -e "s/GENTOO_PATCHSTAMP=\".*\"/GENTOO_PATCHSTAMP=\"${DATESTAMP}\"/" ${EBUILD} &&
- sed -i -e "s/GENTOO_DEVELOPER=\".*\"/GENTOO_DEVELOPER=\"${G_USER}\"/" ${EBUILD}
+ sed -i -e "s/GENTOO_DEVELOPER=\".*\"/GENTOO_DEVELOPER=\"${G_USER}\"/" ${EBUILD} &&
+ sed -i -e "s/GENTOO_PATCHNAME=\".*\"/GENTOO_PATCHNAME=\"${TB_NAME}-${TB_VER}\"/" ${EBUILD}
eend $? "Failed to modify ebuild" || {
einfo "It's highly recommended that you delete the ebuild"
einfo "and cvs up and then modify the ebuild manually."