From 33ff50426d1a98c3c4960494228cea90643cf9ed Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 27 Apr 2014 13:55:48 +0200 Subject: sys-apps/IPMIView: Use LIBOPTIONS="-m0755" for java-pkg_doso until bug #225729 is merge, wrappe~ Package-Manager: portage-2.2.10 --- sys-apps/IPMIView/ChangeLog | 6 +++++ sys-apps/IPMIView/IPMIView-2.9.30-r20140317.ebuild | 5 ++-- sys-apps/IPMIView/Manifest | 6 ++--- sys-apps/IPMIView/files/IPMIView-wrapper | 29 ++++++++++------------ 4 files changed, 25 insertions(+), 21 deletions(-) (limited to 'sys-apps') diff --git a/sys-apps/IPMIView/ChangeLog b/sys-apps/IPMIView/ChangeLog index 1a3e730b..695ff77e 100644 --- a/sys-apps/IPMIView/ChangeLog +++ b/sys-apps/IPMIView/ChangeLog @@ -1,3 +1,9 @@ + 16 Apr 2014; Bertrand Jacquin + IPMIView-2.9.30-r20140317.ebuild, files/IPMIView-wrapper: + sys-apps/IPMIView: Use LIBOPTIONS="-m0755" for java-pkg_doso until bug #225729 + is merge, wrapper die is we can't cd to user cache directory, fix some + comments + 11 Apr 2014; Bertrand Jacquin files/IPMIView-wrapper: sys-apps/IPMIView: Avoid errors report in IPMIView-wrapper when no .jar and .so file are present in cache directory diff --git a/sys-apps/IPMIView/IPMIView-2.9.30-r20140317.ebuild b/sys-apps/IPMIView/IPMIView-2.9.30-r20140317.ebuild index f9e1e114..1449832b 100644 --- a/sys-apps/IPMIView/IPMIView-2.9.30-r20140317.ebuild +++ b/sys-apps/IPMIView/IPMIView-2.9.30-r20140317.ebuild @@ -31,8 +31,9 @@ src_install() { java-pkg_dojar iKVM.jar IPMIView20.jar JViewerX9.jar TrapView.jar - use x86 && java-pkg_doso libiKVM32.so libSharedLibrary32.so - use amd64 && java-pkg_doso libiKVM64.so libSharedLibrary64.so + # Use LIBOPTIONS="-m0755" for bug #225729 + use x86 && LIBOPTIONS="-m0755" java-pkg_doso libiKVM32.so libSharedLibrary32.so + use amd64 && LIBOPTIONS="-m0755" java-pkg_doso libiKVM64.so libSharedLibrary64.so dodoc IPMIView20.pdf IPMIViewSuperBlade.pdf ReleaseNote.txt } diff --git a/sys-apps/IPMIView/Manifest b/sys-apps/IPMIView/Manifest index 54dbe46e..3c444dd7 100644 --- a/sys-apps/IPMIView/Manifest +++ b/sys-apps/IPMIView/Manifest @@ -1,5 +1,5 @@ -AUX IPMIView-wrapper 1782 SHA256 52581436476e79bec2b4f50125cf74a990477fee6b34d509dba06d32b2128dc3 WHIRLPOOL 2c4a49aaa6d318be62059919344fee5bfc5aa9d55cdd67b6ff95f9bd8f6d7b990e6715da2d51344a59c0938ca0b73800d8bcc56d4ad0d457bea76f64731addca +AUX IPMIView-wrapper 1851 SHA256 e8d6efbcd3c7213a9ab7a1f2f64f3a299942073734d3ed6885d6eecc20734035 WHIRLPOOL 9687a2dd4b67132a01e45762a34e0c40bb332f669ab578f37bb01bb97901055f36e9806396208b1e76fce23c32cecc31f40e1f64dc7340a5933c5afc78f6d2dc DIST IPMIView_2.9.30_jar_20140317.zip 27676263 SHA256 3ffb8579b5b494d1020ad83fd0fcbbacaa7873484fec3d8410b48d61c013a7af WHIRLPOOL c0b145e88f53ba93ab4c20863bfce83bb46da385569d21d4889f71339b80e3a11ea2802ddd22f2cadc496bbd446acfd5ff6ab92bfad82b56cf43849e70ebd07a -EBUILD IPMIView-2.9.30-r20140317.ebuild 936 SHA256 ed4e865702cfbbf2dbcca64bb9e694b592c274453257d627312f1eca61822a98 WHIRLPOOL cf7583a4ad065859a7e41c44c7db8879e48f35a7906517a30e71eee84d18aedd993fbcf7efa0d7409afd9568b8b8053c1dee18aff62e87edc8f889c0b4669809 -MISC ChangeLog 1407 SHA256 1f1b26fad44c0a8b682cfbbf136024e570d8279db1e6be964d8a8e528ad96949 WHIRLPOOL 8f9a7f3733a8834fe83f0dafa577a3c391e4562b1ce83dc878f33309960525d4902cc601ce720f06a8a7a54771935f0b873ef90532499d11d2584f2d207efae9 +EBUILD IPMIView-2.9.30-r20140317.ebuild 1019 SHA256 d8d541235777f60de47ffc969d728b32975487a682471f8b1d0b29e876010dfe WHIRLPOOL af25ec2c6de3e5907354e24c4dfead28e39b7a4c97eeed07d0a941453c0d56f3bb1d7b63e1c791a21ffef57d960615016dac91fadf1de15215f9cc70df20f3b7 +MISC ChangeLog 1686 SHA256 df5f095961a027e11ca17f4d3b2819fb79b7b568dcee4d2099e6d7c11e876091 WHIRLPOOL f5aef88e8821fcc8c40964a8bd7638d43850b2ff8c8d77f2f272292c6dcd8c6631cf28f1f9d76c598633ebd27d8b0cc2dde0543323f1c95b0eb5541d8b713285 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/sys-apps/IPMIView/files/IPMIView-wrapper b/sys-apps/IPMIView/files/IPMIView-wrapper index dbfd04b2..f0206cb5 100644 --- a/sys-apps/IPMIView/files/IPMIView-wrapper +++ b/sys-apps/IPMIView/files/IPMIView-wrapper @@ -3,6 +3,11 @@ # (c) 2013-2014 - Bertrand Jacquin # +function die () { + echo "FATAL: $@" + exit 1 +} + BIN="${0##*/}" PN="IPMIView" @@ -13,18 +18,11 @@ CLASSPATH="$(java-config --classpath ${PN})" LIBRARY_PATH="$(java-config --library ${PN})" if [[ ! -e "/usr/share/${PN}/lib/${BIN}.jar" ]] ; then - echo "/usr/share/${PN}/lib/${BIN}.jar is missing" - exit 1 -fi - -if [[ ! ${CLASSPATH} ]] ; then - echo "java-config --classpath ${PN} return nothing" - exit 1 -fi - -if [[ ! ${LIBRARY_PATH} ]] ; then - echo "java-config --library ${PN} return nothing" - exit 1 + die "/usr/share/${PN}/lib/${BIN}.jar is missing" +elif [[ ! ${CLASSPATH} ]] ; then + die "java-config --classpath ${PN} return nothing" +elif [[ ! ${LIBRARY_PATH} ]] ; then + die "java-config --library ${PN} return nothing" fi # IPMIView has hardcoded java exec like: @@ -41,12 +39,11 @@ fi # jar so the java exec can use -Djava.library.path=. and create theses # properties files # -# The same appy for .so files -# -# Flush that fake IPMIView root directory when IPMIView get upgrade +# The same apply for .so files [[ ! -d "${HOME}/.${PN}" ]] && mkdir -p "${HOME}/.${PN}" -cd "${HOME}/.${PN}" +cd "${HOME}/.${PN}" || die "Failed to change directory to ${HOME}/.${PN}" +# Flush that fake IPMIView root directory when IPMIView get upgraded if [[ "/usr/share/${PN}/package.env" -nt PVR ]] ; then rm -f *.jar *.so echo "${PVR}" > PVR -- cgit v1.2.3