Attachment #533618 for bug #653078




++ libxslt-1.1.32-r1.ebuild


LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

IUSE="catalogless crypt debug examples python static-libs elibc_Darwin"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

RDEPEND="
	>=dev-libs/libxml2-2.9.1-r5:2[catalogless?,${MULTILIB_USEDEP}]
	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
	python? (
		${PYTHON_DEPS}
		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}"

MULTILIB_CHOST_TOOLS=(
	/usr/bin/xslt-config
)

MULTILIB_WRAPPED_HEADERS=(
	/usr/include/libxslt/xsltconfig.h
)

pkg_setup() {
	MULTILIB_CHOST_TOOLS=(
		/usr/bin/xslt-config
		$(usex catalogless /usr/bin/xslt-catalogless-config "")
	)
}

src_prepare() {
	default


	eapply "${FILESDIR}"/${PV}-simplify-python.patch
	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch

	if use catalogless; then
		cp -pr "${S}" "${S}-catalogless" || die
	fi

	eautoreconf
	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
	# and it is propably otherwise too if upstream generated with new

#	epunt_cxx
	# But Prefix always needs elibtoolize if not eautoreconf'd.
#	elibtoolize

	if use catalogless; then
		pushd "${S}-catalogless" > /dev/null || die
		eapply "${FILESDIR}"/${P}-catalogless.patch
		eapply "${FILESDIR}"/${P}-catalogless-generated.patch
		eautoreconf
		popd > /dev/null || die
	fi
}

multilib_src_configure() {
	libxslt_configure() {
		ECONF_SOURCE="${ECONF_SOURCE-${S}}" econf \
			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
			--with-html-subdir=html \
			$(use_with crypt crypto) \


	libxslt_configure --without-python # build python bindings separately

	if use catalogless; then
		mkdir -p "$(pwd)-catalogless" || die
		pushd "$(pwd)-catalogless" > /dev/null || die
		ECONF_SOURCE="${S}-catalogless" libxslt_configure --without-python
		popd > /dev/null || die
	fi

	if multilib_is_native_abi && use python; then
		python_foreach_impl libxslt_py_configure
	fi


multilib_src_compile() {
	default

	if use catalogless; then
		pushd "$(pwd)-catalogless" > /dev/null || die
		default
		popd > /dev/null || die
	fi

	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
}

multilib_src_test() {
	default

	if use catalogless; then
		pushd "$(pwd)-catalogless" > /dev/null || die
		default
		popd > /dev/null || die
	fi

	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
}


	# "default" does not work here - docs are installed by multilib_src_install_all
	emake DESTDIR="${D}" install

	if use catalogless; then
		pushd "$(pwd)-catalogless" > /dev/null || die
		emake DESTDIR="${D}" install
		popd > /dev/null || die
	fi

	if multilib_is_native_abi && use python; then
		libxslt_foreach_py_emake \
			DESTDIR="${D}" \

Return to bug 653078

Line Link Here

(-)file_not_specified_in_diff (-10 / +52 lines)
0	-- libxslt-1.1.32.ebuild	0	++ libxslt-1.1.32-r1.ebuild
Lines 13-40 Link Here
13		13
14	LICENSE="MIT"	14	LICENSE="MIT"
15	SLOT="0"	15	SLOT="0"
16	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"	16	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
17		17
18	IUSE="crypt debug examples python static-libs elibc_Darwin"	18	IUSE="catalogless crypt debug examples python static-libs elibc_Darwin"
19	REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"	19	REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
20		20
21	RDEPEND="	21	RDEPEND="
22	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]	22	>=dev-libs/libxml2-2.9.1-r5:2[catalogless?,${MULTILIB_USEDEP}]
23	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )	23	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
24	python? (	24	python? (
25	${PYTHON_DEPS}	25	${PYTHON_DEPS}
26	dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )	26	dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
27	"	27	"
28	DEPEND="${RDEPEND}"	28	DEPEND="${RDEPEND}"
29		29
30	MULTILIB_CHOST_TOOLS=(
31	/usr/bin/xslt-config
32	)
33
34	MULTILIB_WRAPPED_HEADERS=(	30	MULTILIB_WRAPPED_HEADERS=(
35	/usr/include/libxslt/xsltconfig.h	31	/usr/include/libxslt/xsltconfig.h
36	)	32	)
37		33
		34	pkg_setup() {
		35	MULTILIB_CHOST_TOOLS=(
		36	/usr/bin/xslt-config
		37	$(usex catalogless /usr/bin/xslt-catalogless-config "")
		38	)
		39	}
		40
38	src_prepare() {	41	src_prepare() {
39	default	42	default
40		43
Lines 45-50 Link Here
45	eapply "${FILESDIR}"/${PV}-simplify-python.patch	48	eapply "${FILESDIR}"/${PV}-simplify-python.patch
46	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch	49	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
47		50
		51	if use catalogless; then
		52	cp -pr "${S}" "${S}-catalogless" \|\| die
		53	fi
		54
48	eautoreconf	55	eautoreconf
49	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary	56	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
50	# and it is propably otherwise too if upstream generated with new	57	# and it is propably otherwise too if upstream generated with new
Lines 52-62 Link Here
52	# epunt_cxx	59	# epunt_cxx
53	# But Prefix always needs elibtoolize if not eautoreconf'd.	60	# But Prefix always needs elibtoolize if not eautoreconf'd.
54	# elibtoolize	61	# elibtoolize
		62
		63	if use catalogless; then
		64	pushd "${S}-catalogless" > /dev/null \|\| die
		65	eapply "${FILESDIR}"/${P}-catalogless.patch
		66	eapply "${FILESDIR}"/${P}-catalogless-generated.patch
		67	eautoreconf
		68	popd > /dev/null \|\| die
		69	fi
55	}	70	}
56		71
57	multilib_src_configure() {	72	multilib_src_configure() {
58	libxslt_configure() {	73	libxslt_configure() {
59	ECONF_SOURCE="${S}" econf \	74	ECONF_SOURCE="${ECONF_SOURCE-${S}}" econf \
60	--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \	75	--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
61	--with-html-subdir=html \	76	--with-html-subdir=html \
62	$(use_with crypt crypto) \	77	$(use_with crypt crypto) \
Lines 73-78 Link Here
73		88
74	libxslt_configure --without-python # build python bindings separately	89	libxslt_configure --without-python # build python bindings separately
75		90
		91	if use catalogless; then
		92	mkdir -p "$(pwd)-catalogless" \|\| die
		93	pushd "$(pwd)-catalogless" > /dev/null \|\| die
		94	ECONF_SOURCE="${S}-catalogless" libxslt_configure --without-python
		95	popd > /dev/null \|\| die
		96	fi
		97
76	if multilib_is_native_abi && use python; then	98	if multilib_is_native_abi && use python; then
77	python_foreach_impl libxslt_py_configure	99	python_foreach_impl libxslt_py_configure
78	fi	100	fi
Lines 80-90 Link Here
80		102
81	multilib_src_compile() {	103	multilib_src_compile() {
82	default	104	default
		105
		106	if use catalogless; then
		107	pushd "$(pwd)-catalogless" > /dev/null \|\| die
		108	default
		109	popd > /dev/null \|\| die
		110	fi
		111
83	multilib_is_native_abi && use python && libxslt_foreach_py_emake all	112	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
84	}	113	}
85		114
86	multilib_src_test() {	115	multilib_src_test() {
87	default	116	default
		117
		118	if use catalogless; then
		119	pushd "$(pwd)-catalogless" > /dev/null \|\| die
		120	default
		121	popd > /dev/null \|\| die
		122	fi
		123
88	multilib_is_native_abi && use python && libxslt_foreach_py_emake test	124	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
89	}	125	}
90		126
Lines 92-97 Link Here
92	# "default" does not work here - docs are installed by multilib_src_install_all	128	# "default" does not work here - docs are installed by multilib_src_install_all
93	emake DESTDIR="${D}" install	129	emake DESTDIR="${D}" install
94		130
		131	if use catalogless; then
		132	pushd "$(pwd)-catalogless" > /dev/null \|\| die
		133	emake DESTDIR="${D}" install
		134	popd > /dev/null \|\| die
		135	fi
		136
95	if multilib_is_native_abi && use python; then	137	if multilib_is_native_abi && use python; then
96	libxslt_foreach_py_emake \	138	libxslt_foreach_py_emake \
97	DESTDIR="${D}" \	139	DESTDIR="${D}" \