app-i18n/canna: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1
johu · Jul 8, 2017 · e9bf929 · e9bf929
1 parent 0420945
commit e9bf929
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 314 deletions.
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -25,23 +25,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
-	epatch "${T}"/${PF}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.patch \
+		"${FILESDIR}"/${PN}-kpdef.patch \
+		"${FILESDIR}"/${PN}-posix-sort.patch
 
-	# bug #248723
-	epatch "${FILESDIR}"/${P}-strip.patch
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
 
 	# Multilib-strict fix for amd64
 	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp || die
-
-	cd "${S}"/dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
 }
 
 src_compile() {

diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -32,23 +32,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
-	epatch "${T}"/${PF}-gentoo.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.patch \
+		"${FILESDIR}"/${PN}-kpdef.patch \
+		"${FILESDIR}"/${PN}-posix-sort.patch
 
-	# bug #248723
-	epatch "${FILESDIR}"/${P}-strip.patch
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
 
 	# Multilib-strict fix for amd64
 	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp || die
-
-	cd "${S}"/dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
 }
 
 src_compile() {

diff --git a/app-i18n/canna/files/canna-3.7-gentoo.diff.in b/app-i18n/canna/files/canna-3.7-gentoo.diff.in
diff --git a/app-i18n/canna/files/canna-3.7_p3-strip.patch b/app-i18n/canna/files/canna-3.7_p3-strip.patch