diff options
author | 2020-02-15 22:19:01 +0700 | |
---|---|---|
committer | 2020-02-25 19:12:59 +0700 | |
commit | eed3a40c8a07549e859611a210a39aadc0a4715f (patch) | |
tree | 93d40d757886b5bc39217f280f3ce0815a56983f | |
parent | openocd: sync with gentoo ebuild (diff) | |
download | activehome-eed3a40c8a07549e859611a210a39aadc0a4715f.tar.gz activehome-eed3a40c8a07549e859611a210a39aadc0a4715f.tar.bz2 activehome-eed3a40c8a07549e859611a210a39aadc0a4715f.zip |
lm4tools: bump EAPI&eclass; sweethome3d: bump
Signed-off-by: Vadim A. Misbakh-Soloviov <git@mva.name>
-rw-r--r-- | dev-embedded/lm4tools/lm4tools-9999.ebuild | 12 | ||||
-rw-r--r-- | media-gfx/sweethome3d-bin/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild (renamed from media-gfx/sweethome3d-bin/sweethome3d-bin-5.2-r1.ebuild) | 29 |
3 files changed, 26 insertions, 19 deletions
diff --git a/dev-embedded/lm4tools/lm4tools-9999.ebuild b/dev-embedded/lm4tools/lm4tools-9999.ebuild index 8428d3e..d87d32a 100644 --- a/dev-embedded/lm4tools/lm4tools-9999.ebuild +++ b/dev-embedded/lm4tools/lm4tools-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header $ -EAPI=4 +EAPI=7 -EGIT_REPO_URI=" https://github.com/utzig/lm4tools.git" +EGIT_REPO_URI="https://github.com/utzig/lm4tools.git" -inherit eutils toolchain-funcs git-2 +inherit eutils toolchain-funcs git-r3 -DESCRIPTION="provides lm4flash and lmicdiusb for developing on the TI Stellaris Launchpad" +DESCRIPTION="Provides lm4flash and lmicdiusb for developing on the TI Stellaris Launchpad" HOMEPAGE="https://github.com/utzig/lm4tools" LICENSE="GPL-2+ MIT" @@ -21,6 +20,7 @@ DEPEND="${RDEPEND} src_prepare () { sed -e "s:gcc:$(tc-getCC):" -i lm4flash/Makefile || die + default } src_compile () { diff --git a/media-gfx/sweethome3d-bin/Manifest b/media-gfx/sweethome3d-bin/Manifest index e801286..32a8515 100644 --- a/media-gfx/sweethome3d-bin/Manifest +++ b/media-gfx/sweethome3d-bin/Manifest @@ -1,2 +1,2 @@ -DIST SweetHome3D-5.2-linux-x64.tgz 49686586 SHA256 c963afe9111e7b557cbdb99678926e5767c30928aa9565878f0d0b132151d69e SHA512 2f2b160b206333a29009feb35376f8433559fb31013d8fd7cdf63427b429567a743debd7a34d4720b9cae5120e249a3781f43dfabb60f26f143d2e0cc1027206 WHIRLPOOL ade0bd79a9fe56ad41e14f6a96f7e84d15d6657519e81d7e48536f81c3bc90c64f9f2369c065b1205bbbe7ac17f8932649d15a2d1aa366ffc927f29af0ce57b7 -DIST SweetHome3D-5.2-linux-x86.tgz 55697753 SHA256 2290467a5fa53326e0cb4c30801782c64d7ad4b2a5cf388551318a31652c0a03 SHA512 9c68f38b8268d168cbd1e8d78b000cbc0ea201893f58297f678e1bb4ca0539332471bb7701484c609ed3d16f38510ea5d3b5247dd555a59709a81729783e237e WHIRLPOOL e89360d92ee0409f45d4f81d145aac27dfbf97185ef0f1de819c2896ff72961549d5db7996845ef5c2e47f5727a3cea0c5ae77e213dd8aa3765a84ce03202704 +DIST SweetHome3D-6.2-linux-x64.tgz 67508189 SHA256 5c2090b16c32e52637e87a48197a13d30a0322940949431bbb898b7b082cfca6 SHA512 99d4a93b06adc8fdcf211ccc12223ec346d78e129be3c2ec730c944ea0f4ec936be0fec17f22823cbe8ff9417ad86135c483c6460408c63442b96eeb56ae5313 WHIRLPOOL bd77b674381c61c9f3827d32c61c6f016024393ecd4593569495abd28f4b9d60cbc020eb32f9060871fb9179e5b05f9f456e1d798a149722c6736a65d9ebe72c +DIST SweetHome3D-6.2-linux-x86.tgz 70795753 SHA256 2056c16564208cb93f4f89ad99b5e3fedcad28d6c835553b6cba099047f54e5a SHA512 069a6b22f0f283ae46301e2ac1aaf47013dfba485271e706b2cb1b9c40e41c27a1ffb239696d54da91b01dcdecd186cb54529be2b770420bac4417000af5da8d WHIRLPOOL 558f4dcb5758b5f35eb9ef665480a40abd7062569e28aedc1d5a645979e50e0b69aa24171af042dcc26ad2fb83e239056826add0a3d77a5c809de7c3885b2dcf diff --git a/media-gfx/sweethome3d-bin/sweethome3d-bin-5.2-r1.ebuild b/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild index dcdc384..d58e3e4 100644 --- a/media-gfx/sweethome3d-bin/sweethome3d-bin-5.2-r1.ebuild +++ b/media-gfx/sweethome3d-bin/sweethome3d-bin-6.2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2019 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -# This ebuild is a modified version of ebuild from java overlay. -EAPI="6" +EAPI=6 inherit eutils MY_PN="SweetHome3D" @@ -15,7 +13,7 @@ SRC_URI=" x86? ( mirror://sourceforge/sweethome3d/${MY_PN}-${PV}-linux-x86.tgz ) " LICENSE="GPL-3" -IUSE="+system-java" +IUSE="gtk3 +system-java" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -29,8 +27,10 @@ RDEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" +QA_PREBUILT="*java3d.*.so" + pkg_setup() { - if use system-java && [ ! -f "$JAVA_HOME"/bin/java]; then + if use system-java && [ ! -f "$JAVA_HOME"/bin/java ]; then die 'Your Java VM installation is broken. Please, select proper system vm through eselect.' fi } @@ -41,15 +41,22 @@ src_prepare() { rm -rf jre* sed -r \ -e 's@^(exec.*/bin/java)@exec "$JAVA_HOME"/bin/java@' \ - -e 's@:"\$PROGRAM_DIR"/[^/]*/(lib/javaws.jar) @:"$JAVA_HOME"/jre/\1:"$JAVA_HOME"/\1 @' \ - -i SweetHome3D + -e 's@:"\$PROGRAM_DIR"/[^/]*/(lib/javaws.jar) @:"$JAVA_HOME"/jre/\1:"$JAVA_HOME"/\1:/usr/share/icedtea-web/netx.jar @' \ + -i "${MY_PN}" + fi + if use gtk3; then + sed -r \ + -e '/^exec.*java /s@(bin/java)@\1 -Dawt.useSystemAAFontSettings=gasp -Dswing.aatext=true -Dsun.java2d.xrender=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel@' \ + -i "${MY_PN}" fi default } src_install() { - dodir /usr/share/sweethome3d - cp -r "${S}"/* "${D}"/usr/share/sweethome3d/ - dosym /usr/share/sweethome3d/"${MY_PN}" /usr/bin/"${MY_PN}" + insinto /usr/share/"${PF}" + exeinto /usr/share/"${PF}" + doins -r * + doexe "${MY_PN}" + dosym /usr/share/${PF}/"${MY_PN}" /usr/bin/"${MY_PN}" make_desktop_entry "${MY_PN}" "${MY_PN}" } |