jlec        15/03/21 14:57:55

  Modified:             metadata.xml firebird-2.5.3.26780.0-r1.ebuild
                        ChangeLog
  Removed:              firebird-2.5.3.26780.0.ebuild
  Log:
  Clean old; Clean ebuild
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.13                 dev-db/firebird/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/metadata.xml?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/metadata.xml?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/metadata.xml?r1=1.12&r2=1.13

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/firebird/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml        7 Sep 2014 13:09:10 -0000       1.12
+++ metadata.xml        21 Mar 2015 14:57:55 -0000      1.13
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<maintainer>
-<email>[email protected]</email>
-</maintainer>
-       <longdescription>
+  <maintainer>
+    <email>[email protected]</email>
+  </maintainer>
+  <longdescription>
        Firebird is a relational database offering many ANSI SQL standard 
        features that runs on Linux, Windows, and a variety of Unix platforms.
        Firebird offers excellent concurrency, high performance, and powerful
        language support for stored procedures and triggers. It has been used
        in production systems, under a variety of names, since 1981.
        </longdescription>
-       <use>
-               <flag name='client'>Install client library and header files 
only</flag>
-               <flag name='superserver'>Install SuperServer</flag>
-               <flag name='xinetd'>Install ClassicServer</flag>
-       </use>
+  <use>
+    <flag name="client">Install client library and header files only</flag>
+    <flag name="superserver">Install SuperServer</flag>
+    <flag name="xinetd">Install ClassicServer</flag>
+  </use>
 </pkgmetadata>



1.2                  dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild?r1=1.1&r2=1.2

Index: firebird-2.5.3.26780.0-r1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firebird-2.5.3.26780.0-r1.ebuild    16 Dec 2014 10:14:12 -0000      1.1
+++ firebird-2.5.3.26780.0-r1.ebuild    21 Mar 2015 14:57:55 -0000      1.2
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.1 
2014/12/16 10:14:12 pacho Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.2 
2015/03/21 14:57:55 jlec Exp $
 
 EAPI=5
+
 inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
@@ -10,7 +11,8 @@
 
 DESCRIPTION="A relational database offering many ANSI SQL:2003 and some 
SQL:2008 features"
 HOMEPAGE="http://www.firebirdsql.org/";
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+SRC_URI="
+       mirror://sourceforge/firebird/${MY_P}.tar.bz2
         doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
 LICENSE="IDPL Interbase-1.0"
@@ -24,21 +26,21 @@
        superserver? ( !xinetd )
 "
 
-RESTRICT="userpriv"
-
-RDEPEND="
+CDEPEND="
        dev-libs/libedit
        dev-libs/icu:=
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
        >=dev-util/btyacc-3.0-r2
        doc? ( app-arch/unzip )
 "
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
        xinetd? ( virtual/inetd )
        !sys-cluster/ganglia
 "
 
+RESTRICT="userpriv"
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -53,26 +55,21 @@
 }
 
 src_unpack() {
+       unpack "${MY_P}.tar.bz2"
        if use doc; then
                # Unpack docs
-               mkdir "${WORKDIR}/manuals"
-               cd "${WORKDIR}/manuals"
+               mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
                unpack ib_b60_doc.zip
-               cd "${WORKDIR}"
        fi
-       unpack "${MY_P}.tar.bz2"
-       cd "${S}"
 }
 
 src_prepare() {
        # This patch might be portable, and not need to be duplicated per 
version
        # also might no longer be necessary to patch deps or libs, just flags
-       epatch "${FILESDIR}/${PN}-2.5.3.26780.0-deps-flags.patch"
+       epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
 
-       use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch"
-       if ! use superserver ; then
-               epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch"
-       fi
+       use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+       use superserver || epatch 
"${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
 
        # Rename references to isql to fbsql
        # sed vs patch for portability and addtional location changes
@@ -85,8 +82,8 @@
                -e 's:ISQL :FBSQL :w /dev/stdout' \
                src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
 
-       find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-       rm -rf "${S}"/extern/{btyacc,editline,icu}
+       find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
+       rm -rf "${S}"/extern/{btyacc,editline,icu} || die
 
        eautoreconf
 }
@@ -129,15 +126,14 @@
 }
 
 src_install() {
-       cd "${S}/gen/${PN}"
+       cd "${S}/gen/${PN}" || die
 
        if use doc; then
                dodoc "${S}"/doc/*.pdf
                find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc 
'{}' + || die
        fi
 
-       insinto /usr/include
-       doins include/*
+       doheader include/*
 
        rm lib/libfbstatic.a
 
@@ -253,11 +249,11 @@
                chown firebird:firebird 
"${ROOT}/etc/firebird/{security.*,security2.*}"
                chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
 
-               einfo
+               echo
                einfo "Converted old security.gdb to security2.fdb, 
security.gdb has been "
                einfo "renamed to security.gdb.old. if you had previous 
security2.fdb, "
                einfo "it's backed to security2.fdb.old (all under 
${ROOT}/etc/firebird)."
-               einfo
+               echo
        fi
 
        # we need to enable local access to the server



1.119                dev-db/firebird/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/ChangeLog?rev=1.119&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/ChangeLog?rev=1.119&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/firebird/ChangeLog?r1=1.118&r2=1.119

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog   16 Dec 2014 10:14:12 -0000      1.118
+++ ChangeLog   21 Mar 2015 14:57:55 -0000      1.119
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/firebird
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.118 
2014/12/16 10:14:12 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.119 
2015/03/21 14:57:55 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <[email protected]> -firebird-2.5.3.26780.0.ebuild,
+  firebird-2.5.3.26780.0-r1.ebuild, metadata.xml:
+  Clean old; Clean ebuild
 
 *firebird-2.5.3.26780.0-r1 (16 Dec 2014)
 




Reply via email to