vendor-perl, not site-perl, bug 387477

Package-Manager: portage-2.1.10.28/cvs/Linux x86_64

5 files changed, 130 insertions, 15 deletions

diff --git a/kde-base/perlqt/ChangeLog b/kde-base/perlqt/ChangeLog
index e56794938710..ca3d7256826b 100644
--- a/kde-base/perlqt/ChangeLog
+++ b/kde-base/perlqt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/perlqt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.6 2011/10/15 17:26:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.7 2011/10/18 23:09:59 dilfridge Exp $
+
+*perlqt-4.7.2-r1 (18 Oct 2011)
+*perlqt-4.7.1-r1 (18 Oct 2011)
+
+  18 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +perlqt-4.7.1-r1.ebuild, +perlqt-4.7.2-r1.ebuild,
+  +files/perlqt-4.7.2-vendor.patch:
+  vendor-perl, not site-perl, bug 387477
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlqt-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/perlqt/Manifest b/kde-base/perlqt/Manifest
index bb95b230c3fa..f51ccf3ba684 100644
--- a/kde-base/perlqt/Manifest
+++ b/kde-base/perlqt/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX perlqt-4.7.2-vendor.patch 677 RMD160 ab2412e4edd59cd390bf6e5ac2c942f3df1d8dfd SHA1 6ce493f96c9213607275f6c9ce31a811d335dddd SHA256 24f1a0931a3ec0472570e3e488aa5ca5636aa764e9bd5d788fe7e6e5abd9e214
 DIST perlqt-4.7.1.tar.bz2 1955949 RMD160 0fdd2343aa3636bd2cc1fc0c9ecfc65463fe01ff SHA1 f2534fc9677ce4f3e58a67b4d9b255f403250064 SHA256 b38a0b8d76b7e3cf468536cf9d6537f579308c37b836ee41336d4bc19d90f018
 DIST perlqt-4.7.2.tar.bz2 1956024 RMD160 e7272df5b6a45153a6c6a559127f610650af5848 SHA1 cde0c6b325e62d26ee6bd2f3f25d01e0563197c9 SHA256 caa9e848a7d2f724859b4fca7815dca43339cd92cf65ccb68e5c88a58f6b36f6
+EBUILD perlqt-4.7.1-r1.ebuild 1346 RMD160 c4e680387a93f3da10951e61b205d87885189a31 SHA1 be092f6e77241f6e2341e3a579209c3df61de569 SHA256 5afa3fa5a6bf27afa6592bff5522e320deb3a0f7a8a34cb1cf955989f2c3a6c3
 EBUILD perlqt-4.7.1.ebuild 1288 RMD160 db1f5576ecc98dea07fff30dbbdd26fd41a7b226 SHA1 38e82ed7c625b428035c643b2854f3fc26690975 SHA256 16d50ae8038b7eaee29cb39427a1e0aa06c9c75a525dc9221a814f7c3d1bc470
+EBUILD perlqt-4.7.2-r1.ebuild 1346 RMD160 00ee2dd86087146d7cc44eefac8e9326259b169a SHA1 e310f1d338dba212ee8991902dfaf1fadd5f43b8 SHA256 07d2309d48dfb841ff58b2c432da3218a5f9f907cba38a62552a1328d48aa6b9
 EBUILD perlqt-4.7.2.ebuild 1288 RMD160 8277cd19285a3978f7be5bb32a9eb3246af25961 SHA1 47cc705dec48da8e9f7ee297ab28786f037c7cfa SHA256 a3b6ec113fe7d678621fcb072292ebbcc0665a84c56a3a4bf0932b706ec0ec0c
-MISC ChangeLog 920 RMD160 5ddc63843e231a585afd37ba8a5bdfef2238d0f5 SHA1 3805dcfc904a18a55804b8c41ede35d22e6bd4e4 SHA256 fe887fa852ff2212d119c5923b1e24a2644032539557c2dc897845dc8ec16f08
+MISC ChangeLog 1170 RMD160 1c5a7b0a4971b0570d6d1acbf72dc8329df7d7bb SHA1 238de3f4e38da4e621f4ae2165e3534c93f94506 SHA256 be75271bdd6cd9ed2be1f43c6851ce15ed2278857b24eeeaa95faa7b8a1dc49c
 MISC metadata.xml 824 RMD160 42b789e2d3d37f648d9f296637a8cb361c11d58f SHA1 e47dae051485387d60dc15c9073bc46d7e20fda5 SHA256 5e008b0d6fbd6ff1a2fb64613158f061e322b0a88cdd11d12ab27a5f48e6783b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOmcKbAAoJENwGBM22xffe2W8P/2DZ9fxD0TSYi1C1AA9iTGOq
-hw0YmN6jkEP+kugayB1YVFUhzmpbI7+WJ4rqrrkvx4+xRH9RVzatJBagdosYazdz
-6Hra5uJOqBQqjvGNL5uWmGkBepT7rS6GXqw1NvcgcGIzi3k71egRCPhHxWgd7tfe
-oygGYPgsU/scXqmSM0qY3fvlOF9v0FmHNXxt1kokLT9XWo5bAfC/v9MpZsKDAikg
-2hEcxUguzoQY6fuDQIvj1AIO6xbSsQBYphCBYKheoBG+hXY+YJGxg0cr7Nfe+qpS
-Z+fZ3r3Ff6njOTJGE4dHN2M1LwCvomnAznW8y7ZHNDfju/DeoW+hdTIr0cifRVO6
-RITn3SVw0/LEkQRduNqAvBVrYwYLi+6g6qJXCdxMoQqCu8IqiNQCHhrsyJSmc19v
-/BT+vDcibEr1acU10Fk/34sz/fpJmRouWhg2MrgFDr101A4V435XPucUsp2J9VGe
-GOxAn3guVhRpW5TQ5HlAX5yekC36A/AY9Ql2fhYqlHzhKu8s+7pKNGE+b0SwdAvF
-7YpKpBrZyMXt7ANvYbIGtYLXByTasO//8L+9iP5AnxztCCz+Ah4HxbDB1YCGhBMb
-K20gUY9uzEmtUOrnFo0bNAWF++kyxN7Ft+aQ4P35jnHH6XGP+ivZ3HQWqrx1wAHM
-9yTO6ig6iXxXvZjh+SNm
-=wVWX
+iQIcBAEBCgAGBQJOngdQAAoJENwGBM22xffe3KgP/3ftEwCiq/raeCwuUe9ja8bv
+zDddg2nNZJ6y03N/4i1jVOHleqfVNUWLDOnJQjH1+ezEwVN8V+UN7gYVL3HLMsgS
+GqInOgHG4bWvg/IkKgvlVtcKN7Ertaxzg3JPZww5BKRrmdK4uJnG2CRPsm3qpYMb
+Cc0YWimymuTPRLz/P+uHYTb9vTd5ZjNtjgiZw+KlD8N02GcYFztXJyWcOp4NoYa0
+XUA+0RZ5btgatc1qmLnJNqJiB5/U7l/GxTj2XATroAkPW5jXDOPYYZ7hiILeDxGp
+MaXZ1gHwYl6ZGI2TxZwnJr8Eqtp1d7t4bjP450GBPTpCtefZR4MbPm8ES5ftzwO/
+S3z2U3Y6ueRyw30H/3NXH61mkXqPHGXLLMvdPqN5MZYyhhemT312KCNO97qraHwW
+EYT02ucn1mZwtcWhd5vAj1WwB1B6p7cnklTx6ArwfUGZnS3jA0knDtGe9n6WbFNQ
+tva5SmtVamuFfI7HgX5GSf9xslLfEeO3L9r4N/O2QkS6yYWp+NyO9AFyUWWWbEC8
+Gz95X+CM07dCIpARh9eXKWM2xTJqo0gKria8hte/UWzeEmE97mtgJdWWMlR3o66j
+IPDpkYdUPQbbF/W++creBeNZoh+EQ2JgvMceqTyNCibyHaozOpVFNnfWvbXpu7yL
+kW97g1mquTHujkP0nlSs
+=nDsW
 -----END PGP SIGNATURE-----
diff --git a/kde-base/perlqt/files/perlqt-4.7.2-vendor.patch b/kde-base/perlqt/files/perlqt-4.7.2-vendor.patch
new file mode 100644
index 000000000000..33205601123e
--- /dev/null
+++ b/kde-base/perlqt/files/perlqt-4.7.2-vendor.patch
@@ -0,0 +1,12 @@
+diff -ruN perlqt-4.7.2.orig/CMakeLists.txt perlqt-4.7.2/CMakeLists.txt
+--- perlqt-4.7.2.orig/CMakeLists.txt	2011-05-20 22:33:46.000000000 +0200
++++ perlqt-4.7.2/CMakeLists.txt	2011-10-19 01:03:04.040639531 +0200
+@@ -38,7 +38,7 @@
+ add_definitions(-DDEBUG)
+ 
+ include (FindPerlMore)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
++set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_VENDOR_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
+ 
+ # the RPATH to be used when installing, but only if it's not a system directory
+ GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH)
diff --git a/kde-base/perlqt/perlqt-4.7.1-r1.ebuild b/kde-base/perlqt/perlqt-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..361a202d31e1
--- /dev/null
+++ b/kde-base/perlqt/perlqt-4.7.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.7.1-r1.ebuild,v 1.1 2011/10/18 23:09:59 dilfridge Exp $
+
+EAPI=4
+
+DECLARATIVE_REQUIRED="optional"
+MULTIMEDIA_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
+KDE_REQUIRED="never"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Qt Perl bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug phonon qimageblitz qscintilla qwt test webkit"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/List-MoreUtils )
+"
+
+# Split from kdebindings-perl in 4.7
+add_blocker kdebindings-perl
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_Qt3Support=ON
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_disable qthelp QtHelp)
+		$(cmake-utils_use_disable qwt)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/perlqt/perlqt-4.7.2-r1.ebuild b/kde-base/perlqt/perlqt-4.7.2-r1.ebuild
new file mode 100644
index 000000000000..a23dfd7e40b2
--- /dev/null
+++ b/kde-base/perlqt/perlqt-4.7.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/perlqt-4.7.2-r1.ebuild,v 1.1 2011/10/18 23:09:59 dilfridge Exp $
+
+EAPI=4
+
+DECLARATIVE_REQUIRED="optional"
+MULTIMEDIA_REQUIRED="optional"
+OPENGL_REQUIRED="optional"
+QTHELP_REQUIRED="optional"
+KDE_REQUIRED="never"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Qt Perl bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug phonon qimageblitz qscintilla qwt test webkit"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep smokeqt 'declarative?,multimedia?,opengl?,phonon?,qimageblitz?,qscintilla?,qthelp?,qwt?,webkit?')
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/List-MoreUtils )
+"
+
+# Split from kdebindings-perl in 4.7
+add_blocker kdebindings-perl
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.2-vendor.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_Qt3Support=ON
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_disable multimedia QtMultimedia)
+		$(cmake-utils_use_disable opengl QtOpenGL)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qimageblitz QImageBlitz)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_disable qthelp QtHelp)
+		$(cmake-utils_use_disable qwt)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}