From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4722B138334 for ; Wed, 12 Dec 2018 18:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3ECFEE0A8A; Wed, 12 Dec 2018 18:54:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F4191E0A8A for ; Wed, 12 Dec 2018 18:54:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC6A1335C8E for ; Wed, 12 Dec 2018 18:54:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12EB0455 for ; Wed, 12 Dec 2018 18:54:26 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1544101676.3389191e9e58e73be3f41bdb251fbb962b834890.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: /, lib/ X-VCS-Repository: proj/portage X-VCS-Files: Makefile.am configure.ac lib/Makefile.in tarball.sh X-VCS-Directories: / lib/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3389191e9e58e73be3f41bdb251fbb962b834890 X-VCS-Branch: prefix Date: Wed, 12 Dec 2018 18:54:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 27e44333-b870-47d5-a5af-9e752a50cf48 X-Archives-Hash: ac3445c1707019f16353e356ba25fae5 commit: 3389191e9e58e73be3f41bdb251fbb962b834890 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 6 13:07:56 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 6 13:07:56 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3389191e build-sys: update after pym->lib move Signed-off-by: Fabian Groffen gentoo.org> Makefile.am | 2 +- configure.ac | 2 +- lib/Makefile.in | 2 +- tarball.sh | 20 +++++++++++++------- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index aef9678db..9bcfa00e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SHELL = @PORTAGE_BASH@ -SUBDIRS = man bin pym cnf +SUBDIRS = man bin lib cnf AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip diff --git a/configure.ac b/configure.ac index 525109907..6b8021ec6 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,7 @@ AC_CONFIG_FILES([ Makefile man/Makefile bin/Makefile - pym/Makefile + lib/Makefile cnf/Makefile ]) diff --git a/lib/Makefile.in b/lib/Makefile.in index a32b219d6..7d4193cc9 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -12,7 +12,7 @@ top_builddir=@top_builddir@ portageuser = @portageuser@ portagegroup = @portagegroup@ -PORTAGE_PYM = @PORTAGE_BASE@/pym +PORTAGE_PYM = @PORTAGE_BASE@/lib INSTALL = @INSTALL@ INSTALL_subst = ${top_builddir}/subst-install diff --git a/tarball.sh b/tarball.sh index 9c3f64785..e67e7244c 100755 --- a/tarball.sh +++ b/tarball.sh @@ -13,6 +13,11 @@ export TMP="/var/tmp" export V="$1" export DEST="${TMP}/${PKG}-${V}" +if [[ -e ${DEST} ]]; then + echo ${DEST} already exists, please remove first + exit 1 +fi + ./tabcheck.py $( find ./ -name .git -o -name .hg -prune -o -type f ! -name '*.py' -print \ | xargs grep -l "#\!@PREFIX_PORTAGE_PYTHON@" \ @@ -22,14 +27,10 @@ export DEST="${TMP}/${PKG}-${V}" ) -if [[ -e ${DEST} ]]; then - echo EXISTS ALREADY - exit 1 -fi - install -d -m0755 ${DEST} rsync -a --exclude='.git' --exclude='.hg' --exclude="repoman/" . ${DEST} -sed -i -e '/^VERSION\s*=/s/^.*$/VERSION = "'${V}-prefix'"/' ${DEST}/pym/portage/__init__.py +sed -i -e '/^VERSION\s*=/s/^.*$/VERSION = "'${V}-prefix'"/' \ + ${DEST}/lib/portage/__init__.py sed -i -e "/version = /s/'[^']\+'/'${V}-prefix'/" ${DEST}/setup.py sed -i -e "1s/VERSION/${V}-prefix/" ${DEST}/man/{,ru/}*.[15] sed -i -e "s/@version@/${V}/" ${DEST}/configure.ac @@ -39,7 +40,12 @@ find -name '*~' | xargs --no-run-if-empty rm -f find -name '*.pyc' | xargs --no-run-if-empty rm -f find -name '*.pyo' | xargs --no-run-if-empty rm -f cd $TMP -rm -f ${PKG}-${V}/bin/emerge.py ${PKG}-${V}/bin/{pmake,sandbox} ${PKG}-${V}/{bin,pym}/'.#'* ${PKG}-${V}/{bin,pym}/*.{orig,diff} ${PKG}-${V}/{bin,pym}/*.py[oc] +rm -f \ + ${PKG}-${V}/bin/emerge.py \ + ${PKG}-${V}/bin/{pmake,sandbox} \ + ${PKG}-${V}/{bin,lib}/'.#'* \ + ${PKG}-${V}/{bin,lib}/*.{orig,diff} \ + ${PKG}-${V}/{bin,lib}/*.py[oc] cd $TMP/${PKG}-${V} chmod a+x autogen.sh && ./autogen.sh || { echo "autogen failed!"; exit -1; }; rm -f autogen.sh tabcheck.py tarball.sh commit