Merge pull request #120 from maurerpe/master

Fix broken symlinks after merge by using relative paths
stefan-langenmaier · Mar 29, 2024 · 067d282 · 067d282
2 parents 0d05963 + 185c9ce
commit 067d282
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/...0-bin/brother-dcp1510-bin-3.0.1-r2.ebuild → ...0-bin/brother-dcp1510-bin-3.0.1-r3.ebuild b/...0-bin/brother-dcp1510-bin-3.0.1-r2.ebuild → ...0-bin/brother-dcp1510-bin-3.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -49,7 +49,7 @@ src_install() {
 	cp -r opt "${D}" || die
 	cp -r var "${D}" || die
 
-	( ln -s "${D}"opt/brother/Printers/${MODEL^^}/cupswrapper/brother_lpdwrapper_${MODEL^^} "${D}"usr/libexec/cups/filter/brother_lpdwrapper_${MODEL^^} ) || die
+	( ln -s ../../../../opt/brother/Printers/${MODEL^^}/cupswrapper/brother_lpdwrapper_${MODEL^^} "${D}"usr/libexec/cups/filter/brother_lpdwrapper_${MODEL^^} ) || die
 
-	( ln -s "${D}"opt/brother/Printers/${MODEL^^}/cupswrapper/brother-${MODEL^^}-cups-en.ppd "${D}"usr/share/cups/model/Brother/brother_${MODEL}_printer_en.ppd ) || die
+	( ln -s ../../../../../opt/brother/Printers/${MODEL^^}/cupswrapper/brother-${MODEL^^}-cups-en.ppd "${D}"usr/share/cups/model/Brother/brother_${MODEL}_printer_en.ppd ) || die
 }
diff --git a/...-bin/brother-dcp1610w-bin-3.0.1-r1.ebuild → ...-bin/brother-dcp1610w-bin-3.0.1-r2.ebuild b/...-bin/brother-dcp1610w-bin-3.0.1-r1.ebuild → ...-bin/brother-dcp1610w-bin-3.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ src_install() {
 	cp -r opt "${D}" || die
 	cp -r var "${D}" || die
 
-	( ln -s "${D}"opt/brother/Printers/${MODEL^^}/cupswrapper/brother_lpdwrapper_${MODEL^^} "${D}"usr/libexec/cups/filter/brother_lpdwrapper_${MODEL^^} ) || die
+	( ln -s ../../../../opt/brother/Printers/${MODEL^^}/cupswrapper/brother_lpdwrapper_${MODEL^^} "${D}"usr/libexec/cups/filter/brother_lpdwrapper_${MODEL^^} ) || die
 
-	( ln -s "${D}"opt/brother/Printers/${MODEL^^}/cupswrapper/brother-${MODEL^^}-cups-en.ppd "${D}"usr/share/cups/model/Brother/brother_${MODEL}_printer_en.ppd ) || die
+	( ln -s ../../../../../opt/brother/Printers/${MODEL^^}/cupswrapper/brother-${MODEL^^}-cups-en.ppd "${D}"usr/share/cups/model/Brother/brother_${MODEL}_printer_en.ppd ) || die
 }
diff --git a/...bin/brother-dcp9010cn-bin-1.1.2-r2.ebuild → ...bin/brother-dcp9010cn-bin-1.1.2-r3.ebuild b/...bin/brother-dcp9010cn-bin-1.1.2-r2.ebuild → ...bin/brother-dcp9010cn-bin-1.1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ src_install() {
 	sed -n 110,260p "${D}"/opt/brother/Printers/dcp9010cn/cupswrapper/cupswrapperdcp9010cn | sed 's/${printer_model}/dcp9010cn/g;s/${device_model}/Printers/g;s/${printer_name}/DCP9010CN/g;s/\\//g' > "${D}"/usr/libexec/cups/filter/brlpdwrapperdcp9010cn || die
 	chmod 0755 "${D}"/usr/libexec/cups/filter/brlpdwrapperdcp9010cn || die
 
-	( ln -s "${D}"/opt/brother/Printers/dcp9010cn/cupswrapper/brother_dcp9010cn_printer_en.ppd "${D}"/usr/share/cups/model/Brother/brother_dcp9010cn_printer_en.ppd ) || die
+	( ln -s ../../../../../opt/brother/Printers/dcp9010cn/cupswrapper/brother_dcp9010cn_printer_en.ppd "${D}"/usr/share/cups/model/Brother/brother_dcp9010cn_printer_en.ppd ) || die
 }
 
 pkg_postinst() {

diff --git a/...in/brother-dcp9020cdw-bin-1.1.2-r2.ebuild → ...in/brother-dcp9020cdw-bin-1.1.2-r3.ebuild b/...in/brother-dcp9020cdw-bin-1.1.2-r2.ebuild → ...in/brother-dcp9020cdw-bin-1.1.2-r3.ebuild
diff --git a/...in/brother-dcp9022cdw-bin-1.1.3-r1.ebuild → ...in/brother-dcp9022cdw-bin-1.1.3-r2.ebuild b/...in/brother-dcp9022cdw-bin-1.1.3-r1.ebuild → ...in/brother-dcp9022cdw-bin-1.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ src_install() {
 	sed -n 110,260p "${D}"/opt/brother/Printers/dcp9022cdw/cupswrapper/cupswrapperdcp9022cdw | sed 's/${printer_model}/dcp9022cdw/g;s/${device_model}/Printers/g;s/${printer_name}/DCP9022CDW/g;s/\\//g' > "${D}"/usr/libexec/cups/filter/brother_lpdwrapper_dcp9022cdw || die
 	chmod 0755 "${D}"/usr/libexec/cups/filter/brother_lpdwrapper_dcp9022cdw || die
 
-	( ln -s "${D}"/opt/brother/Printers/dcp9022cdw/cupswrapper/brother_dcp9022cdw_printer_en.ppd "${D}"/usr/share/cups/model/Brother/brother_dcp9022cdw_printer_en.ppd ) || die
+	( ln -s ../../../../../opt/brother/Printers/dcp9022cdw/cupswrapper/brother_dcp9022cdw_printer_en.ppd "${D}"/usr/share/cups/model/Brother/brother_dcp9022cdw_printer_en.ppd ) || die
 }
 
 pkg_postinst() {

diff --git a/.../brother-dcp9040cn-bin-1.0.3_p1-r1.ebuild → .../brother-dcp9040cn-bin-1.0.3_p1-r2.ebuild b/.../brother-dcp9040cn-bin-1.0.3_p1-r1.ebuild → .../brother-dcp9040cn-bin-1.0.3_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,7 +67,7 @@ src_install() {
 
 	mkdir -p "${D}/var/spool/lpd" || die
 	mkdir -p "${D}/usr/libexec/cups/filter" || die
-	( ln -s "${D}/usr/lib64/cups/filter/brlpdwrapper${MY_PRINTER}" "${D}/usr/libexec/cups/filter/brlpdwrapper${MY_PRINTER}" ) || die
+	( ln -s "../../../lib64/cups/filter/brlpdwrapper${MY_PRINTER}" "${D}/usr/libexec/cups/filter/brlpdwrapper${MY_PRINTER}" ) || die
 }
 
 pkg_postinst() {

diff --git a/...in/brother-dcp9055cdn-bin-1.1.1-r5.ebuild → ...in/brother-dcp9055cdn-bin-1.1.1-r6.ebuild b/...in/brother-dcp9055cdn-bin-1.1.1-r5.ebuild → ...in/brother-dcp9055cdn-bin-1.1.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,5 +47,5 @@ src_install() {
 	sed -n 94,232p "${D}usr/local/Brother/Printer/${MODEL}/cupswrapper/cupswrapper${MODEL}" | sed 's/${printer_model}/dcp9055cdn/g;s/${device_model}/Printer/g;s/${printer_name}/DCP9055CDN/g;s/\\//g' > "${D}usr"/libexec/cups/filter/brlpdwrapperdcp9055cdn || die
 	chmod 0755 "${D}"usr/libexec/cups/filter/brlpdwrapperdcp9055cdn || die
 
-	( ln -s "${D}"usr/local/Brother/Printer/${MODEL}/cupswrapper/${MODEL}.ppd "${D}"usr/share/cups/model/Brother/brother_${MODEL}_printer_en.ppd ) || die
+	( ln -s ../../../../local/Brother/Printer/${MODEL}/cupswrapper/${MODEL}.ppd "${D}"usr/share/cups/model/Brother/brother_${MODEL}_printer_en.ppd ) || die
 }
diff --git a/...-bin/brother-dcpj715w-bin-1.1.3-r1.ebuild → ...-bin/brother-dcpj715w-bin-1.1.3-r2.ebuild b/...-bin/brother-dcpj715w-bin-1.1.3-r1.ebuild → ...-bin/brother-dcpj715w-bin-1.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -44,5 +44,5 @@ src_install() {
 	cp -r opt "${D}" || die
 	cp -r usr "${D}" || die
 
-	( ln -s "${D}"opt/brother/Printers/dcpj715w/cupswrapper/brother_dcpj715w_printer_en.ppd "${D}"usr/share/cups/model/Brother/brother_dcpj715w_printer_en.ppd ) || die
+	( ln -s ../../../../../opt/brother/Printers/dcpj715w/cupswrapper/brother_dcpj715w_printer_en.ppd "${D}"usr/share/cups/model/Brother/brother_dcpj715w_printer_en.ppd ) || die
 }
diff --git a/...-bin/brother-mfc7820n-bin-2.0.1-r2.ebuild → ...-bin/brother-mfc7820n-bin-2.0.1-r3.ebuild b/...-bin/brother-mfc7820n-bin-2.0.1-r2.ebuild → ...-bin/brother-mfc7820n-bin-2.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,7 +60,7 @@ src_install() {
 
 	mkdir -p "${D}/var/spool/lpd/MFC7820N" || die
 	mkdir -p "${D}/usr/libexec/cups/filter" || die
-	( ln -s "${D}/usr/lib/cups/filter/brlpdwrapperMFC7820N" "${D}usr/libexec/cups/filter/brlpdwrapperMFC7820N" ) || die
+	( ln -s "../../../lib/cups/filter/brlpdwrapperMFC7820N" "${D}usr/libexec/cups/filter/brlpdwrapperMFC7820N" ) || die
 }
 
 pkg_postinst() {

diff --git a/...bin/brother-mfcl3730cdn-bin-1.0-r1.ebuild → ...bin/brother-mfcl3730cdn-bin-1.0-r2.ebuild b/...bin/brother-mfcl3730cdn-bin-1.0-r1.ebuild → ...bin/brother-mfcl3730cdn-bin-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,7 +46,7 @@ src_install() {
 	exeinto opt/brother/Printers/${PRINTER_MODEL}/cupswrapper
 	doexe "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}
 	mkdir -p "${D}/usr/libexec/cups/filter" || die
-	( ln -s "${D}opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}" "${D}/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}" ) || die
+	( ln -s "../../../../opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}" "${D}/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}" ) || die
 
 	insinto usr/share/ppd/Brother
 	doins "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_${PRINTER_MODEL}_printer_en.ppd

diff --git a/...n/brother-mfcl3770cdw-bin-1.0.2-r1.ebuild → ...n/brother-mfcl3770cdw-bin-1.0.2-r2.ebuild b/...n/brother-mfcl3770cdw-bin-1.0.2-r1.ebuild → ...n/brother-mfcl3770cdw-bin-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,7 +52,7 @@ src_install() {
 	exeinto opt/brother/Printers/${PRINTER_MODEL}/cupswrapper
 	doexe "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}
 	mkdir -p "${D}/usr/libexec/cups/filter" || die
-	( ln -s "${D}/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}" "${D}/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}" ) || die
+	( ln -s "../../../../opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}" "${D}/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}" ) || die
 
 	insinto usr/share/ppd/Brother
 	doins "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_${PRINTER_MODEL}_printer_en.ppd

diff --git a/...n/brother-mfcl8900cdw-bin-1.2.0-r1.ebuild → ...n/brother-mfcl8900cdw-bin-1.2.0-r2.ebuild b/...n/brother-mfcl8900cdw-bin-1.2.0-r1.ebuild → ...n/brother-mfcl8900cdw-bin-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ src_install() {
 	exeinto opt/brother/Printers/${PRINTER_MODEL}/cupswrapper
 	doexe "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}
 	mkdir -p "${D}/usr/libexec/cups/filter" || die
-	( ln -s "${D}opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}" "${D}/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}" ) || die
+	( ln -s "../../../../opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}" "${D}/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}" ) || die
 
 	insinto usr/share/ppd/Brother
 	doins "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_${PRINTER_MODEL}_printer_en.ppd