From 324ce801ca21287376e3dada74a90f887c816671 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 6 Jul 2009 22:24:07 +0000 Subject: app-misc/heyu: Eapi2fy it and clean up svn path=/sunrise/; revision=8728 --- app-misc/heyu/ChangeLog | 3 +++ app-misc/heyu/Manifest | 4 ++-- app-misc/heyu/heyu-2.7.0.ebuild | 29 +++++++++++++++-------------- 3 files changed, 20 insertions(+), 16 deletions(-) (limited to 'app-misc/heyu') diff --git a/app-misc/heyu/ChangeLog b/app-misc/heyu/ChangeLog index 6801a889d..cf8ff993b 100644 --- a/app-misc/heyu/ChangeLog +++ b/app-misc/heyu/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jul 2009; Markos Chandras heyu-2.7.0.ebuild: + Eapi2fy it and clean up + 30 Jun 2009; Sven Schwyn (svoop) -heyu-2.6.0.ebuild, +heyu-2.7.0.ebuild: Version bump for bug 91396 diff --git a/app-misc/heyu/Manifest b/app-misc/heyu/Manifest index ade300832..5ec897475 100644 --- a/app-misc/heyu/Manifest +++ b/app-misc/heyu/Manifest @@ -1,5 +1,5 @@ AUX heyu.init 423 RMD160 96dd75247188abdb8847807863c1cf2952c54279 SHA1 aac324ffc55a7ec20055ce5af6340372a892b853 SHA256 aee16c73a380015858137f7bbc0f1944727ddd82403bc7b2734d291855d0a9a9 DIST heyu-2.7.0.tgz 538676 RMD160 1f208ff917d4bf126afa2e113bcc8bd008654776 SHA1 fdd35b10730036842b023108a69c3c33d73c5ebf SHA256 4ad5127da2cd314ba022481dc266eda45253046f8340f6f6b427e7a1a362ba2b -EBUILD heyu-2.7.0.ebuild 3528 RMD160 896853258169222ba5625c184b0cc7381ee61699 SHA1 54e864ae9fd3200cba9ee499b097cb234862fb70 SHA256 eac4915535db2b288c3c8182f549ad87bf3940d7f790c74a41bd0da8ba0c249a -MISC ChangeLog 1764 RMD160 7ee3d8cf424a22c4ecb69eea6501ed35db305058 SHA1 808d637b30a542ea447bdb514474ab85318da4b5 SHA256 478b29fdd5e2a03f0ab0c508071f04502cc14aff5070c2543146a6f754f73e70 +EBUILD heyu-2.7.0.ebuild 3118 RMD160 31cb66eeed5e9a7912e678f42945a4435b7931cc SHA1 56612da0760ad77ca4f89fa5250b06c2e820571a SHA256 cda1d7253b3793ff6b825a5bcb5aa19384bfc6b96274877758f252756e6f1347 +MISC ChangeLog 1863 RMD160 6e5022407753aa9d8cb26e2b1ad2c591e67f108c SHA1 94dadcaea4b32e3e38f697d9f33614a625627197 SHA256 deed975591ea89d6dcd2c71c7cae3bd5b84c4affae6a64b513b9643f25d0878e MISC metadata.xml 1225 RMD160 9cc4a306989b21aadc2c46cbe77b49d94f5f7531 SHA1 01b5d2dfc5446f495689a0d1a8357982464e54fb SHA256 9b9ac8546a69802b4de3818d06e98c4738485d6634fb6375f087cb1ae2853a07 diff --git a/app-misc/heyu/heyu-2.7.0.ebuild b/app-misc/heyu/heyu-2.7.0.ebuild index 5fe84cb85..8dbfd8409 100644 --- a/app-misc/heyu/heyu-2.7.0.ebuild +++ b/app-misc/heyu/heyu-2.7.0.ebuild @@ -2,9 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="2" + inherit eutils toolchain-funcs -DESCRIPTION="Utility to control and program CM11A, CM17A and CM12U X10 interfaces." +DESCRIPTION="Utility to control and program CM11A, CM17A and CM12U X10 interfaces" HOMEPAGE="http://heyu.tanj.com" SRC_URI="http://heyu.tanj.com/download/${P}.tgz" @@ -22,7 +24,7 @@ pkg_setup() { epause } -src_compile() { +src_configure() { mv x10config.sample x10.conf.sample "${S}"/Configure \ $(use kernel_FreeBSD && echo "freebsd") \ @@ -35,28 +37,27 @@ src_compile() { $(use rfxm || echo "-norfxm") \ $(use rfxs || echo "-norfxs") \ || die "configure failed" - sed -i "s/CC\s*=.*/CC = $(tc-getCC)/" "${S}"/Makefile || die "adjustment of CC failed" - sed -i "s/CFLAGS\s*=.*/CFLAGS = ${CFLAGS} \$(DFLAGS)/" "${S}"/Makefile || die "adjustment of CFLAGS failed" - sed -i -r 's%^(DFLAGS.+)-DSYSBASEDIR=\\"[^\]+\\"%\1%' "${S}"/Makefile || die "removing DSYSBASEDIR from DFLAGS failed" - sed -i -r 's%^(DFLAGS\s*=\s*)%\1-DSYSBASEDIR=\\"/var/lib/heyu\\" %' "${S}"/Makefile || die "adding DSYSBASEDIR to DFLAGS failed" - sed -i -r 's%^(DFLAGS.+)-DSPOOLDIR=\\"[^\]+\\"%\1%' "${S}"/Makefile || die "removing DSPOOLDIR from DFLAGS failed" - sed -i -r 's%^(DFLAGS\s*=\s*)%\1-DSPOOLDIR=\\"/var/lib/heyu\\" %' "${S}"/Makefile || die "adding DSPOOLDIR to DFLAGS failed" - sed -i -r 's%^(DFLAGS.+)-DLOCKDIR=\\"[^\]+\\"%\1%' "${S}"/Makefile || die "removing DLOCKDIR from DFLAGS failed" - sed -i -r 's%^(DFLAGS\s*=\s*)%\1-DLOCKDIR=\\"/var/lock\\" %' "${S}"/Makefile || die "adding DLOCKDIR to DFLAGS failed" + sed -i -r -e "s/CC\s*=.*/CC = $(tc-getCC)/" "${S}"/Makefile \ + -e "s/CFLAGS\s*=.*/CFLAGS = ${CFLAGS} \$(DFLAGS)/" \ + -e 's%^(DFLAGS.+)-DSYSBASEDIR=\\"[^\]+\\"%\1%' \ + -e 's%^(DFLAGS\s*=\s*)%\1-DSYSBASEDIR=\\"/var/lib/heyu\\" %' \ + -e 's%^(DFLAGS.+)-DSPOOLDIR=\\"[^\]+\\"%\1%' \ + -e 's%^(DFLAGS\s*=\s*)%\1-DSPOOLDIR=\\"/var/lib/heyu\\" %' \ + -e 's%^(DFLAGS.+)-DLOCKDIR=\\"[^\]+\\"%\1%' \ + -e 's%^(DFLAGS\s*=\s*)%\1-DLOCKDIR=\\"/var/lock\\" %' "${S}"/Makefile || die "adjusting Makefile failed" sed -i -r 's%(LOG_DIR.*?)NONE%\1/var/log/heyu%' "${S}"/x10.conf.sample || die "changing LOG_DIR failed" - emake || die "make failed" } src_install() { dobin heyu || die "installing binary failed" - doman heyu.1 x10config.5 x10scripts.5 x10sched.5 || die "installing man pages failed" + doman heyu.1 x10{config,scripts,sched}.5 || die "installing man pages failed" newinitd "${FILESDIR}"/heyu.init heyu insinto /etc/heyu doins x10.*.sample || die "installing config samples failed" diropts -m 0750 -o heyu dodir /var/log/heyu || die "creating log directory failed" - dosym /etc/heyu/x10.conf /var/lib/heyu/x10.conf - dosym /etc/heyu/x10.sched /var/lib/heyu/x10.sched + dosym /etc/heyu/x10.conf /var/lib/heyu/x10.conf || die "dosym failed" + dosym /etc/heyu/x10.sched /var/lib/heyu/x10.sched || die "dosym failed" } pkg_postinst() { -- cgit v1.2.3-18-g5258