diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-07-02 13:25:36 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-07-02 13:28:06 +0100 |
| commit | d833cdd812d47ba27095100e7498a9b54d55f928 (patch) | |
| tree | d0544690ef3099b003da1628127c7400ac008598 | |
| parent | AdHoc utils bump (diff) | |
| download | portage-d833cdd812d47ba27095100e7498a9b54d55f928.tar.bz2 portage-d833cdd812d47ba27095100e7498a9b54d55f928.tar.xz portage-d833cdd812d47ba27095100e7498a9b54d55f928.zip | |
Move more functionality into bjam eclass
| -rw-r--r-- | dev-libs/libadhocutil/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild | 24 | ||||
| -rw-r--r-- | eclass/bjam.eclass | 19 |
3 files changed, 26 insertions, 19 deletions
diff --git a/dev-libs/libadhocutil/Manifest b/dev-libs/libadhocutil/Manifest index bab9c88..7efa461 100644 --- a/dev-libs/libadhocutil/Manifest +++ b/dev-libs/libadhocutil/Manifest @@ -23,4 +23,4 @@ EBUILD libadhocutil-0.3.7.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4a EBUILD libadhocutil-0.3.8.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4affaee06854733f937311a87a5c27c SHA512 245974cdb8e31872f107a70b2d1e07c0660d3c28152d19194573b82699ddd43510f57fd15d865982e99718c893e97679441b263f919444544941cecfb6ee41e8 WHIRLPOOL c04b697014744086d12f591b29fd53495aac81be45f65252f5394476dadb3da72ac0070af25dc971a5e76942c7a541fa9c7abcd776d19a4f0727c4c59ef2ab85 EBUILD libadhocutil-0.3.ebuild 1324 SHA256 a4e6e588b482b13d3ed6b64dabde6f4d5c063927fc71ff1939b32f737743a24c SHA512 94144aa29e93ccc9826a2b47ba6fa508354a5ee323a7f2795a6b281dca8665dfbddc96b72897e91ca336dc251a9af1b447037ea9df4b14ae482e9fe578f719fc WHIRLPOOL 170448f5b7782c5f0509649346b30de11222950beb234c3e1962051e5898cc0895f297b2730d4e1dfbc3383d8e6a30712547826a6f8b00a0ea0e0dafdb1d26e6 EBUILD libadhocutil-0.4.1.ebuild 1352 SHA256 95b31c67eecf95fdd0fd9aef6de7b1feb4affaee06854733f937311a87a5c27c SHA512 245974cdb8e31872f107a70b2d1e07c0660d3c28152d19194573b82699ddd43510f57fd15d865982e99718c893e97679441b263f919444544941cecfb6ee41e8 WHIRLPOOL c04b697014744086d12f591b29fd53495aac81be45f65252f5394476dadb3da72ac0070af25dc971a5e76942c7a541fa9c7abcd776d19a4f0727c4c59ef2ab85 -EBUILD libadhocutil-0.4.2.ebuild 1137 SHA256 87b92bb24a03f320f3629dbeb92815586d0c91597616c544b18b1d9856a2097d SHA512 4f14e6abadf95c1f423c8b781108c3407268f6e4a5cf19a16a4c560ffe08a334556c7bbc5ababfed82f2a262b73ac6fb6896a4d4eb919163f498481550617c3e WHIRLPOOL 1e3f481ef1587f9fecb478fc5434166d459d46353e9f40d972973595d4769d7fa49af2431199448da5a0f38a9d6bcf30ade7533a9e837c9ebc3d3402a701e05c +EBUILD libadhocutil-0.4.2.ebuild 837 SHA256 124935a95fe03ef612b66308eef28cd79a397d48ec37c204de59a8e56428f18d SHA512 823139262e66fdc904fb577fa562d7938ec1fecc74a0b1d4ddbaa2f248ab58cd98bb1d8569924e496993a95f08eb24a68785dd083b6382f5974c84be0a60c734 WHIRLPOOL 5c0be64f8b5511258837fee2cdd5cc4cfa9d1190c3fb6bd3f28eba09d127d73419822951d6c69921bd6514bdb257de6506c989e851acebe90a8bd7902da5a7e3 diff --git a/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild b/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild index 06606d5..625dcc4 100644 --- a/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild +++ b/dev-libs/libadhocutil/libadhocutil-0.4.2.ebuild @@ -3,7 +3,7 @@ EAPI="5" inherit bjam DESCRIPTION="Ad-hoc collection of utility functions, classes, helpers" -HOMEPAGE="http://libadhocutil.randomdan.homeip.net/" +HOMEPAGE="http://docs.randomdan.homeip.net/libadhocutil" SRC_URI="http://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz" LICENSE="GPL" @@ -25,33 +25,21 @@ DEPEND=" " src_compile() { - cd ${S}/libadhocutil || die - bjambuild variant=release adhocutil -q || die + bjambuild libadhocutil//adhocutil || die } src_install() { - cd ${S}/libadhocutil || die - - bjambuild variant=release install -q \ + bjambuild libadhocutil//install \ --libdir=${D}/usr/lib \ --includedir=${D}/usr/include/adhocutil || die insinto /usr/include/adhocutil || die - doins ${S}/libadhocutil/bin/*/*/*.h || die + doins libadhocutil/bin/*/*/*.h || die insinto /usr/share/adhocutil/ice || die - doins *.ice || die + doins libadhocutil/*.ice || die if use man ; then - mkdir -p ${D}/usr/share/man - (cat Doxyfile ; - echo OUTPUT_DIRECTORY=${D}/usr/share - echo PROJECT_NUMBER=${PV} - ) | tee ${T}/doxy | doxygen - || die "Build docs failed" + doxygenbuild fi } -src_test() { - cd ${S}/libadhocutil || die - bjambuild variant=release -q || die -} - diff --git a/eclass/bjam.eclass b/eclass/bjam.eclass index f2007d9..6d8d662 100644 --- a/eclass/bjam.eclass +++ b/eclass/bjam.eclass @@ -8,13 +8,32 @@ # @BLURB: # @DESCRIPTION: +inherit eutils + src_prepare() { ebegin "Setting portage CXX and LD flags" sed -i "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam eend $? } +src_test() { + bjambuild || die +} + bjambuild() { setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q $@ } +doxygenbuild() { + mkdir -p ${D}/usr/share/man + find ${S} -name Doxyfile -printf '%h %p\n' | while read d p ; do + ebegin "Building documentation in $d" + sed -i 's/^\(GENERATE_\w*\).*/\1 = NO/' "$p" + echo OUTPUT_DIRECTORY = ${D}/usr/share >> "$p" + echo PROJECT_NUMBER = ${PV} >> "$p" + echo GENERATE_MAN = YES >> "$p" + ( cd "$d" && doxygen ) + eend 0 + done +} + |