From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 26 Jul 2013 08:00:04 +0000 (-0700)
Subject: Makefile: remove pysqlite2 workaround
X-Git-Tag: v2.2.0_alpha190~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=733cf7d1ac0a600b186b9bf2d8de2ec8686c4f95;p=portage.git

Makefile: remove pysqlite2 workaround
---

diff --git a/Makefile b/Makefile
index e1c3a05a4..92ea19562 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