[gentoo-commits] gentoo-x86 commit in dev-perl/perl-tk: perl-tk-804.31.0-r1.ebuild ChangeLog

[Vladimir Smirnov (civil)]

civil       14/01/21 13:40:35

  Modified:             ChangeLog
  Added:                perl-tk-804.31.0-r1.ebuild
  Log:
  Fix libpng pkg-config, force unbundling of jpeg, libpng, zlib
  
  (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xA832680F)

Revision  Changes    Path
1.90                 dev-perl/perl-tk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/ChangeLog?r1=1.89&r2=1.90

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog	13 Aug 2013 11:56:24 -0000	1.89
+++ ChangeLog	21 Jan 2014 13:40:35 -0000	1.90
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/perl-tk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.89 2013/08/13 11:56:24 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.90 2014/01/21 13:40:35 civil Exp $
+
+*perl-tk-804.31.0-r1 (21 Jan 2014)
+
+  21 Jan 2014;  <civil@g.o>
+  +files/perl-tk-804.31.0-fix-libpng-option.patch, +perl-tk-804.31.0-r1.ebuild:
+  Fix libpng pkg-config, force unbundling of jpeg, libpng, zlib
 
 *perl-tk-804.31.0 (13 Aug 2013)
 



1.1                  dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: perl-tk-804.31.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.31.0-r1.ebuild,v 1.1 2014/01/21 13:40:35 civil Exp $

EAPI=5

MY_PN=Tk
MODULE_AUTHOR=SREZIC
MODULE_VERSION=804.031
inherit multilib perl-module

DESCRIPTION="A Perl Module for Tk"

LICENSE+=" BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""

DEPEND="x11-libs/libX11
	x11-libs/libXft
	media-libs/freetype
	>=media-libs/libpng-1.4
	virtual/jpeg"
RDEPEND="${DEPEND}"

# No test running here, requires an X server, and fails lots anyway.
SRC_TEST="skip"
PATCHES=( "${FILESDIR}"/${P}-xorg.patch
	"${FILESDIR}/${P}"-fix-libpng-option.patch )

src_prepare() {
	MAKEOPTS+=" -j1" #333049
	myconf=( X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir) )
	mydoc="ToDo VERSIONS"

	perl-module_src_prepare
	# fix detection logic for Prefix, bug #385621
	sed -i -e "s:/usr:${EPREFIX}/usr:g" myConfig || die
	# having this around breaks with perl-module and a case-IN-sensitive fs
	rm build || die

	# Remove all bundled libs, fixes #488194
	local BUNDLED="PNG/libpng \
					PNG/zlib \
					JPEG/jpeg"
	for dir in ${BUNDLED}; do
		rm -r "${S}/${dir}" || die "Can't remove bundle"
		# Makefile.PL can copy files to ${S}/${dir}, so recreate them back.
		mkdir -p "${S}/${dir}" || die "Can't restore bundled dir"
		sed -i "\#^${dir}#d" "${S}"/MANIFEST || die 'Can not remove bundled libs from MANIFEST'
	done
}