Query udev.pc pkg-config file for udevdir value to be compatible with sys-fs/udev >= 187.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 32 insertions, 10 deletions

diff --git a/media-libs/libgpod/ChangeLog b/media-libs/libgpod/ChangeLog
index 22c13d65cb3a..a42aced409a0 100644
--- a/media-libs/libgpod/ChangeLog
+++ b/media-libs/libgpod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.90 2012/05/05 08:02:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.91 2012/08/08 14:49:49 ssuominen Exp $
+
+  08 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> libgpod-0.8.2.ebuild:
+  Query udev.pc pkg-config file for udevdir value to be compatible with
+  sys-fs/udev >= 187.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> libgpod-0.8.0.ebuild,
   libgpod-0.8.2.ebuild:
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index 5923149f2909..9c0768bb2153 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,6 +1,20 @@
-DIST libgpod-0.8.0.tar.gz 997674 RMD160 446d5045f6c91e55e894c5d5370658afc8abe8ef SHA1 ddef7f3583535242b4928b300eb8aa6bc9a0e6dc SHA256 1b8baef8e5a718f6a11eaaea5619b906198766d999e8d54308f514b522571602
-DIST libgpod-0.8.2.tar.bz2 777945 RMD160 63e60211cf0e52a60eade6d39e12b6fab023fccb SHA1 f9ba70cd6f00ae59cdc6a43cc72c409a4d27606e SHA256 0054e9b0060d7b923cdc1b748b6617f4dc9f1401fb6bc9368f9960537c55a092
-EBUILD libgpod-0.8.0.ebuild 1708 RMD160 34666616277d3ce03211f5d086fc083c19ddc55e SHA1 826adf3852e086f2e8d0867d422cbc04c0a774ab SHA256 dc3866ae72b2d20534a3128aa869208d730cf7537e6543fb8b5d42954da959dc
-EBUILD libgpod-0.8.2.ebuild 1648 RMD160 74c5be42097aaabe921af7f0f9798443425eadad SHA1 e297ed80400a597b4b3ee5f1b510760410b1d791 SHA256 aa342c2918dee08fbcf1548012062cb04ce257c71e1a7ad64048794e454646f6
-MISC ChangeLog 11516 RMD160 c0a16e801d9b8582de80e3432f525749fdb8ed94 SHA1 41f1fa89b2ba5144cc095b5fe19dddacf539494f SHA256 16a428172916eaf0a5f3acdd9f1a6a0983e6dad8d5b49287be910c5b71a9b516
-MISC metadata.xml 472 RMD160 00f729d54221394b8cf5fba4475bd743104d9794 SHA1 0fc737ac4b6536b3fa9ff8163068cdc0b592bb2d SHA256 d4af947ec70a89b37e8e388eb94c4ed59882a18c3d8be4acb918617f05cced42
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST libgpod-0.8.0.tar.gz 997674 SHA256 1b8baef8e5a718f6a11eaaea5619b906198766d999e8d54308f514b522571602 SHA512 5b5a699e0651e7b73d36596772fe0a6813f45224e7cb1da8defc935c4dd67e34e54c3a4235a42b217eeaf2d336b87dccd9bf9787f2ada516204b050a9668d40e WHIRLPOOL da175141f6245b01c2e1ba0b5e3d5de6347addefd594ab5f36500221d0463bd08fca57f45e3abe61c99ec88cda3a0aeb571e10387e043c760d53cbd502a1924b
+DIST libgpod-0.8.2.tar.bz2 777945 SHA256 0054e9b0060d7b923cdc1b748b6617f4dc9f1401fb6bc9368f9960537c55a092 SHA512 5751ece027e037cb0f7027c9fea493e45910d882d42681ccb2ab90fc771833c497d5661cd0b6b9fc3bc7e00b82b636705279b8e6c0962b6856511f5842d98da3 WHIRLPOOL 900b4fb339e4386ca630dee5ec79950ffcf22639f9c046f4f63589bdd63ae2e527b366100bd311572b19b72bc72f43113f3fcc47ff6495d0ef3cf50a67d7a9d5
+EBUILD libgpod-0.8.0.ebuild 1708 SHA256 dc3866ae72b2d20534a3128aa869208d730cf7537e6543fb8b5d42954da959dc SHA512 ad4c7d3ffb72ab7fb46212238c7fc2388a2060d46fd4bb3647d8e65f3924a484fb4119b55193b33f859d062de21328fdf8961050c799338f909b5ee791370848 WHIRLPOOL 3f5cc0d37d0cc5d38c1f29b40009ec892d2a7ec7f01971dc1e2bea526a25019faaf478de678e8d81d91c57d30e3dd7fb2192b5c5e0b1ad4b92e5dcf3d1c68b40
+EBUILD libgpod-0.8.2.ebuild 1787 SHA256 837f4ec66de579d7ee365f27d73aa12bf3e7c822885f8a8b8538249fc7c821b5 SHA512 5b7a8deaf455e536d01793275d366c8973bccd3502ac0cd4be57043ce6895baad6ab6e7ee5ff4ac1435d3ca3c69ee44783059ed06b930320b149b898f1c473a7 WHIRLPOOL 79e6744f3f8350e84088252fc6ca7118876fcc2d117ec0793df8ca4311863e277b37bfe0d76f5e94414be88a9988c1187504bb68d9ce3f782412338a68ad1cab
+MISC ChangeLog 11690 SHA256 d51fc34da531d303ec022eaf4fac26ead2cb2a314880c1ef6e51432635578d2b SHA512 fd14159962f781efc9b840d3068c90d1be6915b3619e5f6854e7b9bd386b065b2554f3894e3df3a652a3a8208a352247ed7976835c2d65fd504fc242fa1966e5 WHIRLPOOL 29d2b6eee758e0c7abd960e0493e62c85a774f173f2847391037d9a08651ee952bd6d70f773f28f162f61fb38d6ba76ba1678dacb9bc92cb949b93f2b7a1cead
+MISC metadata.xml 472 SHA256 d4af947ec70a89b37e8e388eb94c4ed59882a18c3d8be4acb918617f05cced42 SHA512 4803036b3daddfdee450437915b0009574c8ba766f8e47e1a2a879fc63b6eb61cf06c0d5f544c9017ced5f90f46094958c13352b5b6431dcb8628518657aace3 WHIRLPOOL 6022312d38660d33f9478516823a15ae62a80c17a0235fb63395a25c11bae4815505bb48754dce19629ae204f42a6cccc26d3046119cbd79add01ac950430252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQInx+AAoJEEdUh39IaPFN3YIH/3A1ivxwtHq2SnVI7HsOXiwY
+Y0Rj3bScxbbmfcnd3NSu2GCpF0IEMP3PWR79bHaagJBbCm3EmNSY2eyvcZVg9MTe
+1N2Fg1qrf15lVZ7r1A0ZUFPrOgx3nIIzUefpOg+RXPvJelxWz32TyqRBkaRj3tex
+2KIovk80mXZrW+nFY7f87PqVJd/SFuF+oNHNL7g1PAPcgQsgEXW0Q61q9JH+L09K
+D+6dfcbQkrc2v9u2KEZwZexkvM/QqJkVLD/Pc1BxvxbTxqbBOrX9RwBOajHmDJqB
+ldJF/shHuWuD5tDbuvNLavkoZuuE6vkZ9Iz3zoSjuXXZgeV6Qj5Rj5ZdKdOgkFs=
+=UZDP
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgpod/libgpod-0.8.2.ebuild b/media-libs/libgpod/libgpod-0.8.2.ebuild
index f6637b686593..818f36eaf3f6 100644
--- a/media-libs/libgpod/libgpod-0.8.2.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.8.2.ebuild,v 1.4 2012/05/05 08:02:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.8.2.ebuild,v 1.5 2012/08/08 14:49:49 ssuominen Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit mono python
+inherit eutils mono python toolchain-funcs
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod/"
@@ -53,6 +53,9 @@ src_prepare() {
 }
 
 src_configure() {
+	local udevdir=/lib/udev
+	use udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable udev) \
@@ -60,6 +63,7 @@ src_configure() {
 		$(use_enable python pygobject) \
 		--without-hal \
 		$(use_with ios libimobiledevice) \
+		--with-udev-dir="${udevdir}" \
 		--with-html-dir=/usr/share/doc/${PF}/html \
 		$(use_with python) \
 		$(use_with mono)
@@ -67,7 +71,7 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 }
 
 pkg_postinst() {