Install in vendor dir, not site dir; bug 387477

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

5 files changed, 118 insertions, 15 deletions

diff --git a/kde-base/perlkde/ChangeLog b/kde-base/perlkde/ChangeLog
index 3d60e7da9e54..6701b7b7b1c8 100644
--- a/kde-base/perlkde/ChangeLog
+++ b/kde-base/perlkde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/perlkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/ChangeLog,v 1.5 2011/10/15 17:26:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/ChangeLog,v 1.6 2011/10/19 20:44:22 dilfridge Exp $
+
+*perlkde-4.7.2-r1 (19 Oct 2011)
+*perlkde-4.7.1-r1 (19 Oct 2011)
+
+  19 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +perlkde-4.7.1-r1.ebuild, +perlkde-4.7.2-r1.ebuild,
+  +files/perlkde-4.7.2-vendor.patch:
+  Install in vendor dir, not site dir; bug 387477
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -perlkde-4.7.0.ebuild:
   Drop KDE 4.7.0
diff --git a/kde-base/perlkde/Manifest b/kde-base/perlkde/Manifest
index 6118dafdc02a..ceec13590cdb 100644
--- a/kde-base/perlkde/Manifest
+++ b/kde-base/perlkde/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX perlkde-4.7.2-vendor.patch 625 RMD160 ebee715cbe0baade9208dd579c6402a1e71f28e5 SHA1 87d443f78009135b79db0a3dd7492cd15ddaddd8 SHA256 581c33c31741ce5542a4cb214f99cf89708c72365178e4ae8ed65699a404419c
 DIST perlkde-4.7.1.tar.bz2 40113 RMD160 07e8044acb25c10c659a9a13007b848b1db1ecf9 SHA1 24e90923554ac1194da9fb84dab9efe580fa979e SHA256 b280693759aeaba446e06dff024a8fb146a611e8367afcd0024cfe8217b1da07
 DIST perlkde-4.7.2.tar.bz2 40149 RMD160 06dd0d81ea4b66169260dff11944e54943f846b6 SHA1 a355563b55dc2dd004373a39853af38cda0d005d SHA256 22ddffaef8a64c43204e3a126c8f8ec842e3c2d6c9b1742e4fabed8be07e49fd
+EBUILD perlkde-4.7.1-r1.ebuild 1107 RMD160 9c63f52e3a3f626878c8a41cec982bc4113fff55 SHA1 0a56b93420e169ee61179e0bbfc682f1e9510007 SHA256 5bd4c2011619f4611cf52ac981f19f70d3fad1a6279140cf52653725be27eb28
 EBUILD perlkde-4.7.1.ebuild 1049 RMD160 62e42c35e89600d719cf2422dc063e7710d643f6 SHA1 d71895769d4bd7e9b663331e64929a1c2941a0cc SHA256 5cc2f837edf5a51564c5bd7ed39706c47bc060489441a62270f8c317c0c20915
+EBUILD perlkde-4.7.2-r1.ebuild 1107 RMD160 cef8c1f8fc7be12e527a677c2c752a3980113469 SHA1 236d7e10b2d5ef036297343d5842f9d9bd4fb171 SHA256 29eff1208ec605fc585278874cc01a72887d6b995d02c46f79e659be1cf244c5
 EBUILD perlkde-4.7.2.ebuild 1049 RMD160 06630fb702eb7f33f28195d9cc9c39b87f7208ad SHA1 222a9d2fba393b4957eb256af91c4ad95cdec2f1 SHA256 759ab8b7acc6a423c6ab69f0720502ff1dc44dc3a5ca01357493b9629ab9c1c8
-MISC ChangeLog 826 RMD160 ac083611038f48a11f8b38707b279b9099ab963a SHA1 5aff4467e382276118aae1938662ad0af9851ad8 SHA256 669f4f36b267d8125a508fdd2200475f77fc3ab7dfc3cf586c96b4968bf3483b
+MISC ChangeLog 1090 RMD160 a4710bb09d26313a6e170e5ad943270ece001566 SHA1 b130ec74d9fccc05f1e8abed93dbd71d792c2874 SHA256 fef2bc3fd1d29aa0fac6756fab2d9d5e17755a7dd32f43b57a5ec4ee20472848
 MISC metadata.xml 458 RMD160 7791f7157180c82dcbf93e062809c1761d88a4cc SHA1 ea6579641f8adbf5549e5598cca86e629ab89465 SHA256 f39acfe948c11f639a8a5369b8881adfac2e58df690a34304908aa0a9e7b7e25
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOmcKVAAoJENwGBM22xffe8WgQAI/bIUCulGIZ9ZiFmKSSavtO
-r3wgGw6FikamMRtp/3Mtm9o8hbiTqjtGxfK4y7j3TA2phbDTC5lQxhtF3hZre+4O
-4i+kg3mHuv8KWEKyGsIECOBdrLLJF0szQVoeZacT5QPgfN2StvNleEsaySg0M2Mw
-XGv2SHyGRI4cYH+p9djCg7NaaJQ8U08Jr9nMNrM5CVntEZPwDuOrw/6+zdGxpZ6d
-9vC+p88Q6pWnT3yvCjTz/u+OhSUOWGn9Pr4hGK2mqHs0Ai+0k/7aNhzPbmVxIrwM
-RI7ZsS9ZGp3+hMd7RBfiEv4PMBJ6uw3v5PsZEte/qUTSzFhVpNndKwRi7MogQBg6
-+N4fGphmbaZeDW2EpzY3glGkc/XCf3gkOmBxZ1Ogg0RgAQRzEbgmZDys7nXVicE+
-pCFqF3zpux/jH2uKgJ+pbJfwRTcYec+LIXKG107D5g8opQAJguPGOCi/D+Pj+sCA
-uubLIHCw5+ueLsueXypS8fMVXpb01ihhS4nye/LmaWjEfZpG8Jm4sKK8yo7Wi9qn
-FpkpexycRDW7al5WdO3rsIwD4zkVw6oZmazwuO6vb29sAQHBcjXng5zz8qyPwBKD
-CKMahupkGFa08SPj72T1W7a5WVuqiNZ1HdWO0ZfSd6kIigXti02x/jMyl38EI5Q2
-x6KhBD6OPasUI5xmUB3b
-=bAfi
+iQIcBAEBCgAGBQJOnza7AAoJENwGBM22xffe6vUP/0FOxUM7IFpDvnlTKQayyMiD
+k0/OhxXdMfB20GnYIwpxCFN+eaFzAbulgfrKDtSFUvH05+L022tRS92Vm6mMHShi
+vEP9upyND2UT47fE2ATBekUrCoEyzroCyBXVshaXzb1hQkmVHIqKU91NSdA5wSRm
+RU+q9G5tJDAkZt7V0jQNqf9AlRBwAUF/OOj3tRQSZEedpHooDYntWgmqnHvEwEFl
+r2j3ddu0awRyK2QrL/dKuDzdM4AYdk+5ERbimpiq6zyiy3TjEldqaB51kxF7sVNR
+Vhh/EDRM/cjSm0KogyhW47yaJhzxPsiRtTglooJ9kKugzVGWrPd3ew2vlFWkT86g
+FCCGZQ+lAs6LcZyM+1mluMz6M+AbjKCbDrhaCYzny9C9MlUWp1ypwehKoA1Z17rs
+2Ch01lRFLjf9lQMY8J7rET3DHsuSYBDXxxS+MiKhxg4A7xy6D7iXcHnZdfHaSBY6
+UgcgZ8eDkch2zzi2aVTLRRxExb1yG1CqMYZFCHmWmF3EovvopxFz7Nse6vw7lslV
+DTJNqrwDGjFjWXXr/K/waLUmgmQSQZMEUwRxa5s4sCWclnBstNEoYqH9u4V8qIeL
+pgceOIZd/deoqIB5+bK2rmNO9skO+R7ae1fIOhVeLCCFmdCSRh7VZ97oBMe/s1x/
+0/qMPEc48W5Oc7DZbrkX
+=bNck
 -----END PGP SIGNATURE-----
diff --git a/kde-base/perlkde/files/perlkde-4.7.2-vendor.patch b/kde-base/perlkde/files/perlkde-4.7.2-vendor.patch
new file mode 100644
index 000000000000..e8ee7b623aed
--- /dev/null
+++ b/kde-base/perlkde/files/perlkde-4.7.2-vendor.patch
@@ -0,0 +1,12 @@
+diff -ruN perlkde-4.7.2.orig/CMakeLists.txt perlkde-4.7.2/CMakeLists.txt
+--- perlkde-4.7.2.orig/CMakeLists.txt	2011-05-20 22:33:47.000000000 +0200
++++ perlkde-4.7.2/CMakeLists.txt	2011-10-19 21:54:21.839724784 +0200
+@@ -37,7 +37,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")
+ 
+ include_directories(${PERLQT_INCLUDE_DIR}/perlqt ${SMOKE_INCLUDE_DIR} ${KDE4_INCLUDES})
+ 
diff --git a/kde-base/perlkde/perlkde-4.7.1-r1.ebuild b/kde-base/perlkde/perlkde-4.7.1-r1.ebuild
new file mode 100644
index 000000000000..719e7d2b1210
--- /dev/null
+++ b/kde-base/perlkde/perlkde-4.7.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.7.1-r1.ebuild,v 1.1 2011/10/19 20:44:22 dilfridge Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Perl bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="akonadi attica debug kate okular semantic-desktop test"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep perlqt)
+	$(add_kdebase_dep smokekde 'akonadi?,attica?,kate?,okular?,semantic-desktop=')
+	semantic-desktop? ( >=dev-libs/soprano-2.6.51 )
+"
+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() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-base/perlkde/perlkde-4.7.2-r1.ebuild b/kde-base/perlkde/perlkde-4.7.2-r1.ebuild
new file mode 100644
index 000000000000..efa831045e33
--- /dev/null
+++ b/kde-base/perlkde/perlkde-4.7.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/perlkde/perlkde-4.7.2-r1.ebuild,v 1.1 2011/10/19 20:44:22 dilfridge Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE Perl bindings"
+KEYWORDS="~amd64 ~x86"
+IUSE="akonadi attica debug kate okular semantic-desktop test"
+
+RDEPEND="
+	>=dev-lang/perl-5.10.1
+	$(add_kdebase_dep perlqt)
+	$(add_kdebase_dep smokekde 'akonadi?,attica?,kate?,okular?,semantic-desktop=')
+	semantic-desktop? ( >=dev-libs/soprano-2.6.51 )
+"
+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() {
+	mycmakeargs=(
+		$(cmake-utils_use_with akonadi)
+		$(cmake-utils_use_with akonadi KdepimLibs)
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_disable kate)
+		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+	)
+	kde4-base_src_configure
+}