diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2010-08-22 20:10:43 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2010-08-22 20:10:43 +0000 |
| commit | a90412f379ea5da1817c549ad6b8a332994dba06 (patch) | |
| tree | 4505173349092b1470c33809bc643509af5ef260 /sys-apps/openrc | |
| parent | Drop unused librairies and their proto per configure. (diff) | |
| download | gentoo-2-a90412f379ea5da1817c549ad6b8a332994dba06.tar.gz gentoo-2-a90412f379ea5da1817c549ad6b8a332994dba06.tar.bz2 gentoo-2-a90412f379ea5da1817c549ad6b8a332994dba06.zip | |
Fix make breakage bug #333461, also allow user to apply conditional patches between releases without modifying ebuild.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/openrc')
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch | 14 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.6.2.ebuild | 8 |
3 files changed, 27 insertions, 2 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 3f0cd418e1bc..ad0f5b9ff2e5 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.115 2010/08/21 22:30:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.116 2010/08/22 20:10:43 anarchy Exp $ + + 22 Aug 2010; Jory A. Pratt <anarchy@gentoo.org> openrc-0.6.2.ebuild, + +files/openrc-0.6.2-fix-make-3.82.patch: + Fix make breakage bug #333461, also allow user to apply conditional + patches between releases without modifying ebuild. 21 Aug 2010; Mike Frysinger <vapier@gentoo.org> openrc-0.6.2.ebuild, openrc-9999.ebuild: diff --git a/sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch b/sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch new file mode 100644 index 000000000000..56bea9a2683c --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.6.2-fix-make-3.82.patch @@ -0,0 +1,14 @@ +diff --git a/pkgconfig/Makefile b/pkgconfig/Makefile +index cdcf8be..4bf28cf 100644 +--- a/pkgconfig/Makefile ++++ b/pkgconfig/Makefile +@@ -2,7 +2,8 @@ DIR= ${LIBDIR}/pkgconfig + SRCS= einfo.pc.in openrc.pc.in + INC= einfo.pc openrc.pc + +-sed -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h ++.DEFAULT: ++ ${SED} -n -e 's/^VERSION=[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1${GITVER}\"/p' ../../Makefile > version.h + + SED_EXTRA= -e 's:@VERSION@:${VERSION}:g' + diff --git a/sys-apps/openrc/openrc-0.6.2.ebuild b/sys-apps/openrc/openrc-0.6.2.ebuild index a4776979de82..4e9cebd17eaf 100644 --- a/sys-apps/openrc/openrc-0.6.2.ebuild +++ b/sys-apps/openrc/openrc-0.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.2.ebuild,v 1.2 2010/08/21 22:30:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.2.ebuild,v 1.3 2010/08/22 20:10:43 anarchy Exp $ EAPI="1" @@ -63,10 +63,16 @@ src_unpack() { else unpack ${A} fi + cd "${S}" sed -i 's:0444:0644:' mk/sys.mk sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342 sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264 + + epatch "${FILESDIR}/${PN}-0.6.2-fix-make-3.82.patch" #333461 + + # Allow user patches to be applied without modifying the ebuild + epatch_user } src_compile() { |