| 1 |
pinkbyte 14/02/27 08:30:09 |
| 2 |
|
| 3 |
Modified: libdivecomputer-9999.ebuild |
| 4 |
libdivecomputer-0.4.1.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Port USE='tools' fix into live ebuild. QA fixes: move AUTOTOOLS_IN_SOURCE_BUILD before inheriting apropriate eclass, correct src_prepare to call autotools-utils_src_prepare instead of plain eautoreconf, epatch_user in non-live ebuild |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 dev-libs/libdivecomputer/libdivecomputer-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: libdivecomputer-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- libdivecomputer-9999.ebuild 28 Mar 2013 18:43:29 -0000 1.1 |
| 24 |
+++ libdivecomputer-9999.ebuild 27 Feb 2014 08:30:09 -0000 1.2 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation |
| 27 |
+# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild,v 1.1 2013/03/28 18:43:29 tomwij Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-9999.ebuild,v 1.2 2014/02/27 08:30:09 pinkbyte Exp $ |
| 31 |
|
| 32 |
EAPI="5" |
| 33 |
|
| 34 |
@@ -10,6 +10,7 @@ |
| 35 |
AUTOTOOLIZE=yes |
| 36 |
fi |
| 37 |
|
| 38 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 39 |
inherit eutils autotools-utils ${GIT_ECLASS} |
| 40 |
|
| 41 |
if [[ ${PV} = *9999* ]]; then |
| 42 |
@@ -22,30 +23,26 @@ |
| 43 |
HOMEPAGE="http://www.divesoftware.org/libdc" |
| 44 |
LICENSE="LGPL-2.1" |
| 45 |
|
| 46 |
-KEYWORDS="" |
| 47 |
+KEYWORDS="~amd64 ~x86" |
| 48 |
SLOT="0" |
| 49 |
-IUSE="usb examples +static-libs" |
| 50 |
+IUSE="usb +static-libs -tools" |
| 51 |
|
| 52 |
-RDEPEND="usb? ( virtual/libusb )" |
| 53 |
+RDEPEND="usb? ( virtual/libusb:1 )" |
| 54 |
DEPEND="${RDEPEND} |
| 55 |
virtual/pkgconfig" |
| 56 |
|
| 57 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 58 |
- |
| 59 |
src_prepare() { |
| 60 |
if [[ -n ${AUTOTOOLIZE} ]]; then |
| 61 |
- eautoreconf |
| 62 |
+ autotools-utils_src_prepare |
| 63 |
+ else |
| 64 |
+ epatch_user |
| 65 |
fi |
| 66 |
} |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
autotools-utils_src_configure |
| 70 |
|
| 71 |
- if use usb ; then |
| 72 |
- sed -i 's|#define HAVE_LIBUSB 1||' config.h || die "sed failed" |
| 73 |
- fi |
| 74 |
- |
| 75 |
- if use examples ; then |
| 76 |
+ if ! use tools ; then |
| 77 |
sed -i 's|examples||' Makefile || die "sed failed" |
| 78 |
fi |
| 79 |
} |
| 80 |
@@ -56,4 +53,21 @@ |
| 81 |
|
| 82 |
src_install() { |
| 83 |
autotools-utils_src_install |
| 84 |
+ |
| 85 |
+ if use tools ; then |
| 86 |
+ einfo "prefixing tools with 'dctool_'" |
| 87 |
+ pushd "${D}/usr/bin/" |
| 88 |
+ for file in * ; do |
| 89 |
+ mv "${file}" "dctool_${file}" || die "prefixing tools failed" |
| 90 |
+ done |
| 91 |
+ popd |
| 92 |
+ fi |
| 93 |
+} |
| 94 |
+ |
| 95 |
+pkg_postinst() { |
| 96 |
+ if use tools ; then |
| 97 |
+ elog "The 'tools' USE flag has been enabled," |
| 98 |
+ elog "to avoid file collisions, all ${PN}" |
| 99 |
+ elog "related tools have been prefixed with 'dctool_'" |
| 100 |
+ fi |
| 101 |
} |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
1.2 dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild |
| 106 |
|
| 107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild?rev=1.2&view=markup |
| 108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild?rev=1.2&content-type=text/plain |
| 109 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild?r1=1.1&r2=1.2 |
| 110 |
|
| 111 |
Index: libdivecomputer-0.4.1.ebuild |
| 112 |
=================================================================== |
| 113 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild,v |
| 114 |
retrieving revision 1.1 |
| 115 |
retrieving revision 1.2 |
| 116 |
diff -u -r1.1 -r1.2 |
| 117 |
--- libdivecomputer-0.4.1.ebuild 24 Aug 2013 14:37:18 -0000 1.1 |
| 118 |
+++ libdivecomputer-0.4.1.ebuild 27 Feb 2014 08:30:09 -0000 1.2 |
| 119 |
@@ -1,6 +1,6 @@ |
| 120 |
-# Copyright 1999-2013 Gentoo Foundation |
| 121 |
+# Copyright 1999-2014 Gentoo Foundation |
| 122 |
# Distributed under the terms of the GNU General Public License v2 |
| 123 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild,v 1.1 2013/08/24 14:37:18 tomwij Exp $ |
| 124 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/libdivecomputer-0.4.1.ebuild,v 1.2 2014/02/27 08:30:09 pinkbyte Exp $ |
| 125 |
|
| 126 |
EAPI="5" |
| 127 |
|
| 128 |
@@ -10,6 +10,7 @@ |
| 129 |
AUTOTOOLIZE=yes |
| 130 |
fi |
| 131 |
|
| 132 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 133 |
inherit eutils autotools-utils ${GIT_ECLASS} |
| 134 |
|
| 135 |
if [[ ${PV} = *9999* ]]; then |
| 136 |
@@ -30,11 +31,11 @@ |
| 137 |
DEPEND="${RDEPEND} |
| 138 |
virtual/pkgconfig" |
| 139 |
|
| 140 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 141 |
- |
| 142 |
src_prepare() { |
| 143 |
if [[ -n ${AUTOTOOLIZE} ]]; then |
| 144 |
- eautoreconf |
| 145 |
+ autotools-utils_src_prepare |
| 146 |
+ else |
| 147 |
+ epatch_user |
| 148 |
fi |
| 149 |
} |
| 150 |
|
| 151 |
|
| 152 |
|
| 153 |
|
| 154 |
1.9 dev-libs/libdivecomputer/ChangeLog |
| 155 |
|
| 156 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/ChangeLog?rev=1.9&view=markup |
| 157 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/ChangeLog?rev=1.9&content-type=text/plain |
| 158 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdivecomputer/ChangeLog?r1=1.8&r2=1.9 |
| 159 |
|
| 160 |
Index: ChangeLog |
| 161 |
=================================================================== |
| 162 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v |
| 163 |
retrieving revision 1.8 |
| 164 |
retrieving revision 1.9 |
| 165 |
diff -u -r1.8 -r1.9 |
| 166 |
--- ChangeLog 16 Feb 2014 12:52:10 -0000 1.8 |
| 167 |
+++ ChangeLog 27 Feb 2014 08:30:09 -0000 1.9 |
| 168 |
@@ -1,6 +1,13 @@ |
| 169 |
# ChangeLog for dev-libs/libdivecomputer |
| 170 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 171 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v 1.8 2014/02/16 12:52:10 pinkbyte Exp $ |
| 172 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdivecomputer/ChangeLog,v 1.9 2014/02/27 08:30:09 pinkbyte Exp $ |
| 173 |
+ |
| 174 |
+ 27 Feb 2014; Sergey Popov <pinkbyte@g.o> libdivecomputer-0.4.1.ebuild, |
| 175 |
+ libdivecomputer-9999.ebuild: |
| 176 |
+ Port USE='tools' fix into live ebuild. QA fixes: move |
| 177 |
+ AUTOTOOLS_IN_SOURCE_BUILD before inheriting apropriate eclass, correct |
| 178 |
+ src_prepare to call autotools-utils_src_prepare instead of plain eautoreconf, |
| 179 |
+ epatch_user in non-live ebuild |
| 180 |
|
| 181 |
16 Feb 2014; Sergey Popov <pinkbyte@g.o> metadata.xml: |
| 182 |
Fix maintainer's email address, fix spelling |
Archives