Install Perl modules in vendor-dir instead of site-dir. Drop old version. Fixes bug #362231.

Package-Manager: portage-2.2.0_alpha29_p5/cvs/Linux x86_64

5 files changed, 44 insertions, 118 deletions

diff --git a/net-im/ekg2/ChangeLog b/net-im/ekg2/ChangeLog
index 3a3d4070c52e..d183f63d5909 100644
--- a/net-im/ekg2/ChangeLog
+++ b/net-im/ekg2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/ekg2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.45 2011/04/01 20:10:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ChangeLog,v 1.46 2011/04/06 15:42:45 mgorny Exp $
+
+*ekg2-0.3.1-r1 (06 Apr 2011)
+
+  06 Apr 2011; Michał Górny <mgorny@gentoo.org>
+  +files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch,
+  -ekg2-0.3.0.ebuild, -ekg2-0.3.1.ebuild, +ekg2-0.3.1-r1.ebuild:
+  Install Perl modules in vendor-dir instead of site-dir. Drop old version.
+  Fixes bug #362231.
 
 *ekg2-0.3.1 (01 Apr 2011)
 
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index 732083ed0dc3..f209a8bc3b96 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ekg2-0.3.0.tar.gz 1701061 RMD160 170bce28daf5fa879d5ec09421d588d0a36467bc SHA1 9d7c734a155adebb89bc96626fc0b620888d5ecc SHA256 07d460b171c266c3375a3d9ca4c9c19fa001d986cbb73fcd8611900f65382dcd
+AUX 0001-Gentoo-use-vendor-dirs-for-perl-modules.patch 786 RMD160 7d0886f350a7a1e35ae5ee5d50ce6965deb41e60 SHA1 5c00c9c63f209218223f1880ba8c95111fa2d379 SHA256 774aadd44164565b198676d87431264b5e10e18af0664dafd1e6fa6f6ac9ac4d
 DIST ekg2-0.3.1.tar.gz 1704772 RMD160 5e06cfc855aa8a5266c166a59ed21174be454a74 SHA1 8b6f53086e8e1d2890fdc1ec274a7b1615da0fa1 SHA256 6ad360f8ca788d4f5baff226200f56922031ceda1ce0814e650fa4d877099c63
-EBUILD ekg2-0.3.0.ebuild 2944 RMD160 27fd12a537a5fcfd952e6e06acbf5b249330926d SHA1 1344ee7832acff95473003f7d2a1513e7c2a7328 SHA256 e926a3d9ad7737e0b41bba25f182030acd70613c4861fbf0a32474e7ce523322
-EBUILD ekg2-0.3.1.ebuild 2943 RMD160 55f4c44d3217e4347a387a5f7588e84439acb36b SHA1 e6145891f7d1a4f6ba59ebaa524b4ef5a15645c7 SHA256 86daed8b669009867230c95668a6eaa09c135d9b94bb49d6b789b53f8c0e0d4c
-MISC ChangeLog 2843 RMD160 8b1215401f787d78bd80cae8897701189a1d0ca3 SHA1 44771f2c1254382daf6402c23c9e7faee579ff8b SHA256 da77a8ab49fe0880b31c30c07555562b2664f97541cac87f4869fa3f558cbafe
+EBUILD ekg2-0.3.1-r1.ebuild 3024 RMD160 6b5783f08fb47ef5346378ada393f04b92397d3a SHA1 bb3055c59dd1806275357a72f63cf7e563473526 SHA256 e29bf08dcba0ac8032ec3de9f8b5876a9166afbf998b03568285d337ea69ebb0
+MISC ChangeLog 3147 RMD160 867d9c538261fbbaa36fd03cde64d8aab28e07f1 SHA1 bf20f2c056bfe666e6f33c65b65200167d8ac6ef SHA256 8d1a474bd96a23775599f35b3f5e374ee66d3d4ea010f45a572e3147da2a2bb4
 MISC metadata.xml 1408 RMD160 d4b8073fa85da36c447f9916dad66232e1d7fa65 SHA1 c3f8bb880e16201dfd82d45f3d9cfbd3969ec505 SHA256 ea2d7d73d284589b032ef27cbbeb660759e7f2cd8b909cf5f18c8744b001ae90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2WMUcACgkQnGSe5QXeB7sXCACgkiQ+LWoqVJAVIsuSF9HPFwEs
-BrEAoIBVuSACRjMM5JPRlK7PnTG8EWFr
-=r3yg
+iEYEARECAAYFAk2cihwACgkQnGSe5QXeB7tMFgCfcvewkntcFUObNDtxInKoyfab
+7tUAmwbuYix4RxmMPWdxlmAt63QJzR2G
+=mIYM
 -----END PGP SIGNATURE-----
diff --git a/net-im/ekg2/ekg2-0.3.0.ebuild b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
index 6865af8ace10..e6854ab2ad3d 100644
--- a/net-im/ekg2/ekg2-0.3.0.ebuild
+++ b/net-im/ekg2/ekg2-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.0.ebuild,v 1.2 2011/02/26 19:45:07 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1-r1.ebuild,v 1.1 2011/04/06 15:42:45 mgorny Exp $
 
 EAPI=3
 inherit autotools-utils versionator
@@ -45,6 +45,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
+)
 DOCS=(
 	AUTHORS docs/README docs/TODO
 	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
diff --git a/net-im/ekg2/ekg2-0.3.1.ebuild b/net-im/ekg2/ekg2-0.3.1.ebuild
deleted file mode 100644
index 66dc661c0b21..000000000000
--- a/net-im/ekg2/ekg2-0.3.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg2/ekg2-0.3.1.ebuild,v 1.1 2011/04/01 20:10:19 mgorny Exp $
-
-EAPI=3
-inherit autotools-utils versionator
-
-DESCRIPTION="Text-based, multi-protocol instant messenger"
-HOMEPAGE="http://www.ekg2.org"
-SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gif gnutls gpg gpm gsm gtk idn inotify jabber jpeg ncurses nls
-	oracle perl python readline rss spell sqlite sqlite3 ssl threads unicode
-	xosd zlib"
-
-RDEPEND="
-	gpg? ( app-crypt/gpgme )
-	gsm? ( media-sound/gsm )
-	gtk? ( x11-libs/gtk+:2 )
-	idn? ( net-dns/libidn )
-	nls? ( virtual/libintl )
-	oracle?	( dev-db/oracle-instantclient-basic )
-	perl? ( dev-lang/perl )
-	python?	( dev-lang/python )
-	readline? ( sys-libs/readline )
-	ssl? ( dev-libs/openssl )
-	xosd? ( x11-libs/xosd )
-	zlib? ( sys-libs/zlib )
-
-	gadu? ( net-libs/libgadu
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg ) )
-	jabber? ( dev-libs/expat
-		gnutls? ( net-libs/gnutls ) )
-	ncurses? ( sys-libs/ncurses[unicode?]
-		gpm? ( sys-libs/gpm )
-		spell? ( app-text/aspell ) )
-	rss? ( dev-libs/expat )
-	sqlite3? ( dev-db/sqlite:3 )
-	!sqlite3? ( sqlite? ( dev-db/sqlite:0 ) )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=(
-	AUTHORS docs/README docs/TODO
-	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
-	docs/themes.txt docs/themes-en.txt
-	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
-)
-
-# Due to MakeMaker being used to build Perl modules.
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses && ! use readline; then
-		ewarn 'ekg2 is being compiled without any frontend, you should consider'
-		ewarn 'enabling at least one of following USEflags:'
-		ewarn '  gtk, ncurses, readline.'
-	fi
-
-	if use gnutls && ! use ssl; then
-		ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
-		ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
-	fi
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with gadu libgadu)
-		$(use_with gif)
-		# gnutls is jabber-specific
-		$(use jabber && use_with gnutls libgnutls || echo '--without-libgnutls')
-		$(use_with gpg)
-		$(use_with gpm gpm-mouse)
-		$(use_with gsm libgsm)
-		$(use_with gtk)
-		$(use_with idn libidn)
-		$(use_with inotify)
-		$(use jabber && echo '--with-expat' || use_with rss expat)
-		$(use_with jpeg libjpeg)
-		$(use_with ncurses)
-		$(use_with oracle logsoracle)
-		$(use_with perl)
-		$(use_with python)
-		$(use_with readline)
-		$(use_with spell aspell)
-		$(use_with sqlite)
-		$(use_with sqlite3)
-		$(use_with ssl openssl)
-		$(use_with threads pthread)
-		$(use_with xosd libxosd)
-		$(use_with zlib)
-		$(use_enable nls)
-		$(use_enable unicode)
-		--without-ioctld
-		--disable-remote
-		--enable-skip-relative-plugins-dir
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	remove_libtool_files all
-}
diff --git a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
new file mode 100644
index 000000000000..010b22fc976c
--- /dev/null
+++ b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
@@ -0,0 +1,25 @@
+From 804370c1ad2f94937ac9184dbbb40354885ea6be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 Apr 2011 16:19:46 +0200
+Subject: [PATCH] [Gentoo] use vendor dirs for perl modules.
+
+---
+ plugins/perl/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/perl/Makefile.in b/plugins/perl/Makefile.in
+index 84d378b..309e2e2 100644
+--- a/plugins/perl/Makefile.in
++++ b/plugins/perl/Makefile.in
+@@ -594,7 +594,7 @@ all-local:
+ 	set -e; for dir in $(perl_dirs); do \
+ 	 cd $$dir && \
+ 	 if [ ! -f Makefile ]; then \
+-	   $(PERL) Makefile.PL; \
++	   $(PERL) Makefile.PL INSTALLDIRS=vendor; \
+ 	 fi && \
+ 	 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" && \
+ 	 cd ..; \
+-- 
+1.7.4.1
+