Merge updates from master

This commit is contained in:
Repository QA checks
2015-09-12 01:47:20 -04:00
3 changed files with 7 additions and 8 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ fi
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="doc static-libs"
RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+1 -1
View File
@@ -14,7 +14,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
KEYWORDS="~amd64 hppa ~x86"
IUSE="doc"
RDEPEND="
+5 -6
View File
@@ -39,15 +39,14 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-4.2.0-sharedlibs.patch
# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
# Clear out -static from all flags since we want to link against dynamic xfs libs.
sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
include/builddefs.in || die
sed -i \
-e '1iLLDFLAGS = -static' \
{estimate,fsr}/Makefile || die
sed -i \
-e "/LLDFLAGS/s:-static-libtool-libs:$(use static && echo -all-static):" \
$(find -name Makefile) || die
find -name Makefile -exec \
sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
# libdisk has broken blkid conditional checking
sed -i \