diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template index 5e584ac87c2..5afd14eab9f 100644 --- a/srcpkgs/enchant2/template +++ b/srcpkgs/enchant2/template @@ -1,9 +1,8 @@ # Template file for 'enchant2' pkgname=enchant2 version=2.8.2 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-static" hostmakedepends="pkg-config groff" makedepends="libglib-devel hunspell-devel aspell-devel libnuspell-devel libvoikko-devel" short_desc="Generic spell checking library" @@ -14,19 +13,10 @@ changelog="https://raw.githubusercontent.com/rrthomas/enchant/refs/heads/master/ distfiles="https://github.com/rrthomas/enchant/releases/download/v${version}/enchant-${version}.tar.gz" checksum=8f19535adb5577b83b00e02f330fe9b9eb40dd21f19e2899636fc4d3a7696375 make_check=no # tests broken - -libenchant2_package() { - depends="libglib-devel" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/libenchant-2.*" - vmove usr/lib/pkgconfig - } -} +replaces="libenchant2>=0" enchant2-hunspell_package() { - depends="libenchant2>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - hunspell provider" pkg_install() { vmove "usr/lib/enchant-2/enchant_hunspell.so" @@ -34,7 +24,7 @@ enchant2-hunspell_package() { } enchant2-aspell_package() { - depends="libenchant2>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - aspell provider" pkg_install() { vmove "usr/lib/enchant-2/enchant_aspell.so" @@ -42,7 +32,7 @@ enchant2-aspell_package() { } enchant2-nuspell_package() { - depends="libenchant2>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - nuspell provider" pkg_install() { vmove "usr/lib/enchant-2/enchant_nuspell.so" @@ -50,7 +40,7 @@ enchant2-nuspell_package() { } enchant2-voikko_package() { - depends="libenchant2>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - voikko provider" pkg_install() { vmove "usr/lib/enchant-2/enchant_voikko.so" @@ -58,7 +48,13 @@ enchant2-voikko_package() { } enchant2-devel_package() { - depends="libenchant2>=${version}_${revision} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - transitional meta package" - build_style=meta + depends="${sourcepkg}>=${version}_${revision} libglib-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/lib*.so" + vmove "usr/lib/lib*.a" + vmove "/usr/lib/enchant-2/*.a" + vmove usr/lib/pkgconfig + } } diff --git a/srcpkgs/libenchant2 b/srcpkgs/libenchant2 deleted file mode 120000 index de6f1dfe3ae..00000000000 --- a/srcpkgs/libenchant2 +++ /dev/null @@ -1 +0,0 @@ -enchant2 \ No newline at end of file