| 1 |
vapier 13/12/07 10:48:58 |
| 2 |
|
| 3 |
Modified: python-2.7.6.ebuild python-3.3.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Drop redundant die statements with EAPI=4. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-lang/python/python-2.7.6.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.6.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.6.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-2.7.6.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: python-2.7.6.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- python-2.7.6.ebuild 1 Dec 2013 17:33:19 -0000 1.1 |
| 23 |
+++ python-2.7.6.ebuild 7 Dec 2013 10:48:58 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6.ebuild,v 1.1 2013/12/01 17:33:19 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.6.ebuild,v 1.2 2013/12/07 10:48:58 vapier Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
WANT_AUTOMAKE="none" |
| 32 |
@@ -283,7 +283,7 @@ |
| 33 |
use threads || rm -r "${libdir}/multiprocessing" || die |
| 34 |
use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die |
| 35 |
|
| 36 |
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 37 |
+ dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} |
| 38 |
|
| 39 |
if use examples; then |
| 40 |
insinto /usr/share/doc/${PF}/examples |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.4 dev-lang/python/python-3.3.3.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.3.ebuild?rev=1.4&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.3.ebuild?rev=1.4&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/python-3.3.3.ebuild?r1=1.3&r2=1.4 |
| 49 |
|
| 50 |
Index: python-3.3.3.ebuild |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v |
| 53 |
retrieving revision 1.3 |
| 54 |
retrieving revision 1.4 |
| 55 |
diff -u -r1.3 -r1.4 |
| 56 |
--- python-3.3.3.ebuild 23 Nov 2013 17:47:09 -0000 1.3 |
| 57 |
+++ python-3.3.3.ebuild 7 Dec 2013 10:48:58 -0000 1.4 |
| 58 |
@@ -1,6 +1,6 @@ |
| 59 |
# Copyright 1999-2013 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v 1.3 2013/11/23 17:47:09 jer Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v 1.4 2013/12/07 10:48:58 vapier Exp $ |
| 63 |
|
| 64 |
EAPI="4" |
| 65 |
WANT_AUTOMAKE="none" |
| 66 |
@@ -173,7 +173,7 @@ |
| 67 |
touch Include/graminit.h Python/graminit.c || die |
| 68 |
|
| 69 |
cd "${BUILD_DIR}" || die |
| 70 |
- emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed" |
| 71 |
+ emake CPPFLAGS="" CFLAGS="" LDFLAGS="" |
| 72 |
|
| 73 |
# Work around bug 329499. See also bug 413751 and 457194. |
| 74 |
if has_version dev-libs/libffi[pax_kernel]; then |
| 75 |
@@ -225,7 +225,7 @@ |
| 76 |
|
| 77 |
cd "${BUILD_DIR}" || die |
| 78 |
|
| 79 |
- emake DESTDIR="${D}" altinstall || die "emake altinstall failed" |
| 80 |
+ emake DESTDIR="${D}" altinstall |
| 81 |
|
| 82 |
sed \ |
| 83 |
-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ |
| 84 |
@@ -233,7 +233,7 @@ |
| 85 |
-i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" |
| 86 |
|
| 87 |
# Backwards compat with Gentoo divergence. |
| 88 |
- dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die |
| 89 |
+ dosym python${SLOT}-config /usr/bin/python-config-${SLOT} |
| 90 |
|
| 91 |
# Fix collisions between different slots of Python. |
| 92 |
rm -f "${ED}usr/$(get_libdir)/libpython3.so" |
| 93 |
@@ -249,20 +249,20 @@ |
| 94 |
use threads || rm -fr "${libdir}/multiprocessing" |
| 95 |
use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe |
| 96 |
|
| 97 |
- dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" |
| 98 |
+ dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} |
| 99 |
|
| 100 |
if use examples; then |
| 101 |
insinto /usr/share/doc/${PF}/examples |
| 102 |
find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr |
| 103 |
- doins -r "${S}"/Tools || die "doins failed" |
| 104 |
+ doins -r "${S}"/Tools |
| 105 |
fi |
| 106 |
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 |
| 107 |
local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ |
| 108 |
emake --no-print-directory -s -f - 2>/dev/null) |
| 109 |
newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py |
| 110 |
|
| 111 |
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" |
| 112 |
- newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" |
| 113 |
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} |
| 114 |
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} |
| 115 |
sed \ |
| 116 |
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ |
| 117 |
-e "s:@PYDOC@:pydoc${SLOT}:" \ |
| 118 |
|
| 119 |
|
| 120 |
|
| 121 |
1.718 dev-lang/python/ChangeLog |
| 122 |
|
| 123 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.718&view=markup |
| 124 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?rev=1.718&content-type=text/plain |
| 125 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/python/ChangeLog?r1=1.717&r2=1.718 |
| 126 |
|
| 127 |
Index: ChangeLog |
| 128 |
=================================================================== |
| 129 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v |
| 130 |
retrieving revision 1.717 |
| 131 |
retrieving revision 1.718 |
| 132 |
diff -u -r1.717 -r1.718 |
| 133 |
--- ChangeLog 1 Dec 2013 17:33:19 -0000 1.717 |
| 134 |
+++ ChangeLog 7 Dec 2013 10:48:58 -0000 1.718 |
| 135 |
@@ -1,6 +1,10 @@ |
| 136 |
# ChangeLog for dev-lang/python |
| 137 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 138 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.717 2013/12/01 17:33:19 floppym Exp $ |
| 139 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.718 2013/12/07 10:48:58 vapier Exp $ |
| 140 |
+ |
| 141 |
+ 07 Dec 2013; Mike Frysinger <vapier@g.o> python-2.7.6.ebuild, |
| 142 |
+ python-3.3.3.ebuild: |
| 143 |
+ Drop redundant die statements with EAPI=4. |
| 144 |
|
| 145 |
*python-2.7.6 (01 Dec 2013) |
Archives