Fix calcboot patching

sys-boot/calcboot/Manifest

@@ -2,6 +2,8 @@ AUX syslinux-3.72-nopie.patch 412 RMD160 57ff5acb7ea790bb711d4a4b1bc44ab4a94ce2a
 AUX syslinux-3.72-nostrip.patch 1230 RMD160 c22a5b7fce9aff1ef235b57133fc3a0831183bb5 SHA1 55e7bcbbfc14dc9f3f9faf48cdb2c49d0072c150 SHA256 9c32ee6f7fa24c2cbf00088963454ee8d761fed9065f5353737a97c2edc2f416
 AUX syslinux-3.86-nopie.patch 551 RMD160 9facd00e8b1fb60affa4efd6622d6cecaaf3b615 SHA1 6ee3cb73478896759adff35060adebad45c2bb6c SHA256 90c3173728f6b3efef6fe9865d64bd571a7638537f51fae0cda14df5c7d9a39b
 AUX syslinux-4.00-nopie.patch 527 RMD160 485901ad3c55f50c3e3795efd5d2c5b18a406a5a SHA1 44152e5e2afd2d032e148349898ee78d3d9b1eb1 SHA256 d0d4834043d52f73969ca60eb37729ee44d866ecddf13bceacd7c71147698323
+AUX syslinux-4.05-asneeded-linking-order.patch 380 RMD160 77af89c19745f11ddc4a20c95dc4fb9b1c18d729 SHA1 8deeb58db51c63dc2646cb534ae3b553e5ef7b4c SHA256 f4bdd9a519509e6ab18963841475b3bbf56b00c7467587a61f4881a7b7af06c1
+AUX syslinux-4.05-nopie.patch 519 RMD160 a9b05830bef6413d3dd1a95a465bf8ccf9d5a615 SHA1 95d43f2243ca9fba1559837f2c55d0bfe404204c SHA256 2780aa55dec67a2375e28579392ed9658c4d47d0c47e4c43c22371dc926c47fc
 DIST calcboot-3.75.4.tar.bz2 144044 RMD160 d859d004d3f75c37d4ef5cff762a7813bf845ad9 SHA1 dae7a42c674b6f09557838db3d664859d7b738f9 SHA256 1615409cc254e3a2960b70f04c9417bfc4cf9c67db8eec64d6c8ed9cdd702862
 DIST calcboot-3.83.0.tar.bz2 144076 RMD160 758be59ca9576b0632da003cf05a691eefd6cf09 SHA1 de8b1dddc086988924cbcf90e61136d5f6c69a62 SHA256 93dfbf7a0204209910bc9df5b39f6e5bfad02aaf37f41bf14ddfb69719a3373a
 DIST calcboot-3.86.1.tar.bz2 45760 RMD160 3d2c151a35117b6163ff028bef9603370574d609 SHA1 fac0e326db2b319f1535c74aa95369b75c756acf SHA256 121532af10b2fa56036c0bbfa6d6389aab6d283e698d3758703a5909750e2f2b
@@ -30,6 +32,6 @@ EBUILD calcboot-3.86.6.ebuild 1623 RMD160 9b44e697c4b9111fa30945ca6784e6551282a8
 EBUILD calcboot-4.03.1-r1.ebuild 1564 RMD160 efc47e6133498d67507d4c514cf330a685662e81 SHA1 ececdf7689033e86bb3adbf254a1a02ba606ffe6 SHA256 1699b43948813e4258fadd7a864a09cd7db4725dde52905f3ff9512b120ab672
 EBUILD calcboot-4.03.2.ebuild 1564 RMD160 efc47e6133498d67507d4c514cf330a685662e81 SHA1 ececdf7689033e86bb3adbf254a1a02ba606ffe6 SHA256 1699b43948813e4258fadd7a864a09cd7db4725dde52905f3ff9512b120ab672
 EBUILD calcboot-4.03.3.ebuild 1564 RMD160 efc47e6133498d67507d4c514cf330a685662e81 SHA1 ececdf7689033e86bb3adbf254a1a02ba606ffe6 SHA256 1699b43948813e4258fadd7a864a09cd7db4725dde52905f3ff9512b120ab672
-EBUILD calcboot-4.05.0.ebuild 1564 RMD160 efc47e6133498d67507d4c514cf330a685662e81 SHA1 ececdf7689033e86bb3adbf254a1a02ba606ffe6 SHA256 1699b43948813e4258fadd7a864a09cd7db4725dde52905f3ff9512b120ab672
+EBUILD calcboot-4.05.0.ebuild 1664 RMD160 963f552624a2bef354e37eb9ac2958a71bf8a28f SHA1 e23c03196a2a7091c861c655f24e6e55babf317c SHA256 37a094f87043e3e01778080bf4865599b684b0231900333f59f4fb1961e6ea7b
 MISC ChangeLog 2019 RMD160 a562d240e0674a97b3049b784e0869f4eb576c05 SHA1 d0c243327232d14913eb14ac84248751698b6c13 SHA256 a012728883162f61b689acfaf68a5615beea72f0a96c57289972ca97d0f9684b
 MISC metadata.xml 261 RMD160 ed68f22b54f1d3b3cb685a96293a9dd45960c953 SHA1 375d7e268702a33cf5defb5c8862e1c4e7a11e6f SHA256 10035bd608f875cebb30a9820a360e282ff4e31dae8e3837fa1acb0d7831dd6c

sys-boot/calcboot/calcboot-4.05.0.ebuild

@@ -38,8 +38,10 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 	cd ../..
 	# Fix building on hardened
-	pwd
-	epatch "${FILESDIR}"/${SYSLINUX_PN}-4.00-nopie.patch
+	epatch "${FILESDIR}"/${SYSLINUX_PN}-4.05-nopie.patch
+
+	# Fix building with --as-needed
+	epatch "${FILESDIR}"/${SYSLINUX_PN}-4.05-asneeded-linking-order.patch
 
 	rm -f gethostip #bug 137081
 }

sys-boot/calcboot/files/syslinux-4.05-asneeded-linking-order.patch

@@ -0,0 +1,12 @@
+diff -ur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile	2011-12-09 19:28:17.000000000 +0100
++++ b/utils/Makefile	2011-12-18 20:56:24.306014471 +0100
+@@ -51,7 +51,7 @@
+ 	$(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@
+ 
+ isohybrid: isohybrid.o isohdpfx.o
+-	$(CC) $(LDFLAGS) -luuid -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ -luuid
+ 
+ gethostip: gethostip.o
+ 	$(CC) $(LDFLAGS) -o $@ $^

sys-boot/calcboot/files/syslinux-4.05-nopie.patch

@@ -0,0 +1,12 @@
+diff -ur a/mk/com32.mk b/mk/com32.mk
+--- a/mk/com32.mk	2011-12-09 19:28:17.000000000 +0100
++++ b/mk/com32.mk	2011-12-18 18:22:11.032342645 +0100
+@@ -24,6 +24,8 @@
+ GCCOPT += $(call gcc_ok,-freg-struct-return,)
+ GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
+ GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
++GCCOPT += $(call gcc_ok,-nopie,)
++GCCOPT += $(call gcc_ok,-fno-pie,)
+ GCCOPT += $(call gcc_ok,-fno-exceptions,)
+ GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
+ GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)