diff --git a/app-cdr/liblightscribe/Manifest b/app-cdr/liblightscribe/Manifest index ca71f65..c68c508 100644 --- a/app-cdr/liblightscribe/Manifest +++ b/app-cdr/liblightscribe/Manifest @@ -5,7 +5,7 @@ DIST lightscribe-1.18.8.1-linux-2.6-intel.rpm 816331 RMD160 57e808451666d73e9f77 DIST lightscribe-1.18.9.1-linux-2.6-intel.rpm 816566 RMD160 a513fc676f5becb8affeeefcbafc80fc94e5bade SHA1 27fd66983fdca1e92d8c8e9fa8242747b171c258 SHA256 47151be4748ac27c79534004485077c8f3da5e9c82724057aa109810c2d617a2 DIST lightscribePublicSDK-1.14.32.1-linux-2.6-intel.rpm 622100 RMD160 42ee805c828e2d4302a889c4f73fe7c225eaca05 SHA1 8645933eefdc84dc4d775601da94253cf0519e6e SHA256 34aea8ce43dc2887e9c99c995e2af1d16d82f773fccd3fa7f674ac05600828e8 DIST lightscribePublicSDK-1.18.6.1-linux-2.6-intel.rpm 622177 RMD160 6ac5bc74fb2de7602b5f42aecd4ea312c272cad4 SHA1 e46003c06293b62297d5780b24f1ea7ef94bf84d SHA256 174ccb9c39d9e115836fc696f69c8fe8ffc2a78b5f4f0185b8f930afc93e40bf -EBUILD liblightscribe-1.18.10.2-r1.ebuild 3190 RMD160 996bb58e99b3b6237365e7158041b8860fe495b4 SHA1 c56c8ad8dcc0c9139c246fd5f82e2cef964a2379 SHA256 6bcc4cb311730d687fbb0519e3fff526b75c369f62376682dce35df1b64eebbd +EBUILD liblightscribe-1.18.10.2-r1.ebuild 3033 RMD160 5f392c3ffb16c447450ad0f99af844e6e16f45ff SHA1 f7fe22ffe9e1f0e78b983275a1672135a567115f SHA256 616d88753c7c0aee939a78ce69b19bb0f9cb284f860c2673738c9f010c2a97af EBUILD liblightscribe-1.18.10.2.ebuild 3172 RMD160 ffdfe42ad9c125eeaf5a3392290fa2b893d2e79b SHA1 d82c7abee83d81d1ca2adc58bd403c1bb40ce80a SHA256 427c496dbd6823a4ee402d7c7879aece237dbdb5572c8fdb91edfb52d5a107b7 EBUILD liblightscribe-1.18.5.1.ebuild 3164 RMD160 127d47865b995ca8c81dce7dd742a1d79addd15d SHA1 1d5db7f6787adc39e3204f52ec6bac9dd87217f6 SHA256 d97b04408583ff6f297fe5143fc94911cd5e9e01d50c647162f2279cd683c7d2 EBUILD liblightscribe-1.18.6.1-r2.ebuild 3172 RMD160 ffdfe42ad9c125eeaf5a3392290fa2b893d2e79b SHA1 d82c7abee83d81d1ca2adc58bd403c1bb40ce80a SHA256 427c496dbd6823a4ee402d7c7879aece237dbdb5572c8fdb91edfb52d5a107b7 diff --git a/app-cdr/liblightscribe/liblightscribe-1.18.10.2-r1.ebuild b/app-cdr/liblightscribe/liblightscribe-1.18.10.2-r1.ebuild index 12690d1..1132c22 100644 --- a/app-cdr/liblightscribe/liblightscribe-1.18.10.2-r1.ebuild +++ b/app-cdr/liblightscribe/liblightscribe-1.18.10.2-r1.ebuild @@ -8,73 +8,75 @@ inherit eutils rpm multilib SDK_PV=1.18.6.1 -DESCRIPTION="LightScribe System Software (binary only library)." +DESCRIPTION="LightScribe System Software (binary only library)" HOMEPAGE="http://www.lightscribe.com/downloadSection/linux/index.aspx" SRC_URI="http://download.lightscribe.com/ls/lightscribe-${PV}-linux-2.6-intel.rpm http://download.lightscribe.com/ls/lightscribePublicSDK-${SDK_PV}-linux-2.6-intel.rpm" LICENSE="lightscribe lightscribeSDK" SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="multilib -hardened" +KEYWORDS="~amd64 ~x86" +IUSE="multilib" DEPEND="" -RDEPEND="virtual/libc - x86? ( sys-libs/libstdc++-v3 ) +RDEPEND="x86? ( sys-libs/libstdc++-v3 ) amd64? ( sys-libs/libstdc++-v3[multilib] ) !app-cdr/lightscribe" -RESTRICT="mirror strip fetch" +RESTRICT="mirror fetch" -src_unpack() { - rpm_src_unpack -} +S="${WORKDIR}" + +has_multilib_profile && ABI="x86" + +LSDIR="opt/lightscribe/$(get_libdir)" + +QA_PRESTRIPPED=" + ${LSDIR}/liblightscribe.so.0.0.1 + ${LSDIR}/libstdcv3.so.5.0.7" src_prepare() { - # make revdep-rebuild happy - mv "${WORKDIR}"/usr/lib/liblightscribe.so.1 "${WORKDIR}"/usr/lib/liblightscribe.so.0.0.1 + # make revdep-rebuild happy Bug 152031 comment 74 + mv usr/lib/liblightscribe.so.1 usr/lib/liblightscribe.so.0.0.1 # hack in to use provided libstdc++ rename it to libstdcv3 - mv "${WORKDIR}"/usr/lib/lightscribe/libstdc++.so.5.0.7 "${WORKDIR}"/usr/lib/lightscribe/libstdcv3.so.5.0.7 - sed -i "s/libstdc++.so.5/libstdcv3.so.5/g" "${WORKDIR}"/usr/lib/liblightscribe.so.0.0.1 - sed -i "s/libstdc++.so.5/libstdcv3.so.5/g" "${WORKDIR}"/usr/lib/lightscribe/libstdcv3.so.5.0.7 + # can't add an rpath or a LD_PRELOAD to a already build lib to work around + # the libstdc++ "no version information available" problem Bug 152031 comment 66 + mv usr/lib/lightscribe/libstdc++.so.5.0.7 usr/lib/lightscribe/libstdcv3.so.5.0.7 + sed -i "s/libstdc++.so.5/libstdcv3.so.5/g" usr/lib/liblightscribe.so.0.0.1 + sed -i "s/libstdc++.so.5/libstdcv3.so.5/g" usr/lib/lightscribe/libstdcv3.so.5.0.7 } src_compile() { :; } src_install() { - has_multilib_profile && ABI="x86" - - exeinto /opt/lightscribe/$(get_libdir)/lightscribe/updates - doexe "${WORKDIR}"/usr/lib/lightscribe/updates/fallback.sh || die "fallback.sh install failed" - exeinto /opt/lightscribe/$(get_libdir)/lightscribe - doexe "${WORKDIR}"/usr/lib/lightscribe/elcu.sh || die "elcu.sh install failed" + exeinto /${LSDIR}/lightscribe/updates + doexe usr/lib/lightscribe/updates/fallback.sh || die "fallback.sh install failed" + exeinto /${LSDIR}/lightscribe + doexe usr/lib/lightscribe/elcu.sh || die "elcu.sh install failed" into /opt/lightscribe - dolib.so "${WORKDIR}"/usr/lib/liblightscribe.so.* || die "liblightscribe.so.* install failed" - dolib.so "${WORKDIR}"/usr/lib/lightscribe/libstdcv3.so.* || die "libstdcv3.so.* install failed" - dosym liblightscribe.so.0.0.1 /opt/lightscribe/$(get_libdir)/liblightscribe.so.1 - dosym liblightscribe.so.0.0.1 /opt/lightscribe/$(get_libdir)/liblightscribe.so + dolib.so usr/lib/liblightscribe.so.* || die "liblightscribe.so.* install failed" + dolib.so usr/lib/lightscribe/libstdcv3.so.* || die "libstdcv3.so.* install failed" + dosym liblightscribe.so.0.0.1 ${LSDIR}/liblightscribe.so insinto /usr/include/lightscribe - doins -r "${WORKDIR}"/usr/include/* || die "includes install failed" + doins -r usr/include/* || die "includes install failed" insinto /etc - doins -r "${WORKDIR}"/etc/* || die "config install failed" - dosed "s%/usr/lib%/opt/lightscribe/$(get_libdir)%" /etc/lightscribe.rc - dodoc "${WORKDIR}"/usr/share/doc/*.* \ - "${WORKDIR}"/usr/share/doc/lightscribe-sdk/*.* \ - "${WORKDIR}"/usr/share/doc/lightscribe-sdk/docs/* || die "doc install failed" + doins -r etc/* || die "config install failed" + sed -i "s%/usr/lib%${ROOT}${LSDIR}%" "${D}"/etc/lightscribe.rc + dodoc usr/share/doc/*.* \ + usr/share/doc/lightscribe-sdk/*.* \ + usr/share/doc/lightscribe-sdk/docs/* || die "doc install failed" docinto sample/lsprint - dodoc "${WORKDIR}"/usr/share/doc/lightscribe-sdk/sample/lsprint/* || die "lsprint sample install failed" + dodoc usr/share/doc/lightscribe-sdk/sample/lsprint/* || die "lsprint sample install failed" dodir /etc/env.d - echo "LDPATH=/opt/lightscribe/$(get_libdir)" > "${D}"/etc/env.d/80lightscribe + echo "LDPATH=${ROOT}${LSDIR}" > "${D}"/etc/env.d/80lightscribe } pkg_postinst() { - einfo - einfo "This version also support Enhanced Contrast" - einfo "You can activate it by running:" - einfo "/opt/lightscribe/$(get_libdir)/lightscribe/elcu.sh" - einfo + elog "This version also support Enhanced Contrast" + elog "You can activate it by running:" + elog "${ROOT}${LSDIR}/lightscribe/elcu.sh" } pkg_nofetch() { @@ -83,5 +85,5 @@ pkg_nofetch() { einfo " lightscribePublicSDK-${SDK_PV}-linux-2.6-intel.rpm )" einfo "from ${HOMEPAGE} (requires to accept license)" einfo - einfo "Then put the file in ${DISTDIR}" + einfo "Then put the files in ${DISTDIR}" }