gentoo auto-resync : 28:12:2023 - 19:37:44

10 files changed, 7 insertions, 184 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 66fb8eb08373..af977d2de2a2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 2030db65938f..0633b9a5332c 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -2,7 +2,7 @@ AUX dbus-broker-33-strict-aliasing.patch 10322 BLAKE2B b89244315d09621876fcdc4b6
 DIST dbus-broker-33.tar.xz 253172 BLAKE2B 2b1773999af5caa435acb9dca848c96863b8d738dee6c3542e492d031555c0251a07d371465cd5dc071c0198b33251bf8233f18ddaa7ae34dc9b5df938ca9298 SHA512 776684a5d19a6c25fc46dff19821014a32d967f8132385b86c5281f2d69192dce64b3ad92ae6a158d1d64753e89d918385a1a31f32811f54060504113f065baa
 DIST dbus-broker-35.tar.xz 263388 BLAKE2B 2c270197d76ec157bf2fd8eb561b49cea2739d656fac8129c4ecdd0bbd5804f8e4e427414cb5f209eef4c22cf9559fc409170476d8df0e1d252c0b5aa2288e01 SHA512 409e415889bd53b78e92ba077455e5583852a071e233e4b23dcbb23d8a367f177d6c8138e6fc113dcfe48440b68d594c1a076cb43ef445d472645f671d5ae033
 EBUILD dbus-broker-33-r1.ebuild 1297 BLAKE2B bb3cd910bca3b692203185d5d142dad91ee441768f498608d5ba729024f21e081dfbb776ad4f26d84c04f8e5824791b6ec4e5c3a55de12e0d221838abfd4ef65 SHA512 294b7867ebfd4e74cef21eea865d9622c6125abe154f7d2656499261b3715faf4729c050ea0c287b17adddb7de7ada9279f89e6808a9f3ca8300cb78a8c8796a
-EBUILD dbus-broker-33-r2.ebuild 1227 BLAKE2B 6c82b46ba49e0011b7466503fc8e199dd3e72c56c7276cdbfc2fadc3258cc4a58af6050c8b3ce2b9190745441a1e2be9dd954e7d526e5331b81b4c624053f05f SHA512 4250788c76eaaa0bec0eeee709fd37b5908c9ee511e1b6bb1b4a43243dd48381fad72ad02f46028ab2b5420825790242aa052f419cb19716688f592806dee4f1
+EBUILD dbus-broker-33-r2.ebuild 1224 BLAKE2B 4e023563b04f835a700d07632ae6068d8cfd870434f6f4f958b1bb4a251eb541e9b4161b8d9dd998d4d4cb1c40ffd14aaa9633298e9919b8d7eff0ac0ab9d254 SHA512 b388839f16b2cf229e5062b5aac97aae05d3d4336cca1832c372d8cb1d9ac970c3d3ec939397efcb278a1eec0253f153fe461618078929e3056f778797f2eb4c
 EBUILD dbus-broker-35.ebuild 1168 BLAKE2B 257e047167eb304c53601c1a022bbb91ed28e585d782a6a62fda58727432abdf84460d145d23c89ed5061f3d4f3a71014ba716836856748c3fa5083ebb2e35d5 SHA512 f743e5e0f7e4a90fe6911ae53402ad0a47e46d1efe109d61e503a7e26172865ce630d9b8c8cbc5de548921b55bbc80188ce5f2f199f0d54f128b8eba18b2adda
 EBUILD dbus-broker-9999.ebuild 1168 BLAKE2B 257e047167eb304c53601c1a022bbb91ed28e585d782a6a62fda58727432abdf84460d145d23c89ed5061f3d4f3a71014ba716836856748c3fa5083ebb2e35d5 SHA512 f743e5e0f7e4a90fe6911ae53402ad0a47e46d1efe109d61e503a7e26172865ce630d9b8c8cbc5de548921b55bbc80188ce5f2f199f0d54f128b8eba18b2adda
 MISC metadata.xml 409 BLAKE2B 47bd4b617aaf73c385f1c321592abf3cb4fe06dbc35a574a9cd8f65417a6554314e7034a47d36c04a7f90264c6087103ac3cbcd051d5177b38f22550553b07c0 SHA512 048e0790b2c9e8dbbf446d4ce2651124245976194260b1813b3e1807366ba09cdb204a9787dc77bca0f9bc4400fe94422cfdbe63d729c3333b67c98a6a20a1c3
diff --git a/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild b/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild
index e1bb5c68ca07..bc58722947b4 100644
--- a/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-33-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv"
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index 7819bdb7b42d..4ec5bd927494 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,3 +1,3 @@
 DIST hwinfo-23.2.tar.gz 1237565 BLAKE2B 86c085c0b58b967f94ded3db4975cd824f69908b3b7fc1d27e2d51cb0e570969a7af2274f55d6eb1d871e1422016deb8007c76199be441ad94486ab18f9bff7a SHA512 86096455cc58ecdd3be4306d61beaea02da39b8ee3b2a99966d4aaf022e276616329ca82550d7903e2aed9b1723a99b2305617fb85df21c1d2024ce46b447af3
-EBUILD hwinfo-23.2.ebuild 1298 BLAKE2B fd8137dedb6914f0924ee2aadbfdaf980176fd9b2316a540c80bc5d4427dcf2cc1c2b167c3df15b2d6a69137d57817b36a67ff50e9300ced6c2d338075ffee5e SHA512 ffb32aed2716869e65f541c9b8e55d622008454e1beaac9ee886a171eda7bf36fc239f5b5a99a5e37bcc6cb96e14fd80a0eb4181aceab35054da091881bb3846
+EBUILD hwinfo-23.2-r1.ebuild 1302 BLAKE2B 3e404bd4755d88ca865ed1577785b4144b0a031680c4a55b907afd795c3891b13c9ef7cc19aae0a0f29722b78cb82027cbacce4c214a2daedeb2cf5519691a24 SHA512 ee5168126a8cd1cff9f4c2e87bbba7882686beb13f5dab5db1bc532af687efbbc6ae7ea7d29b620b6bc20138d6d8e2ac01604e6e1bfd3ecb842f05d3c2af2480
 MISC metadata.xml 335 BLAKE2B 038b3d0d2c3215e9c141823f3578880ecb43da74b991cce36793a6af5b3549603ad1fa95c1bbe477126c3b84f6493099400d8914d94cdbe1c557b0166c0ca43b SHA512 e24489f0c20cc1cd356f7059c4a2a8d02b2f39fcb43df0d685977ce6e1593c134420daf6d940f96f08fd0d19026618d89946e6ff0a24f449be5d5c8910b10581
diff --git a/sys-apps/hwinfo/hwinfo-23.2.ebuild b/sys-apps/hwinfo/hwinfo-23.2-r1.ebuild
index 2b1b43e95b83..a52bf7505817 100644
--- a/sys-apps/hwinfo/hwinfo-23.2.ebuild
+++ b/sys-apps/hwinfo/hwinfo-23.2-r1.ebuild
@@ -13,8 +13,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="amd64? ( dev-libs/libx86emu )
-	x86? ( dev-libs/libx86emu )"
+RDEPEND="amd64? ( dev-libs/libx86emu:= )
+	x86? ( dev-libs/libx86emu:= )"
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-2.6.17"
 BDEPEND="sys-devel/flex"
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 11c20abb5f66..a5dcbe87cd4e 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,4 +1,4 @@
 AUX 39_memtest86+-r2 3530 BLAKE2B 6c302744000a48fbda7563b48bbac5bb5e580159d74ad595f5fabd21150bd785c1792c0acbafc779a601ab7b820a0e37576c0c0967ba2de739089d2b9cfc3366 SHA512 2e28b671d77ef19958b88c73f9de5560775c3b8cfb647bd7cc480801a64bcaf2a80f750d3fdaf81b1c02364f4aa2fcb8b3ccb8eef4008c9d0619676f0490a084
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
-EBUILD memtest86+-6.20-r1.ebuild 2053 BLAKE2B 131eeeee06b95e929ceb4e7bb66731f99b536eea9d98bf80fad14fc1175f8c403f067b72603474d9d0026d0035f15f0bf72be878f3cea1555d0bea1fb54fbeab SHA512 8b87b142bdc7fcfc19c3a23f091c1dde05347c8410d1913ccf01377aa3313173348e8100ff5eecf02335ff280aa00986fbde0b12a862f3e89cd8a81b9c602e37
+EBUILD memtest86+-6.20-r1.ebuild 2054 BLAKE2B 2fae96fc37a67020f86571f241942456dd901b2dbdeb4cfa7da3207fe33eb99ddd65b9d78781945623f00682efb475a5d9117cb5fa3852eb2a55b1cce1ec3332 SHA512 01c67d979f675690a65a5acffccae87328770540931250675802f97aac9051cf4da3740d3f6793846d288b22e91173a157dc94168d7a49b624e965b2c98c5ab6
 MISC metadata.xml 817 BLAKE2B 86125269ad6d6292102fb52af0ed6b4ac2a8f9a021d2a91d1efb8a37c7e9aaa386ff303140bff66ab02eb2c70b7d2266202667855fcf219ef279e2f10ed29b81 SHA512 e6bbf1204f7a150097aa1794da810076e8f84458a1648516a10a877dc529fe06bd58ab57ae7873b6c6b89d1932a43d193da42b41135e222d6758665fab2b28db
diff --git a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
index 878d88fd8c30..87d164cf9ec0 100644
--- a/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-6.20-r1.ebuild
@@ -96,5 +96,5 @@ pkg_preinst() {
 }
 
 pkg_prerm() {
-	use boot && mount-boot_pk_prerm
+	use boot && mount-boot_pkg_prerm
 }
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 2e4a344b91f0..01a126850769 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -5,13 +5,10 @@ AUX 7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch 1867 BLAKE2B 95
 AUX 7.1/0005-tp-Texinfo-command_data.txt.patch 7841 BLAKE2B 47b482d95904b96af0d538c1d969e7c90e82f547d5d96bab855780209378efd5b577a7e0b1b3fef1ca32cb442bb9bee74a80f0bd62237b8a8f03764a368134ae SHA512 050e87f0a0ec5f23eabaeb8ddbc12e42a65121d67da5843210ac3c80deea5ef415b274216702e236919ad42b5e25552fbd704f78c81fb3e737188417a9405195
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B 23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617 SHA512 26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b
 DIST texinfo-7.0.3.tar.xz 4886668 BLAKE2B 38710faba2f717f7990228d58924901ea7d7378cc02e2059a437b5127f9e2dc67f732584e3f45fc34e8ef6d7671a546fe66871dadbd29e772f3417768622a650 SHA512 7d14f7458f2b7d0ee0b740e00a5fc2a9d61d33811aa5905d649875ec518dcb4f01be46fb0c46748f7dfe36950597a852f1473ab0648d5add225bc8f35528a8ff
 DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db
 EBUILD texinfo-6.8.ebuild 1673 BLAKE2B 32b1b2a131178eb811a9b05a08718d09790b912cafdc96caeb0d8f78746efccbf86dc1e03c974047af1ed10f60af81dc9ab03dca8e96d2b017907695afb45717 SHA512 edf6247f34b2eaffe3f95fa017e7ee50c4e1f8a0ae8382ed47d0074601fd49e8712eb893454c78026e80db299e3ba75e2683f60e5cbe7b12fee7adbb4613d55d
-EBUILD texinfo-7.0.2.ebuild 2147 BLAKE2B fd68afccbc08c63d00b40fbd1807edcb6a4741776d6937d81a141f7dcb23a10a107f663d7321bb073ee7112fc693bfd2ef0670cb8515d1169e79c7c120ee530b SHA512 a86351dd587a6c196194b4196fb73cf6ec70bee96573334c12ea9b093b693a51f07aa5d32f311ae072a984fec872ab6a8fd13c4767502067ab7d3668aa10de6f
 EBUILD texinfo-7.0.3.ebuild 2147 BLAKE2B fd68afccbc08c63d00b40fbd1807edcb6a4741776d6937d81a141f7dcb23a10a107f663d7321bb073ee7112fc693bfd2ef0670cb8515d1169e79c7c120ee530b SHA512 a86351dd587a6c196194b4196fb73cf6ec70bee96573334c12ea9b093b693a51f07aa5d32f311ae072a984fec872ab6a8fd13c4767502067ab7d3668aa10de6f
 EBUILD texinfo-7.1-r1.ebuild 2561 BLAKE2B 3bdf06cfc075e00458e5d9de7fb405743c9364b543d3767d5700cc04340fb4bcd1eb4c2274d691d70280f09b66a7b69b4db42acb75d538a3c43df86e21b89a09 SHA512 81bc5648f3fdc60b6f490b43a2c26b7d3c1380a900eb3056076d6756bc4759e15683ae9180584f11a0c72561c6c210974e257c4fa867ef19e01b5de5878b8693
-EBUILD texinfo-7.1.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
 EBUILD texinfo-9999.ebuild 2496 BLAKE2B 79279972fa3afa424e37074703c58f42b68a61620f248ac5ac1e1637ab79689b35eb5f5abcb07414a75c9e3afcc8c7189b40a5658ef49f16ad189f17de46e020 SHA512 4467e725e4b18111dc89c4a21ca4c54a03b85b19faae57c51c4fdbcb0fd686e59837a240ed71d83280a92c09028930c79b26faea75bda4d9536d53378ec3e5a6
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.2.ebuild b/sys-apps/texinfo/texinfo-7.0.2.ebuild
deleted file mode 100644
index fcb9ea093d9e..000000000000
--- a/sys-apps/texinfo/texinfo-7.0.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
-	REGEN_BDEPEND="
-		>=sys-devel/autoconf-2.62
-		>=sys-devel/automake-1.16
-		sys-devel/libtool
-	"
-elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="nls +standalone static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:=
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	standalone? ( >=dev-lang/perl-5.8.1 )
-	!standalone?  ( >=dev-lang/perl-5.8.1:= )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${REGEN_BDEPEND}
-	nls? ( >=sys-devel/gettext-0.19.6 )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# Needed if a patch touches install-info.c
-	#touch man/install-info.1 || die
-
-	if use prefix ; then
-		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
-		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
-	fi
-}
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
-	# bug #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
-	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		--cache-file="${S}"/config.cache
-		$(use_enable nls)
-		$(use_enable !standalone perl-xs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/texinfo/texinfo-7.1.ebuild b/sys-apps/texinfo/texinfo-7.1.ebuild
deleted file mode 100644
index 7c36a9271893..000000000000
--- a/sys-apps/texinfo/texinfo-7.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
-	REGEN_BDEPEND="
-		>=sys-devel/autoconf-2.62
-		>=sys-devel/automake-1.16
-		sys-devel/libtool
-	"
-elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="nls +standalone static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:=
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	virtual/perl-Unicode-Collate
-	standalone? ( >=dev-lang/perl-5.8.1 )
-	!standalone?  (
-		>=dev-lang/perl-5.8.1:=
-		dev-libs/libunistring:=
-	)
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${REGEN_BDEPEND}
-	nls? ( >=sys-devel/gettext-0.19.6 )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# Needed if a patch touches install-info.c
-	#touch man/install-info.1 || die
-
-	if use prefix ; then
-		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
-		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
-	fi
-}
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
-	# bug #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
-	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-
-	# TODO:
-	# --with-external-Unicode-EastAsianWidth
-	# --with-external-Text-Unidecode
-	#
-	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
-	# but it doesn't seem to do anything?
-	local myeconfargs=(
-		--cache-file="${S}"/config.cache
-		$(use_enable nls)
-		$(use_enable !standalone perl-xs)
-	)
-
-	econf "${myeconfargs[@]}"
-}