ohnobinki_overlay Changeset - f73e3b43530f

Changeset - f73e3b43530f

Parent rev.

Child rev.

[Not reviewed]

default

1 3 0

Nathan Brink (binki) - 15 years ago 2010-02-19 12:26:05
ohnobinki@ohnopublishing.net

Remove extra appconf.pri.in file. Make qca_do_pri() more verbose.
(Portage version: 2.2_rc62-r4/hg/Linux x86_64)
(Unsigned Manifest commit)

4 files changed with 6 insertions and 6 deletions:

app-crypt/qca/Manifest

app-crypt/qca/files/app.pri.in

app-crypt/qca/files/confapp.pri.in

app-crypt/qca/qca-2.0.2-r2.ebuild

0 comments (0 inline, 0 general)

app-crypt/qca/Manifest

➞

Show inline comments

-AUX app.pri.in 249 RMD160 80fdd8850ff3a5f4c0424ce749d28f73617494d5 SHA1 2c5e24c3f73a8406e468658357e0d993f5b0c004 SHA256 98792316e42c48f22aeae1111b30880c9442b3515c1d3f5f8ea585ff30270da8
+AUX app.pri.in 246 RMD160 3bddf86df88a0cbaad4c780fdee840216daba96a SHA1 6fd8e2c7f0ed72ab734183fffe663366b436b845 SHA256 81529b8999546a440154c403c30308d35380c32c7f09fbe02e577f85a0c35a0a
 AUX conf.pri.in 533 RMD160 b105d169207de318a67f46e27686bb6cedcc721b SHA1 e69fd52a96cb630357f3f763834df2b9a72719db SHA256 caf6cb1a6ff28592c5ecb19b042ba9a072b1d1a5ce45bed16a524120feb5822e
 AUX confapp.pri.in 18 RMD160 4d4e03e1ffebfbee5e121743368538bf406f949d SHA1 393162a783c502ca2cf9e6fd8190c392cbae8920 SHA256 cd6dd15f80d7a3becfa0cb4f55dcfaab269b08d9b67d0e5c7313cfae28751d26
 AUX qca-2.0.2-pcfilespath.patch 409 RMD160 65368cb474f2dd1d79b0c9d00424831acd777465 SHA1 a2defc2ae7d3dc31986f89cb8ec2760df85cb208 SHA256 d4d276c13f08bc538b79779aba49126b310df5c97f95b2c7010de050c880d695
 DIST qca-2.0.2.tar.bz2 1937201 RMD160 18b0f497709f9700227644977946735d2ec3c623 SHA1 5a414c3296cd37d1ec34182be0d089c5073f55a8 SHA256 49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8
-EBUILD qca-2.0.2-r2.ebuild 2593 RMD160 ee899bc2d7a73c0e7d89a5bdebe4e29a2ed7982e SHA1 3c93f44aa5d3cd90e434d2c40c26eda9dda26268 SHA256 1367acc76489df332d62880bfda14233f577de00b8980835f6f6d14aa75a79b1
+EBUILD qca-2.0.2-r2.ebuild 2675 RMD160 c35aa3601273542b6dd53b9c4546461af1836ab0 SHA1 6153896206cfe06c6d769315a252843e9a5e7b42 SHA256 b8f12742e5e78684cd5095f3dc6e503dbad9699815bd1282f35c9edc81c0c941
 MISC ChangeLog 10382 RMD160 b01ff364d8e863e12a6a318db76403a99bbad84f SHA1 ea0942c245117a0afe88a635d590b47c0f8cfa0f SHA256 214bde3cb4d4e8a35a5e956d2dc02b4bafca7ba7a5bfb430dcda6bdaafc3e52f
 MISC metadata.xml 192 RMD160 421d4665996ea38fdfc756e2da700603abe17ec7 SHA1 c32af4b790776c36b524e5f2e2dca587c9cd3351 SHA256 e585d77a075b30463ad28cc89374f9ef2876636bca95a23321b824e0122aa6fd

app-crypt/qca/files/app.pri.in

➞

Show inline comments

 ### eqmake4 was here ###
-include(confapp.pri)
+include(conf.pri)
 mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
 exists(crypto.prf) {
 	# our apps should build against the qca in this tree
 	include(crypto.prf)
 } else {
 	# attempt to use system-wide qca
 	CONFIG *= crypto
+}

app-crypt/qca/files/confapp.pri.in

➞

Show inline comments

deleted file

app-crypt/qca/qca-2.0.2-r2.ebuild

➞

Show inline comments

@@ @@ -22,46 +22,48 @@ RDEPEND="${DEPEND} @@
+"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-pcfilespath.patch
 	use aqua && sed -i \
 		-e "s|QMAKE_LFLAGS_SONAME =.*|QMAKE_LFLAGS_SONAME = -Wl,-install_name,|g" \
 		src/src.pro
+}
 qca_do_pri() {
 	local buildtype=release
 	einfo "Manually generating $1 to avoid calling qconf-generated ./configure, bug 305905"
 	use debug && buildtype=debug
 	sed "${FILESDIR}"/$1.in \
 		-e "s:@PN@:${PN}${PV:0:1}:" \
 		-e "s:@PREFIX@:${EPREFIX}/usr:" \
 		-e "s:@BINDIR@:${EPREFIX}/usr/bin:" \
 		-e "s:@INCDIR@:${EPREFIX}/usr/include:" \
 		-e "s:@LIBDIR@:${EPREFIX}/usr/${_libdir}:" \
 		-e "s:@DATADIR@:${EPREFIX}/usr/share:" \
 		-e "s:@BUILDTYPE@:${buildtype}:" \
 		-e "s:@QTDATADIR@:${EPREFIX}/usr/share/qt4:" \
 		> "${S}"/$1 \
 		|| die "Failed to install and preprocess $1"
+}
 src_configure() {
 	use prefix || EPREFIX=
 	_libdir=$(get_libdir)
 	# fix multilib/ABI issues by avoiding nasty black magic of sys-devel/qconf ;-)
-	for pri in app confapp conf; do
 	for pri in app conf; do
 		qca_do_pri ${pri}.pri
 	done
 	# prepare crypto.prf:
 	echo "QCA_LIBDIR = /usr/${_libdir}/${PN}${PV:0:1}" >> crypto.prf || die
 	echo "QCA_INCDIR = /usr/include/${PN}${PV:0:1}" >> crypto.prf || die
 	cat crypto.prf.in >> crypto.prf || die
 	# Ensure proper rpath
 	export EXTRA_QMAKE_RPATH="${EPREFIX}/usr/${_libdir}/qca2"
 	eqmake4 QMAKE_LIBDIR_QT="/usr/$(get_libdir)/qt4"

0 comments (0 inline, 0 general)