mgorny      14/03/30 11:11:13

  Modified:             ChangeLog
  Added:                pkgconfig-openbsd-20130507-r1.ebuild
  Log:
  Enable multilib support. Install to proper perl libdir.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.15                 dev-util/pkgconfig-openbsd/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog?rev=1.15&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog?rev=1.15&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog   7 May 2013 14:01:46 -0000       1.14
+++ ChangeLog   30 Mar 2014 11:11:13 -0000      1.15
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/pkgconfig-openbsd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog,v 1.14 
2013/05/07 14:01:46 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/ChangeLog,v 1.15 
2014/03/30 11:11:13 mgorny Exp $
+
+*pkgconfig-openbsd-20130507-r1 (30 Mar 2014)
+
+  30 Mar 2014; Michał Górny <[email protected]>
+  +pkgconfig-openbsd-20130507-r1.ebuild:
+  Enable multilib support. Install to proper perl libdir.
 
   07 May 2013; Samuli Suominen <[email protected]>
   -pkgconfig-openbsd-20130225.ebuild:
@@ -70,4 +76,3 @@
   16 Jan 2012; Samuli Suominen <[email protected]>
   +pkgconfig-openbsd-20120116.ebuild:
   Initial commit.
-



1.1                  
dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild?rev=1.1&content-type=text/plain

Index: pkgconfig-openbsd-20130507-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild,v
 1.1 2014/03/30 11:11:13 mgorny Exp $

EAPI=5

inherit eutils multilib multilib-minimal

# cvs -d [email protected]:/cvs get src/usr.bin/pkg-config

PKG_M4_VERSION=0.28

DESCRIPTION="A perl based version of pkg-config from OpenBSD"
HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/pkg-config/";
SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz
        pkg-config? ( 
http://pkgconfig.freedesktop.org/releases/pkg-config-${PKG_M4_VERSION}.tar.gz )"

LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+pkg-config"

DEPEND="dev-lang/perl:="
RDEPEND="${DEPEND}
        virtual/perl-Getopt-Long
        pkg-config? (
                !dev-util/pkgconfig
                !dev-util/pkgconf[pkg-config]
        )"

S=${WORKDIR}/src

src_prepare() {
        epatch_user
        ecvs_clean

        # Config.pm from dev-lang/perl doesn't set ARCH, only archname
        sed -i -e '/Config/s:ARCH:archname:' usr.bin/pkg-config/pkg-config || 
die

        if use pkg-config; then
                MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config )
        else
                MULTILIB_CHOST_TOOLS=( /usr/bin/pkg-config-openbsd )
        fi
}

multilib_src_install() {
        local pc_bin=pkg-config
        use pkg-config || pc_bin+=-openbsd

        newbin "${S}"/usr.bin/pkg-config/pkg-config ${pc_bin}
        newman "${S}"/usr.bin/pkg-config/pkg-config.1 ${pc_bin}.1

        # insert proper paths
        local pc_paths=(
                /usr/$(get_libdir)/pkgconfig
                /usr/share/pkgconfig
        )
        sed -i -e "/my @PKGPATH/,/;/{s@(.*@( ${pc_paths[*]} );@p;d}" \
                "${ED%/}/usr/bin/${pc_bin}" || die
}

multilib_src_install_all() {
        if use pkg-config; then
                insinto /usr/share/aclocal
                doins "${WORKDIR}"/pkg-config-*/pkg.m4
        fi

        local perl_version=$(perl -e 'printf "%vd", $^V')

        insinto /usr/$(get_libdir)/perl5/vendor_perl/${perl_version}
        doins -r "${S}"/usr.bin/pkg-config/OpenBSD
}




Reply via email to