diff options
author | Stuart Herbert <stuart@gentoo.org> | 2004-03-28 22:36:40 +0000 |
---|---|---|
committer | Stuart Herbert <stuart@gentoo.org> | 2004-03-28 22:36:40 +0000 |
commit | 45c19889951a3bf90854786feb04d6b147796d49 (patch) | |
tree | dff808d60d211ed2f8b40b1630b43dd5921149aa /dev-php/phpsysinfo | |
parent | Fix for bug #39248 (diff) | |
download | historical-45c19889951a3bf90854786feb04d6b147796d49.tar.gz historical-45c19889951a3bf90854786feb04d6b147796d49.tar.bz2 historical-45c19889951a3bf90854786feb04d6b147796d49.zip |
Auto-apply patch depending on which kernel is installed
Diffstat (limited to 'dev-php/phpsysinfo')
-rw-r--r-- | dev-php/phpsysinfo/ChangeLog | 7 | ||||
-rw-r--r-- | dev-php/phpsysinfo/Manifest | 4 | ||||
-rw-r--r-- | dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild | 10 |
3 files changed, 15 insertions, 6 deletions
diff --git a/dev-php/phpsysinfo/ChangeLog b/dev-php/phpsysinfo/ChangeLog index e680a9368509..6ab144238cbe 100644 --- a/dev-php/phpsysinfo/ChangeLog +++ b/dev-php/phpsysinfo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-php/phpsysinfo # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/ChangeLog,v 1.10 2004/03/28 22:30:57 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/ChangeLog,v 1.11 2004/03/28 22:36:40 stuart Exp $ + +*phpsysinfo-2.1-r2 (28 Mar 2004) + + 28 Mar 2004; Stuart Herbert <stuart@gentoo.org> phpsysinfo-2.1-r2.ebuild: + Auto-apply the 2.5 kernel patch if we're running on a 2.5 / 2.6 kernel 28 Mar 2004; Stuart Herbert <stuart@gentoo.org> : Included working 2.5/2.6 kernel patch from Stephen Reindl diff --git a/dev-php/phpsysinfo/Manifest b/dev-php/phpsysinfo/Manifest index ca3f14ddae93..9a4b5d13e0c9 100644 --- a/dev-php/phpsysinfo/Manifest +++ b/dev-php/phpsysinfo/Manifest @@ -1,8 +1,8 @@ MD5 94a0153ea83ef62e1da926a337518d44 phpsysinfo-2.1.ebuild 911 MD5 d2b137b1bac0a1e85dd98d8304b53045 phpsysinfo-2.1-r1.ebuild 1423 -MD5 b77aa9e8e908e8c3135cf33ce1963cb9 ChangeLog 1393 +MD5 96b3720f57a53bd7479930b4d8e9566c ChangeLog 1577 MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156 -MD5 421a0191eff0cbc0836f6e9eb48c872f phpsysinfo-2.1-r2.ebuild 1244 +MD5 ca85bf0801f67509bca3bd831b83ca16 phpsysinfo-2.1-r2.ebuild 1393 MD5 dd6e98f9ae29de67bf46f225d4fe3eff files/digest-phpsysinfo-2.1 66 MD5 31e3ac9396a003b09c5f3caf78c361f2 files/digest-phpsysinfo-2.1-r1 133 MD5 31e3ac9396a003b09c5f3caf78c361f2 files/digest-phpsysinfo-2.1-r2 133 diff --git a/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild b/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild index 7ae98f115ef8..7b9ecd220c44 100644 --- a/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild +++ b/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild,v 1.1 2004/03/28 22:30:57 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/phpsysinfo/phpsysinfo-2.1-r2.ebuild,v 1.2 2004/03/28 22:36:40 stuart Exp $ -inherit eutils +inherit eutils kernel-mod MY_PN="phpSysInfo" MY_P="${MY_PN}-${PV}" @@ -26,7 +26,11 @@ src_unpack() { mv ${P}/debian ${S} rmdir ${P} epatch ${S}/debian/patches/urlencoded-security-fix.diff - epatch ${FILESDIR}/fix_memory_display_kernel2.5.diff.gz + + APPLY_25PATCH=0 + kernel-mod_is_2_5_kernel && APPLY_25PATCH=1 + kernel-mod_is_2_6_kernel && APPLY_25PATCH=1 + [ "$APPLY_25PATCH" = "1" ] && epatch ${FILESDIR}/fix_memory_display_kernel2.5.diff.gz } src_install() { |