Move perl modules to vendor_dir (#295895)

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

4 files changed, 104 insertions, 3 deletions

diff --git a/dev-libs/clearsilver/ChangeLog b/dev-libs/clearsilver/ChangeLog
index 3f3fa14c382d..e8ab52608ab5 100644
--- a/dev-libs/clearsilver/ChangeLog
+++ b/dev-libs/clearsilver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/clearsilver
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.36 2008/05/28 19:24:15 phreak Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/ChangeLog,v 1.37 2011/03/09 20:05:23 tove Exp $
+
+*clearsilver-0.10.5-r1 (09 Mar 2011)
+
+  09 Mar 2011; Torsten Veller <tove@gentoo.org> +clearsilver-0.10.5-r1.ebuild,
+  +files/clearsilver-0.10.5-perl_installdir.patch:
+  Move perl modules to vendor_dir (#295895)
 
   28 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Julien Allanos (dju) from metadata.xml (as per #87168).
diff --git a/dev-libs/clearsilver/Manifest b/dev-libs/clearsilver/Manifest
index 4ceacb6f8c4d..1dfd69975663 100644
--- a/dev-libs/clearsilver/Manifest
+++ b/dev-libs/clearsilver/Manifest
@@ -1,6 +1,8 @@
 AUX clearsilver-0.10.5-libdir.patch 693 RMD160 681c05d73d7679a0021e5231ae23fc2f7292330c SHA1 001ee8e3a4b7ebd64a05bd74f9ed8a9abb52965a SHA256 ec5e340eb9fdb94c8e05f5bdc79bc954c0560ed711dd438e0d6f863e1ab3abd2
 AUX clearsilver-0.10.5-libz.patch 276 RMD160 6188b48684c8051a6b3b4a696138ce72a3730507 SHA1 7d5f0bcb34221fd14965cf7611f748ef8a04d031 SHA256 51e769a619a23aff2b2a26e17954eba6cd3101f581b1807465226f55e0f42d02
+AUX clearsilver-0.10.5-perl_installdir.patch 857 RMD160 614eff88f66b68d930ad622d47733886e8737bed SHA1 160db766b139e5432e234684b06d32cc44ad2fe1 SHA256 d08fc906d7cec21419166b2de962e1fc0485445552d03fc16024125094285212
 DIST clearsilver-0.10.5.tar.gz 439190 RMD160 bd5c616f326b544df8a74eec71a98a474b408249 SHA1 138865dc91e27328fe29fcaaac1bc6558f19dd75 SHA256 1e9da038deafddd3d0c1c510626c28be5a0f4f17b9091d577fd30e7c5ba88680
+EBUILD clearsilver-0.10.5-r1.ebuild 1774 RMD160 fe105e200242273095fb691edd5eaccdf83fa183 SHA1 1c6d54463948f4ae4c5067472a7271c60f4a17b2 SHA256 afc6e39906497cd9cc1b030999ffbb5f0abc7632ba9efcd1edd985a81594d785
 EBUILD clearsilver-0.10.5.ebuild 1719 RMD160 72fdd4e0e654b49b612dd4628746a40c430cfef9 SHA1 d8b1c961f672fb989dafcbaee69ea618c626202d SHA256 b649d100c08f26e94e8cbea0d76f67f5f328190c2f76ebc2fbe3c15da9f897ee
-MISC ChangeLog 5757 RMD160 66badecc46e3ab5f886d89c65dbecfe52819f8b5 SHA1 4817bba834e336ee618069ba8be8c0ee79abcfee SHA256 7698504e4b6dadacf5d0f39064a7ead600e5ba523281efb91a5d344861b4bddf
+MISC ChangeLog 5968 RMD160 9ec7bc6a26bcf3217401e7f814b02cb618920f69 SHA1 1b8f98e9be4759d368d7d16833b9a5ebcdec9f3f SHA256 a28b9470c564f21bdc1766282bdf78cef10a78942fc080b56f0b78348e3804f0
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild b/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild
new file mode 100644
index 000000000000..d4ed6770d0f6
--- /dev/null
+++ b/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/clearsilver/clearsilver-0.10.5-r1.ebuild,v 1.1 2011/03/09 20:05:23 tove Exp $
+
+# Please note: apache, java, mono and ruby support disabled for now.
+# Fill a bug if you need it.
+#
+# dju@gentoo.org, 4th July 2005
+
+inherit eutils perl-app multilib autotools
+
+DESCRIPTION="Clearsilver is a fast, powerful, and language-neutral HTML template system."
+HOMEPAGE="http://www.clearsilver.net/"
+SRC_URI="http://www.clearsilver.net/downloads/${P}.tar.gz"
+
+LICENSE="CS-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="perl python zlib"
+
+DEPEND="python? ( dev-lang/python )
+	perl? ( dev-lang/perl )
+	zlib? ( sys-libs/zlib )"
+
+DOCS="README INSTALL"
+
+if use python ; then
+	DOCS="${DOCS} README.python"
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-perl_installdir.patch
+
+	use zlib && epatch "${FILESDIR}"/${P}-libz.patch
+
+	epatch "${FILESDIR}"/${P}-libdir.patch
+	sed -i -e "s:GENTOO_LIBDIR:$(get_libdir):" configure.in
+	eautoreconf || die "eautoreconf failed"
+
+	# Fix for Gentoo/Freebsd
+	[[ "${ARCH}" == FreeBSD ]] && touch ${S}/features.h ${S}/cgi/features.h
+}
+
+src_compile() {
+	econf \
+		$(use_enable perl) \
+		$(use_with perl perl /usr/bin/perl) \
+		$(use_enable python) \
+		$(use_with python python /usr/bin/python) \
+		$(use_enable zlib compression) \
+		"--disable-apache" \
+		"--disable-ruby" \
+		"--disable-java" \
+		"--disable-csharp" \
+		|| die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ${DOCS} || die "dodoc failed"
+
+	if use perl ; then
+		fixlocalpod || die "fixlocalpod failed"
+	fi
+}
diff --git a/dev-libs/clearsilver/files/clearsilver-0.10.5-perl_installdir.patch b/dev-libs/clearsilver/files/clearsilver-0.10.5-perl_installdir.patch
new file mode 100644
index 000000000000..a8073e1f0afb
--- /dev/null
+++ b/dev-libs/clearsilver/files/clearsilver-0.10.5-perl_installdir.patch
@@ -0,0 +1,22 @@
+X-Bug-Debian: http://bugs.debian.org/357908
+X-Bug-Gentoo: https://bugs.gentoo.org/295895
+--- b/Makefile
++++ a/Makefile
+@@ -29,7 +29,7 @@
+ 	@for mdir in $(SUBDIRS); do \
+ 	  if test -d $$mdir; then \
+ 	    if test -f $$mdir/Makefile.PL -a ! -f $$mdir/Makefile; then \
+-	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix); cd ..; \
++	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; cd ..; \
+ 	    fi; \
+ 	    $(MAKE) -C $$mdir PREFIX=$(prefix); \
+ 	  fi; \
+@@ -46,7 +46,7 @@
+ 	@for mdir in $(SUBDIRS); do \
+ 	  if test -d $$mdir; then \
+ 	    if test -f $$mdir/Makefile.PL -a ! -f $$mdir/Makefile; then \
+-	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix); cd ..; \
++	      cd $$mdir; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor; cd ..; \
+ 	    fi; \
+ 	    $(MAKE) -C $$mdir PREFIX=$(prefix) install; \
+ 	  fi; \