portage-overlay.git Changeset - f461dc98ec67

Changeset - f461dc98ec67

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Chel Sea (chain) - 8 years ago 2016-11-16 11:39:59
chain@rpgfiction.net

fix VERSION.swift not being shipped in 3.0

2 files changed with 6 insertions and 1 deletions:

net-im/swift/Manifest

net-im/swift/swift-3.0.ebuild

0 comments (0 inline, 0 general)

net-im/swift/Manifest

➞

Show inline comments

 DIST swift-3.0.tar.bz2 8260588 SHA256 2e48f081d337f471b4eba7c0c807a7b640216a76ed3568ced55abb5b927c7fd2 SHA512 8ba734af34333fa836480ee647949e2f5e89d053bc41c0f96af85779a89930355ca88b690bbee62f215fae723a2473ecf5e278435754b3cde475b81f5f4f18e5 WHIRLPOOL 9f529b3f43362ca84bed52caa739201d683a47ad2ce5fa31329975e421693eec8de1ad7a7ab60f4d36bae4377a03eb3330e40c349ee0f6c6b02beb10e3a6d640
-EBUILD swift-3.0.ebuild 4710 SHA256 33cd745dd8c40032faff2b81a939636dcabd9c75fd1a5a264002eaad4bc9b504 SHA512 8df4fa3a82fe19564abf06c9c25649b1adaf8745b512c061b51bb4e1cb21cc1042e4c40dfae9dd76c8f04950f27c9978d00a7c8722c846f9331b825cb7fe8130 WHIRLPOOL 21d46f4bfe3cc5741f516c1fe71ed68a6ebf1988ea158daa6215fb1a0762095ed1d64942f1585821ee27bac8b39696d2003004f2834b6bcf5b1ea4086f78cdae
+EBUILD swift-3.0.ebuild 4864 SHA256 20f50fef5130a02d0052d48b4b7b438bcb81f3e858d947398d2f6d1f94fa8253 SHA512 9d390d94759005b6e686500b4812d4299ebb3d326b7f10a301d794da2aa7a3ddd55ff9effa479dc435f6e459ab55fc4a70f5f3576e98aa84cf7302075045185a WHIRLPOOL cb9be4effde8c19a914cc6d590d6de6ba79ac2b0d5684fde8a0297bcf1e93ecdc4c1f2cfbe8a57eca237a299643aac4b0e89f74e94478b6ae1bde52b7ba75851

net-im/swift/swift-3.0.ebuild

➞

Show inline comments

@@ @@ -79,96 +79,101 @@ set_scons_targets() { @@
 	use scripting && scons_targets+=( Sluift )
 	use tests && scons_targets+=( Swiften/QA )
 	use zeroconf && scons_targets+=( Limber Slimber )
+}
 scons_vars=()
 set_scons_vars() {
 	scons_vars=(
 		V=1
 		allow_warnings=1
 		cc="$(tc-getCC)"
 		cxx="$(tc-getCXX)"
 		ccflags="${CXXFLAGS}"
 		linkflags="${LDFLAGS}"
 		debug=$(usex debug)
 		doc=$(usex doc)
 		docbook_xsl="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets"
 		docbook_xml="${EPREFIX}/usr/share/sgml/docbook/xml-dtd-4.5"
 		hunspell_enable=$(usex hunspell)
 		icu=$(usex icu)
 		need_idn=$(usex idn)
 		openssl=$(usex ssl ${EPREFIX}/usr)
 		swiften_dll=$(usex !static-libs)
 		test=$(usex tests all none)
 		try_avahi=$(usex zeroconf)
 		try_expat=$(usex expat)
 		try_gconf=$(usex gconf)
 		try_libxml=$(usex !expat)
+	)
+}
 scons_install_vars=()
 set_scons_install_vars() {
 	scons_install_vars=(
 		force-configure=0
 		SWIFTEN_INSTALLDIR="${ED}/usr"
+	)
 	use qt4 && scons_install_vars+=( SWIFT_INSTALLDIR="${ED}/usr" )
 	use scripting && scons_install_vars+=( SLUIFT_INSTALLDIR="${ED}/usr" )
+}
 src_prepare() {
 	# TODO drop this patch for >net-im/swift-4.0_beta2
 #	if [[ ${PV} != *9999* ]] ; then
 #		epatch "${FILESDIR}/scons-qtchooser-env.patch"
 #	fi
 	# chain <chain@rpgfiction.net>: VERSION.swift missing, let's create one!
 	if [ ! -e ${S}/VERSION.swift ]; then
 		echo -n ${PV} > ${S}/VERSION.swift
 	fi
 	rm -fr 3rdParty || die
 	for x in ${LANGS}; do
 		if use !linguas_${x}; then
 			rm -f Swift/Translations/swift_${x}.ts || die
 		fi
 	done
 	if use !qt4; then
 		rm -rf Swift || die
 	fi
 	if use !scripting; then
 		rm -rf Sluift || die
 	fi
 	if use !zeroconf; then
 		rm -rf Limber Slimber || die
 	fi
 	eapply_user
+}
 src_compile() {
 	set_scons_targets
 	set_scons_vars
 	escons "${scons_vars[@]}" "${scons_targets[@]}"
+}
 src_test() {
 	set_scons_targets
 	set_scons_vars
 	escons "${scons_vars[@]}" test=unit QA
+}
 src_install() {
 	set_scons_targets
 	set_scons_vars
 	set_scons_install_vars
 	escons "${scons_vars[@]}" \
 		"${scons_install_vars[@]}" \
 		"${ED}" "${scons_targets[@]}"
 	if use zeroconf; then
 		dobin Limber/limber

0 comments (0 inline, 0 general)