From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 253B81381F3 for ; Fri, 26 Jul 2013 08:03:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7534E09A5; Fri, 26 Jul 2013 08:03:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51FDCE09A5 for ; Fri, 26 Jul 2013 08:03:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F1AA33BF0D for ; Fri, 26 Jul 2013 08:03:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BBB6AE468F for ; Fri, 26 Jul 2013 08:03:25 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1374825791.733cf7d1ac0a600b186b9bf2d8de2ec8686c4f95.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 733cf7d1ac0a600b186b9bf2d8de2ec8686c4f95 X-VCS-Branch: master Date: Fri, 26 Jul 2013 08:03:25 +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-Archives-Salt: 20ef1c12-414e-4b65-b3c5-a5421cdb7b35 X-Archives-Hash: 68dd3beee5c7b5c3777d9e43e0176ed4 commit: 733cf7d1ac0a600b186b9bf2d8de2ec8686c4f95 Author: Zac Medico gentoo org> AuthorDate: Fri Jul 26 08:00:04 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jul 26 08:03:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=733cf7d1 Makefile: remove pysqlite2 workaround --- Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e1c3a05..92ea195 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,6 @@ docbook: epydoc: set -e; \ - # workaround for bug 282760 \ - touch "$(srcdir)/pym/pysqlite2.py"; \ env PYTHONPATH="$(PYTHONPATH)" epydoc \ -o "$(WORKDIR)/epydoc" \ --name $(PN) \ @@ -64,9 +62,7 @@ epydoc: -e s:^pym/:: \ -e s:/:.:g \ | sort); \ - rm -f "$(srcdir)/pym/pysqlite2.py"* \ - "$(WORKDIR)/epydoc/pysqlite2-"* \ - "$(WORKDIR)/epydoc/api-objects.txt"; \ + rm -f "$(WORKDIR)/epydoc/api-objects.txt"; \ test: set -e; \ @@ -214,7 +210,6 @@ install: clean: set -e; \ $(MAKE) -C "$(srcdir)/doc" clean; \ - rm -rf "$(srcdir)/pym/pysqlite2.py"* \ - "$(WORKDIR)/epydoc"; \ + rm -rf "$(WORKDIR)/epydoc"; \ .PHONY: all clean docbook epydoc install test