Attachment #866380 for bug #909565

View | Details | Raw Unified | Return to bug 909565
Collapse All | Expand All

Lines 1-2 Link Here

(-)a/net-irc/weechat/Manifest (+2 lines)
1	DIST weechat-3.8.tar.xz 2777420 BLAKE2B 46a2c2c5f14f1c47c0ef2c7591549e4568c1777a70c571ab6d0e5938685262a0806c1fd301eb0d840245b7df2c42a69b089d6eac82706ae5b2a8e590a910080a SHA512 f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516	1	DIST weechat-3.8.tar.xz 2777420 BLAKE2B 46a2c2c5f14f1c47c0ef2c7591549e4568c1777a70c571ab6d0e5938685262a0806c1fd301eb0d840245b7df2c42a69b089d6eac82706ae5b2a8e590a910080a SHA512 f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516
2	DIST weechat-3.8.tar.xz.asc 833 BLAKE2B 3db6467d5a47b86df7eca237bf2def812666fed42b9c1b968760e4999f785ba65fe84be61ae152ac5d5a3fa85953b5442f515afc244249fbc15ff94ca2a06147 SHA512 61154ef33aeb1155004975ee6688d5dcb427e0670e7463549ed0157de7be61309abb5dbad419bceb596e11f494e41a00b72e6f908ed9f02525660f7155dcc2ec	2	DIST weechat-3.8.tar.xz.asc 833 BLAKE2B 3db6467d5a47b86df7eca237bf2def812666fed42b9c1b968760e4999f785ba65fe84be61ae152ac5d5a3fa85953b5442f515afc244249fbc15ff94ca2a06147 SHA512 61154ef33aeb1155004975ee6688d5dcb427e0670e7463549ed0157de7be61309abb5dbad419bceb596e11f494e41a00b72e6f908ed9f02525660f7155dcc2ec
		3	DIST weechat-4.0.2.tar.xz 2573044 BLAKE2B 17da7769dc40885565d4932910920a4d3b23736fc244063d548e50109dc101ae63287e5467368b40ef3b835b3ef7d55f901bc7d2dfcbad59772afdd340532001 SHA512 271c22cba68fdb5efd14c4111ea9b7f44f2c95282cb7cac10a42432b195aadf5a081831853243ed09535df25d95b30c0d57b23c84d24c3665ae8393bc76db4d5
		4	DIST weechat-4.0.2.tar.xz.asc 833 BLAKE2B 92e1a2efb9a7e5cd94a0266d5980c88ed1d93ab7e6003c2d9f28b460e805505d6094d461534782fc6e80a366cb5fb6f12ddf8fc41d29fa7ffad5b343ccc06ac3 SHA512 c2ab90223d5bac8551a0b95480b0ccecfbb7c199f4d8a6f8dc4e6b21c78fadb22a7feb7c53c052d3a67ba34cbaf4e7faea83cdd2df5f0dd325aee0d3e4375139




		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
fi

DESCRIPTION="Portable and multi-interface IRC client"

		|| (
			dev-lang/ruby:3.1
			dev-lang/ruby:3.0
			dev-lang/ruby:2.7
		)
	)
	selinux? ( sec-policy/selinux-irc )


PATCHES=(
	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
	"${FILESDIR}"/${PN}-3.8-gettext-0.22.patch
)

DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"

	done

	# install only required documentation ; en always
	local j
	for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \
			| sed -e 's/.*set(\(\w\+\).*/\1/'); do
		for j in $(grep set.${i} doc/CMakeLists.txt \
				| sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do
			if ! has ${j} ${LINGUAS-${j}} ; then
				sed -i \
					-e "s/\(set(${i}.*\) ${j}/\1/" \
					doc/CMakeLists.txt || die
			fi
		done
	done

	# install docs in correct directory
	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die

	if [[ ${CHOST} == *-darwin* ]]; then
		# fix linking error on Darwin

		-DENABLE_ALIAS=$(usex alias)
		-DENABLE_BUFLIST=$(usex buflist)
		-DENABLE_CHARSET=$(usex charset)
		# -DENABLE_DOC requires all plugins (except javascript).
		# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
		# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
		-DENABLE_DOC=OFF
		-DENABLE_DOC_INCOMPLETE=$(usex doc)
		-DENABLE_ENCHANT=$(usex enchant)
		-DENABLE_EXEC=$(usex exec)
		-DENABLE_FIFO=$(usex fifo)




		|| (
			dev-lang/ruby:3.1
			dev-lang/ruby:3.0
			dev-lang/ruby:2.7
		)
	)
	selinux? ( sec-policy/selinux-irc )

	done

	# install only required documentation ; en always
	local j
	for i in $(grep -e 'set(.*en.*)$' doc/CMakeLists.txt \
			| sed -e 's/.*set(\(\w\+\).*/\1/'); do
		for j in $(grep set.${i} doc/CMakeLists.txt \
				| sed -e "s/.*${i}\(.*\)).*/\1/" -e 's/ en//'); do
			if ! has ${j} ${LINGUAS-${j}} ; then
				sed -i \
					-e "s/\(set(${i}.*\) ${j}/\1/" \
					doc/CMakeLists.txt || die
			fi
		done
	done

	# install docs in correct directory
	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt || die

	if [[ ${CHOST} == *-darwin* ]]; then
		# fix linking error on Darwin

		-DENABLE_ALIAS=$(usex alias)
		-DENABLE_BUFLIST=$(usex buflist)
		-DENABLE_CHARSET=$(usex charset)
		# -DENABLE_DOC requires all plugins (except javascript).
		# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
		# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
		-DENABLE_DOC=OFF
		-DENABLE_DOC_INCOMPLETE=$(usex doc)
		-DENABLE_ENCHANT=$(usex enchant)
		-DENABLE_EXEC=$(usex exec)
		-DENABLE_FIFO=$(usex fifo)

Return to bug 909565

Lines 17-23 else Link Here

(-)a/net-irc/weechat/weechat-3.8.ebuild (-12 / +18 lines)
17	verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"	17	verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
18	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc	18	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
19	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"	19	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
20	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"	20	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
21	fi	21	fi
22		22
23	DESCRIPTION="Portable and multi-interface IRC client"	23	DESCRIPTION="Portable and multi-interface IRC client"
Lines 58-64 RDEPEND=" Link Here
58	\|\| (	58	\|\| (
59	dev-lang/ruby:3.1	59	dev-lang/ruby:3.1
60	dev-lang/ruby:3.0	60	dev-lang/ruby:3.0
61	dev-lang/ruby:2.7
62	)	61	)
63	)	62	)
64	selinux? ( sec-policy/selinux-irc )	63	selinux? ( sec-policy/selinux-irc )
Lines 82-88 BDEPEND+=" Link Here
82		81
83	PATCHES=(	82	PATCHES=(
84	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch	83	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
85	"${FILESDIR}"/${PN}-3.8-gettext-0.22.patch
86	)	84	)
87		85
88	DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"	86	DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
Lines 108-124 src_prepare() { Link Here
108	done	106	done
109		107
110	# install only required documentation ; en always	108	# install only required documentation ; en always
111	for i in $(grep add_subdirectory doc/CMakeLists.txt \	109	local j
112	\| sed -e 's/.add_subdirectory(\(..\))./\1/' -e '/en/d'); do	110	for i in $(grep -e 'set(.en.)$' doc/CMakeLists.txt \
113	if ! has ${i} ${LINGUAS-${i}} ; then	111	\| sed -e 's/.set(\(\w\+\)./\1/'); do
114	sed -i \	112	for j in $(grep set.${i} doc/CMakeLists.txt \
115	-e '/add_subdirectory('${i}')/d' \	113	\| sed -e "s/.${i}\(.\)).*/\1/" -e 's/ en//'); do
116	doc/CMakeLists.txt \|\| die	114	if ! has ${j} ${LINGUAS-${j}} ; then
117	fi	115	sed -i \
		116	-e "s/\(set(${i}.*\) ${j}/\1/" \
		117	doc/CMakeLists.txt \|\| die
		118	fi
		119	done
118	done	120	done
119		121
120	# install docs in correct directory	122	# install docs in correct directory
121	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt \|\| die	123	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt \|\| die
122		124
123	if [[ ${CHOST} == -darwin ]]; then	125	if [[ ${CHOST} == -darwin ]]; then
124	# fix linking error on Darwin	126	# fix linking error on Darwin
Lines 140-146 src_configure() { Link Here
140	-DENABLE_ALIAS=$(usex alias)	142	-DENABLE_ALIAS=$(usex alias)
141	-DENABLE_BUFLIST=$(usex buflist)	143	-DENABLE_BUFLIST=$(usex buflist)
142	-DENABLE_CHARSET=$(usex charset)	144	-DENABLE_CHARSET=$(usex charset)
143	-DENABLE_DOC=$(usex doc)	145	# -DENABLE_DOC requires all plugins (except javascript).
		146	# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
		147	# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
		148	-DENABLE_DOC=OFF
		149	-DENABLE_DOC_INCOMPLETE=$(usex doc)
144	-DENABLE_ENCHANT=$(usex enchant)	150	-DENABLE_ENCHANT=$(usex enchant)
145	-DENABLE_EXEC=$(usex exec)	151	-DENABLE_EXEC=$(usex exec)
146	-DENABLE_FIFO=$(usex fifo)	152	-DENABLE_FIFO=$(usex fifo)

Lines 58-64 RDEPEND=" Link Here

(-)a/net-irc/weechat/weechat-9999.ebuild (-10 / +17 lines)
58	\|\| (	58	\|\| (
59	dev-lang/ruby:3.1	59	dev-lang/ruby:3.1
60	dev-lang/ruby:3.0	60	dev-lang/ruby:3.0
61	dev-lang/ruby:2.7
62	)	61	)
63	)	62	)
64	selinux? ( sec-policy/selinux-irc )	63	selinux? ( sec-policy/selinux-irc )
Lines 107-123 src_prepare() { Link Here
107	done	106	done
108		107
109	# install only required documentation ; en always	108	# install only required documentation ; en always
110	for i in $(grep add_subdirectory doc/CMakeLists.txt \	109	local j
111	\| sed -e 's/.add_subdirectory(\(..\))./\1/' -e '/en/d'); do	110	for i in $(grep -e 'set(.en.)$' doc/CMakeLists.txt \
112	if ! has ${i} ${LINGUAS-${i}} ; then	111	\| sed -e 's/.set(\(\w\+\)./\1/'); do
113	sed -i \	112	for j in $(grep set.${i} doc/CMakeLists.txt \
114	-e '/add_subdirectory('${i}')/d' \	113	\| sed -e "s/.${i}\(.\)).*/\1/" -e 's/ en//'); do
115	doc/CMakeLists.txt \|\| die	114	if ! has ${j} ${LINGUAS-${j}} ; then
116	fi	115	sed -i \
		116	-e "s/\(set(${i}.*\) ${j}/\1/" \
		117	doc/CMakeLists.txt \|\| die
		118	fi
		119	done
117	done	120	done
118		121
119	# install docs in correct directory	122	# install docs in correct directory
120	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/*/CMakeLists.txt \|\| die	123	sed -i "s#\${DATAROOTDIR}/doc/\${PROJECT_NAME}#\0-${PVR}/html#" doc/CMakeLists.txt \|\| die
121		124
122	if [[ ${CHOST} == -darwin ]]; then	125	if [[ ${CHOST} == -darwin ]]; then
123	# fix linking error on Darwin	126	# fix linking error on Darwin
Lines 139-145 src_configure() { Link Here
139	-DENABLE_ALIAS=$(usex alias)	142	-DENABLE_ALIAS=$(usex alias)
140	-DENABLE_BUFLIST=$(usex buflist)	143	-DENABLE_BUFLIST=$(usex buflist)
141	-DENABLE_CHARSET=$(usex charset)	144	-DENABLE_CHARSET=$(usex charset)
142	-DENABLE_DOC=$(usex doc)	145	# -DENABLE_DOC requires all plugins (except javascript).
		146	# https://github.com/weechat/weechat/blob/v4.0.2/CMakeLists.txt#L144
		147	# Impossible since php was dropped in net-irc/weechat-3.5.r1.ebuild. bug #705702
		148	-DENABLE_DOC=OFF
		149	-DENABLE_DOC_INCOMPLETE=$(usex doc)
143	-DENABLE_ENCHANT=$(usex enchant)	150	-DENABLE_ENCHANT=$(usex enchant)
144	-DENABLE_EXEC=$(usex exec)	151	-DENABLE_EXEC=$(usex exec)
145	-DENABLE_FIFO=$(usex fifo)	152	-DENABLE_FIFO=$(usex fifo)