gentoo auto-resync : 23:10:2023 - 08:35:49

5 files changed, 58 insertions, 10 deletions

diff --git a/dev-haskell/iproute/Manifest b/dev-haskell/iproute/Manifest
index 78f8d54e1f09..4f91406801e6 100644
--- a/dev-haskell/iproute/Manifest
+++ b/dev-haskell/iproute/Manifest
@@ -1,3 +1,6 @@
+AUX iproute-1.7.12-package-imports.patch 651 BLAKE2B fded4016ad62851ad8ea8324da0efe491e36e7711830148944b8f35cf73e7dc487f876a332e7d7d8930d1ee5ee3efe7c0bcbdf75ca07e3f1c7a8674b80e6461e SHA512 400a4a7d9fac4cc8167f8c9f2ea66f61fad8b8218bdf5fc6e15586edfdcac66bfe288f73ddc3564d848930a1c5b4e4d32b65f29a451fb0ae805f8bb81f4a6a04
+DIST iproute-1.7.12.tar.gz 17864 BLAKE2B ac69d90c43415602f52d69de69d3c044cf1908eeadb60266ccc629f8589e53a6cae27a32ad990595f65055f97fd597ca81eda83d34f909d8a0ee1f151edf6d0b SHA512 45d60e98e0a18929472d3de8850a257e21a638b3052fc31afc960c0ea755092bf44e44a1b0fae175582c1bcbda6029af028e84ba1498fe6491d925173cf310b7
 DIST iproute-1.7.8.tar.gz 13309 BLAKE2B 8d6bef341643e4f096399fcba595e339d63b056aca086434fdbb906688c5720fb556ac17cbaf0c0ff851bd44133e97643a03f35db837065268f0d791222616fa SHA512 ee1bd24a560ee73757ca71eda70a610d5c8e01101c22835bbef23ec7a2217ed66a37b49d5fc3042f3df0e943aaeda2a050e75316ff2ac11602b745cbf7d7ca6a
-EBUILD iproute-1.7.8.ebuild 863 BLAKE2B 26dbae56451d290dad1e2d6f7c50205485f093a0cbb86337d21fa6b675006a7aaced70c9ae4e357c9f449a286a58da46683dec8789a0e4fafa4e886653177240 SHA512 cf1c70c2bd75a6edb73746566c951ada0257528c8184789fae20b29831aeffee397d29cdba42da9ac2934a6ced25692a916c0b2fde2ec26d295367bc5f616d0f
-MISC metadata.xml 475 BLAKE2B 466ccef6af3280b0447833ce6c2c77cc5f8774a9512ca3d7bb6409af0ad7f90001d533e9d59d2bc7c9f8444d4894204f9ba8850007572c517488635b04913528 SHA512 53b5ad4eb0dbc5b7b9ca8b424018b8df76cbc6e60c60f7a1f0eb540d4c3906876f3f24c34240093a7aa2d5e8bbb50a330e7a5f02253672b4e0aae674aad6b5f4
+EBUILD iproute-1.7.12.ebuild 809 BLAKE2B d7819c81944f11a0de57c120d33156c11f43cb92f830d01f162d80651f2f021e1d762624184bf374d4581cf55a262da290c58d853f53d103cff5c646050e12c7 SHA512 59c1ecc8765d393d62fa2a40c73f001db998048632f9b81c5f22050720980c36b4abdedf991442e25030eac6411f90744148f8936901a45890ec50b29ce32a61
+EBUILD iproute-1.7.8.ebuild 863 BLAKE2B ec1bb51fcff393c40c29afed65369b4f5d9ca264638822ed91fb29a8f4d10653e43bc546fd2a6b1a1319c0336708b47d0580bd3924fa3a258e26c167f7cb0dce SHA512 07e22d5c69ea69c6ae3cf24fc737d38f017685e82540fb2192aa0daefe3d4fd6271419ff97981b5a36a864f06bc124d58e6d53bf4220ebcf23772049afbf9bb8
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch b/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch
new file mode 100644
index 000000000000..f7f88a6cedd4
--- /dev/null
+++ b/dev-haskell/iproute/files/iproute-1.7.12-package-imports.patch
@@ -0,0 +1,20 @@
+diff -urN iproute-1.7.12/Data/IP/Addr.hs iproute-1.7.12-r1/Data/IP/Addr.hs
+--- iproute-1.7.12/Data/IP/Addr.hs	2001-09-08 19:46:40.000000000 -0600
++++ iproute-1.7.12-r1/Data/IP/Addr.hs	2022-01-15 10:13:21.758588845 -0700
+@@ -1,6 +1,7 @@
+ {-# LANGUAGE BangPatterns #-}
+ {-# LANGUAGE DeriveDataTypeable #-}
+ {-# LANGUAGE DeriveGeneric      #-}
++{-# LANGUAGE PackageImports     #-}
+ 
+ module Data.IP.Addr where
+ 
+@@ -14,7 +15,7 @@
+ import Data.Word
+ import Network.Socket
+ import Numeric (showHex, showInt)
+-import System.ByteOrder
++import "byteorder" System.ByteOrder
+ import Text.Appar.String
+ import GHC.Enum (succError,predError)
+ import GHC.Generics
diff --git a/dev-haskell/iproute/iproute-1.7.12.ebuild b/dev-haskell/iproute/iproute-1.7.12.ebuild
new file mode 100644
index 000000000000..9d3683101441
--- /dev/null
+++ b/dev-haskell/iproute/iproute-1.7.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="IP Routing Table"
+HOMEPAGE="https://www.mew.org/~kazu/proj/iproute/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.12-package-imports.patch" )
+
+RDEPEND="dev-haskell/appar:=[profile?]
+	dev-haskell/byteorder:=[profile?]
+	dev-haskell/network:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/doctest-0.9.3
+		dev-haskell/hspec
+		dev-haskell/quickcheck
+		dev-haskell/safe )
+"
diff --git a/dev-haskell/iproute/iproute-1.7.8.ebuild b/dev-haskell/iproute/iproute-1.7.8.ebuild
index c6a613f4976a..316f54e8548a 100644
--- a/dev-haskell/iproute/iproute-1.7.8.ebuild
+++ b/dev-haskell/iproute/iproute-1.7.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # ebuild generated by hackport 0.6.3
 
diff --git a/dev-haskell/iproute/metadata.xml b/dev-haskell/iproute/metadata.xml
index 429df5ba18d3..937381521944 100644
--- a/dev-haskell/iproute/metadata.xml
+++ b/dev-haskell/iproute/metadata.xml
@@ -5,11 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		IP Routing Table is a tree of IP ranges
-		to search one of them on the longest
-		match base. It is a kind of TRIE with one
-		way branching removed. Both IPv4 and IPv6
-		are supported.
-	</longdescription>
 </pkgmetadata>