From 352974aea331b6aa4d46a4890582aef2507a164b Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 13 Nov 2014 12:48:41 +0000 Subject: [PATCH] Drop old (#508854) Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- net-wireless/gnome-bluetooth/ChangeLog | 12 +- net-wireless/gnome-bluetooth/Manifest | 30 +-- .../gnome-bluetooth/files/80-rfkill.rules | 5 - .../gnome-bluetooth-2.32.0-fix-typo.patch | 22 -- ...bluetooth-2.32.0-introspection-build.patch | 208 ------------------ ...gnome-bluetooth-2.32.0-libnotify-0.7.patch | 27 --- ...gnome-bluetooth-2.32.0-nsd-automagic.patch | 28 --- .../gnome-bluetooth-2.32.0-pin-quirk.patch | 23 -- .../gnome-bluetooth-2.32.0-update-dtd.patch | 21 -- .../gnome-bluetooth-2.32.0-r1.ebuild | 110 --------- net-wireless/gnome-bluetooth/metadata.xml | 4 - 11 files changed, 16 insertions(+), 474 deletions(-) delete mode 100644 net-wireless/gnome-bluetooth/files/80-rfkill.rules delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-nsd-automagic.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch delete mode 100644 net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog index fddd043331ad..fc6b14d26260 100644 --- a/net-wireless/gnome-bluetooth/ChangeLog +++ b/net-wireless/gnome-bluetooth/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-wireless/gnome-bluetooth # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.143 2014/07/23 15:37:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.144 2014/11/13 12:48:40 pacho Exp $ + + 13 Nov 2014; Pacho Ramos -files/80-rfkill.rules, + -files/gnome-bluetooth-2.32.0-fix-typo.patch, + -files/gnome-bluetooth-2.32.0-introspection-build.patch, + -files/gnome-bluetooth-2.32.0-libnotify-0.7.patch, + -files/gnome-bluetooth-2.32.0-nsd-automagic.patch, + -files/gnome-bluetooth-2.32.0-pin-quirk.patch, + -files/gnome-bluetooth-2.32.0-update-dtd.patch, + -gnome-bluetooth-2.32.0-r1.ebuild, metadata.xml: + Drop old (#508854) 23 Jul 2014; Agostino Sarubbo gnome-bluetooth-3.12.0.ebuild: Stable for x86, wrt bug #512012 diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest index f9d7041a31ac..f5192cb48364 100644 --- a/net-wireless/gnome-bluetooth/Manifest +++ b/net-wireless/gnome-bluetooth/Manifest @@ -2,37 +2,17 @@ Hash: SHA256 AUX 61-gnome-bluetooth.rules 399 SHA256 3590ead9f0f5344b8dd7b73d11ce2750711072f26d12ad76c48f38ec75641b72 SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d WHIRLPOOL 5562bbf15568c101aabdbba0d0f9b17ae9ca289da8100b3ae82077fd53fdf46b00736f729a444f4ebec13e7f6bdcd5a1b27e548fc7881722d5984efde0eed5fd -AUX 80-rfkill.rules 117 SHA256 81b3a8a3a3639b6d6024043364ad4917b32a85fd7f766e4051211d388e165798 SHA512 dcd7173ea905e41a8d583fc11f5fb04774b42e80a6bbc4d37896d041cf05938ffb98202cda1e56f8ec8a6708d2a09dcbf1f5309f775fb746ea29e4eb63939c14 WHIRLPOOL 47cc05faa13ca9811ddbaec36c3544c52dc42ad58d67e786f5bf91ac65a76d60c0e323df1e4c6cad006332e9244d7a63a78ae11a49b27c21b70be8b6a2b06df5 -AUX gnome-bluetooth-2.32.0-fix-typo.patch 823 SHA256 0cd8c2bc6e3a3eb94ba317f9599c86ecea9db4981e3ae27286004a8027b3c421 SHA512 a51a5d1aa57d339615cdabb9e7ef5865fc16bd67d0a6d43000149ef801e13af2d76be390fcb6664f090be931af9f6220585a446775addb701d634688086f2378 WHIRLPOOL 185ca55cc90c065f724959ba536fd9d60d6e2d7d0e21a77f54b511d3734ddcdf983af50887e06b3c9868a1640964b9db75c52b232abb1770cdb3b08a504fb15d -AUX gnome-bluetooth-2.32.0-introspection-build.patch 7550 SHA256 65d0326ffc06315d14e1d5790230edcae77b2ecb477c86792fed814639f0ad9f SHA512 9ef14a5e1dd52b7e97db4c8a4b45fa9b8372b1dc4796f12b64cd52d6cbe775862efc6fc1edf8b5ea190969121b038fcaff793f250547a0597edf3dca6c5c5ac3 WHIRLPOOL 631f3b74ee2b4976de58b3754a9a512763b6ff846b64960ba80a9a793c1df8d2dc8da5a039ef0cb6d0a0cf8e7996c73fce3b8839346b6ee30fc733949dae2242 -AUX gnome-bluetooth-2.32.0-libnotify-0.7.patch 622 SHA256 42b8388156249bd7c8a18db6d6aef18895ce861f2a79cb937e55eda864245838 SHA512 5f41574a46654ba58968ef0b0d72d73f1d52367e4816af5c51b1f755ca0a4245f5e941d326b7424afb6258d2d691b18c10d9379e407630cd9f119a5659bca53a WHIRLPOOL 696361c366f2a790be8bfe87cc6edbcfebce5a9015d2d420cf6c4287a07cbd1e82a08f3441266894c8a39426a2474ce4a826b355b078cbadd5f828ad0a3deb68 -AUX gnome-bluetooth-2.32.0-nsd-automagic.patch 989 SHA256 5db8f82ff311c6181cdf7035ad5351cb117f44efeb25332db997c98dccf3932f SHA512 c481e64b6f4e50cf91505e8c376b0eedd8c68a0f8edbedafbcf761a711d714ea73cf577bd0fd64f62c47be0b4f18478917a16f47af6dec261e7885b02a81dafd WHIRLPOOL 1f76c9ef7d849fff8632a0c6e9304cb54f17d01a46513b457af2f2c014604639f49657b0cae0bda821d042f9c70b0a63973502c6a222042841e48b2857edd74c -AUX gnome-bluetooth-2.32.0-pin-quirk.patch 812 SHA256 a1d703840e2c81d621225fd4b68e67627e8c09a8d3fcd857bf68f2c2521e21c0 SHA512 4fc021d7d6f01e29729e79a9ad1607d412b4402fe08d17d0621957f4dc0a45d8e31a246bff2b3cd3df6b584ffefdf8afa3dad5a196b78c89882104003032c041 WHIRLPOOL 991c28c4e793db1f26792cab5918abfaaa87b3647c936ee1f8d08a3abf5ab6818190e34181e4a46815f1994cc708a66b8ae0046403e03256f94027a5326e8e08 -AUX gnome-bluetooth-2.32.0-update-dtd.patch 800 SHA256 6bdbe47e15f89d61702a30ad9e5d1b6f569617e2d683833b698dbfb8ff8b0783 SHA512 d0bbe586c319ee78e4f0b39c56d0f4eced7fd83092a8e4bd90c4e4d2ff8cba1f97accf4718d4aec0d798df9fcd2243f1d4e33289d440ab2fba3e816d52cffc26 WHIRLPOOL 107b95615b1e6f4e7f42e377d9f91e42baef34d38f58238724326bb2bee97b621b69c67523bd6b3a0d17d1a7b188e820a9aa770858c32a686805a3a6e074ed83 AUX gnome-bluetooth-3.12.0-gold.patch 1558 SHA256 ac2058569a85377c0fc91a8a0d1cf1948c89f9be9c6110b7187c213a2a462092 SHA512 1fd112056f42e99de287757f7603c0d439916659b22d1b1f51e21220ef14a72007898a766cc68a172a8b8924d9a8db4c80e4cfec4808c51aa55665c6f8c22c45 WHIRLPOOL f32d205bc2c727df66d70b0e12f5afc7bc8d04985893b73d848e64a409b7785b797c1f596f70bc268e1e53c80c3e42457ea7091999accc0be1f15d6ccb33b80b -DIST gnome-bluetooth-2.32.0.tar.bz2 1231205 SHA256 57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 SHA512 ba4a301ba0f2f3010722af910082c805a0bfa7981e0c4b84e68437908fda5a8314db720418e21aca4fa4dcdb830cdcd6bdc9a591802e08dce167d415f72b52ec WHIRLPOOL 052faa04f4fefc769e797035a64aa14724cc2d0404066b2f74ddfb38ed27c9eac49fd3f14c19acb44a83723bc2d2459950fe85fb4d39366974a3b83e10c43735 DIST gnome-bluetooth-3.10.0.tar.xz 1327852 SHA256 7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712 SHA512 49602dedaad43652e542c8ca3682158a80a1e4b1cc7c568946af71357dc209600be654977fb444e8561f87bc7d9df8179bd0a808ab1aebd0fb904fec83865c65 WHIRLPOOL 9eaf1b5e8b01f045d3c62cd4ecf73f0778947b13b09860014bb760159f1369febffdbc1b13bad94edec7d15de035aafe70bc0017bdf54035ec67476ba04edc08 DIST gnome-bluetooth-3.12.0.tar.xz 1341584 SHA256 086917c13ada4e3233eafad0a91b072cd60bb2be7c0b7d6657072123fd115c67 SHA512 f31e0795b605e87b8aa29a5990985fa788eac41722ebfd200c5119528823c0fd5be180ae1b92d77585d18259da4cf10f258fd2d62573d8956ff1131abf0720fd WHIRLPOOL 42dee88cfef5b6fd5243f818dcaab03a450793c79e1947f8f8ca61293eb89002b9d5053478805009b769e5e534616d72b100fc8c672b8ef5eb64ff6d7487fd40 -DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc -EBUILD gnome-bluetooth-2.32.0-r1.ebuild 2920 SHA256 208e708fb88d55312516e27a7508efbe7d310ac8492e5514cfb2b7b3b385235a SHA512 80a206d359ffe61b497683c8ecc4d1104b84ad67f61b1916fdd36b0aa1f9ceb39e6a5e370c7c4d6f9ac4bb8f065599a7ff755fb32c1f3a2fcdfff9a7f27807fc WHIRLPOOL 78bf5e0cc6f3c85a5c1670c0edf34f258ad347ee05d9e558d96b38ba04848b9e28a42a595dddb168487ce284a35574e8e3f18225e36dc1ebd3d52cc912b1d653 EBUILD gnome-bluetooth-3.10.0.ebuild 1897 SHA256 ffc2ca30dde76392e9e88ed0d61a6e227b216c52f77e4be28279db4fc7dd13b9 SHA512 1215ee5ff0448f56711c5694ced04a5bba29727770bf6511e5869fa3dfc3fe1a3d0125ba6b3edb0a0322dad716a10cea94200f10ebc9c2b320b299a94fc048c6 WHIRLPOOL 44ef623bf781934cdac6e0ef02924ecbe6fe735fee6b09bb455898f6cf65b28c3cf923c5c206902955b90a302909ddc24a2849089300de59d5b8899ec0c9b6d7 EBUILD gnome-bluetooth-3.12.0.ebuild 2041 SHA256 520c0cfd690734eded1aa90b1215d7199f4d8bcff8e71e3ec2b045f6836d775d SHA512 fb13cf1f1514864b72bdf142f5d703fad390f3aa54c7535678fa93c1cc71e8e9574aa8e8804c37a126c5d7761212a0fff35e9c8a721f9ed706427c31fe6312e8 WHIRLPOOL 710fa80dd051a9f83a6e83f76a1c2766a4082f08cdccdc5e1cf0aacc972ca5c3d3ef492f939f7f5d906622dc27227306b94c385f15f324c08519966e99ff7fb6 -MISC ChangeLog 24511 SHA256 80a7907e4ea41fb5684f5c8dcd49fdd292a1f6aa5f25cd88cceae649b8f35800 SHA512 355a89c8d50a195f0591f0f1cddf579d7a4cca5311a7dab9e00d555279af1b8342b8893810509266d91b25dc1b51bd2058c0188539800fd8f71d04a01d85e802 WHIRLPOOL 83882e539aa86b0427c8f06505bb5e6982f238062769c854e568064f7d0ffb9216332c5576384ae5fac32bd2b44160814a8f86d66211d51748e5ea2216bb836e -MISC metadata.xml 259 SHA256 b1bdb095d7c18cb79fcea8cb8d0eb086ed22a02fd4aadbe2006049f313789cd2 SHA512 234c10dffce658a5277e61228489b58327f8b9a62a03a454d16945ce8d4ff8e2505fb0b781f1e4a58717168589c8ba91c96733d7ded2484f951e161b2f4f13d4 WHIRLPOOL 94edef0096a42ec354c88aa5a6ac235cfe8320963abda33a6a4d3d8acabe4ae377772aadd0b3a33c4850365820d15bb9a53c94ebecf94211442a82ba46c79657 +MISC ChangeLog 24968 SHA256 d6787430db9d42adf50eaa3c8fb052abfa3f44c3f908545a478f510e54868daa SHA512 6fbf176eb51d6f79d4bbf115cf99f0501200662c3760e203a0cad59df02f81988ff44afccadc317d240bdb5ff5fc1317c28168a750c41bbf87cbbac9cbab4a28 WHIRLPOOL c00b7df002bffcedd456e0e02fa6df11664aadcee22c028ba05b0865618995816622ae44fcdc5d8db851e14cba95ec7bf5d5498d75dfbba4af5b776ddd04addb +MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTz9bBAAoJELp701BxlEWf5YwP/0jdDw8YdLfQVB+MLpjvQbrI -ZV0uTFZ6gT9xOKVZOB9fAeb9dHQXS5S0kJRk7lTjkG9WvVXbK0Usg+9aKk9UCdgv -t1nSaG8hO0sigu+kH+EMl5bSUORwrCNmdcI6aVTqG+gN88JHWGjDTLjCvkyui/sX -3N1BuHhY+pL8e0oj4H1rxXvKi8OArIFaf1lWHDAKrsZ7Va39XNOinTRDde2apho+ -B6NaCUmgtZOBvSMW19oBeYN80xueGkSSJ3hFtyI01i6uOl+MMaSPoCe1hRyIhQLg -S1z8+TIRNLjw/HruFICP6oU4++oJB2Bg2sZDDRwqa7IZ+8lZdRJQHXjOEzOwCFOS -QpavdmqAlCAxAoxJN3OOSGtoDGGyeQkBhLQ9wUE/kaLPY+PrypRpwb3AhA2Z2F0U -80AxxCLgqDdTYswyDTeB73Jkq+a0E2XqcDiaJI/CqFx/xTttLCYBkO9ukq/k9l2c -wDkzQXYuDxj3YEvBOOMtMVjWR7RBQhnzzZve1IEV1hTgi+G+8DK+SR7FyPCMkN3E -hCRRcS/nTmjlz/psPAkgywW5yX44ZArG10rnUm1jOTKYI+ZExkHMkyBCkh1UJBHC -B7DJLKr856cjU3Rf882oFmJhvHR99CCB9DjL3ohftXLOzVjvwiWkUTZi1S5vASpj -Xo7ncUi6+VpYg4Z9b5e+ -=tz+z +iEYEAREIAAYFAlRkqKkACgkQCaWpQKGI+9T6PACfdg/mzQ1Tjc9ojbQwV+A1w/AJ +mvgAniU0PJsQlmsEh1EUwNLVPC70NfGA +=Nlru -----END PGP SIGNATURE----- diff --git a/net-wireless/gnome-bluetooth/files/80-rfkill.rules b/net-wireless/gnome-bluetooth/files/80-rfkill.rules deleted file mode 100644 index 61f9ca5eb0d1..000000000000 --- a/net-wireless/gnome-bluetooth/files/80-rfkill.rules +++ /dev/null @@ -1,5 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# network -KERNEL=="rfkill", GROUP="plugdev", MODE="0664" - diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch deleted file mode 100644 index 123e3fc08c93..000000000000 --- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 76109d033db729252f4d47314ab69b0bf2d63711 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 18 Mar 2011 14:23:26 +0000 -Subject: wizard: Fix typo in PIN quirks - -Thanks to Daniele Forsi ---- -diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml -index 3b4479e..e485d03 100644 ---- a/wizard/pin-code-database.xml -+++ b/wizard/pin-code-database.xml -@@ -38,7 +38,7 @@ - - -- -+ - - - --- -cgit v0.9.0.2 diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch deleted file mode 100644 index 592f66fcb655..000000000000 --- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch +++ /dev/null @@ -1,208 +0,0 @@ -From a26a8bc169ff2fdc249437c9c6fa9d6aae77b4df Mon Sep 17 00:00:00 2001 -From: Pacho Ramos -Date: Thu, 16 Dec 2010 19:15:42 +0000 -Subject: introspection: Fix build with newer g-introspection - -Fixes build with gobject-introspection 0.9 - -https://bugzilla.gnome.org/show_bug.cgi?id=634131 ---- -diff --git a/Makefile.am b/Makefile.am -index 9391392..f73baf4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help - DIST_SUBDIRS = $(DEF_SUBDIRS) moblin - EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make - --# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675 - DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ - --disable-desktop-update --disable-mime-update --disable-icon-update \ -- --enable-gtk-doc --disable-scrollkeeper --enable-introspection=no -+ --enable-gtk-doc --disable-scrollkeeper --enable-introspection - - DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make - -diff --git a/acinclude.m4 b/acinclude.m4 -index 5cf8c03..deebd2b 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1,93 +1,3 @@ --dnl -*- mode: autoconf -*- --dnl Copyright 2009 Johan Dahlin --dnl --dnl This file is free software; the author(s) gives unlimited --dnl permission to copy and/or distribute it, with or without --dnl modifications, as long as this notice is preserved. --dnl -- --# serial 1 -- --m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], --[ -- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -- -- dnl enable/disable introspection -- m4_if([$2], [require], -- [dnl -- enable_introspection=yes -- ],[dnl -- AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [Enable introspection for this build]),, -- [enable_introspection=auto]) -- ])dnl -- -- AC_MSG_CHECKING([for gobject-introspection]) -- -- dnl presence/version checking -- AS_CASE([$enable_introspection], -- [no], [dnl -- found_introspection="no (disabled, use --enable-introspection to enable)" -- ],dnl -- [yes],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -- ],dnl -- [auto],[dnl -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -- ],dnl -- [dnl -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -- ])dnl -- -- AC_MSG_RESULT([$found_introspection]) -- -- INTROSPECTION_SCANNER= -- INTROSPECTION_COMPILER= -- INTROSPECTION_GENERATE= -- INTROSPECTION_GIRDIR= -- INTROSPECTION_TYPELIBDIR= -- if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- fi -- AC_SUBST(INTROSPECTION_SCANNER) -- AC_SUBST(INTROSPECTION_COMPILER) -- AC_SUBST(INTROSPECTION_GENERATE) -- AC_SUBST(INTROSPECTION_GIRDIR) -- AC_SUBST(INTROSPECTION_TYPELIBDIR) -- -- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") --]) -- -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -- --AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) --]) -- --dnl Usage: --dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -- -- --AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], --[ -- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) --]) -- -- - dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- - dnl autostars m4 macro for expanding directories using configure's prefix - -diff --git a/configure.ac b/configure.ac -index 8bbce4e..02aaf5f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL) - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - AC_SUBST(GLIB_GENMARSHAL) - --GOBJECT_INTROSPECTION_CHECK([0.6.3]) -+GOBJECT_INTROSPECTION_CHECK([0.6.7]) - - GNOME_COMMON_INIT - GNOME_DEBUG_CHECK -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6da2a9c..f7acece 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -55,41 +55,29 @@ gnomebluetooth_HEADERS = \ - - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" - -+-include $(INTROSPECTION_MAKEFILE) -+INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -+ - if HAVE_INTROSPECTION --BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir -+introspection_sources = $(gnomebluetooth_HEADERS) - --GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) --GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) - GnomeBluetooth-1.0.gir: libgnome-bluetooth.la --GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) -- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ -- --add-include-path=$(srcdir) --add-include-path=. \ -- --include=GObject-2.0 \ -- --include=Gtk-2.0 \ -- --include=DBusGLib-1.0 \ -- --include=GModule-2.0 \ -- --libtool="$(LIBTOOL)" \ -- --library=gnome-bluetooth \ -- --output $@ \ -- --pkg gobject-2.0 \ -- --pkg gtk+-2.0 \ -- --pkg dbus-glib-1 \ -- --pkg gmodule-2.0 \ -- -I$(srcdir) \ -- $(LIBGNOMEBT_CFLAGS) \ -- $(gnomebluetooth_HEADERS) -+GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 -+GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) -+GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la -+GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 -+GnomeBluetooth_1_0_gir_FILES = $(introspection_sources) -+INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir - - girdir = $(INTROSPECTION_GIRDIR) --dist_gir_DATA = $(BUILT_GIRSOURCES) - --EXTRA_DIST += $(BUILT_GIRSOURCES) -+gir_DATA = $(INTROSPECTION_GIRS) - --typelibsdir = $(INTROSPECTION_TYPELIBDIR) --typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -+typelibdir = $(INTROSPECTION_TYPELIBDIR) -+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - --%.typelib: %.gir $(G_IR_COMPILER) -- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ -- - endif # HAVE_INTROSPECTION - - BUILT_SOURCES = marshal.h marshal.c \ -@@ -101,7 +89,7 @@ BUILT_SOURCES = marshal.h marshal.c \ - - nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) - --CLEANFILES = $(BUILT_SOURCES) -+CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) - - noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class - --- -cgit v0.8.3.1 diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch deleted file mode 100644 index 72a72652186e..000000000000 --- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- applet/notify.c -+++ applet/notify.c -@@ -31,6 +31,10 @@ - #include - #include "notify.h" - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - static GtkStatusIcon *statusicon = NULL; - static char *icon_name = NULL; - static char *tooltip = NULL; -@@ -71,7 +75,12 @@ - notify_notification_close(notify, NULL); - } - -- notify = notify_notification_new(summary, message, icon_name, NULL); -+ notify = notify_notification_new(summary, message, icon_name -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - - notify_notification_set_timeout(notify, timeout); - diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-nsd-automagic.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-nsd-automagic.patch deleted file mode 100644 index 6138fa749713..000000000000 --- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-nsd-automagic.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3ffd3b7678f9095b2ce7ed06a7638210cb0d35e2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 17 Jan 2011 15:15:46 +0000 -Subject: build: Fix disabling nautilus-sendto in configure - -enable_nst was never set properly if we didn't use the default -value. - -https://bugzilla.gnome.org/show_bug.cgi?id=639130 ---- -diff --git a/configure.ac b/configure.ac -index 02aaf5f..c4f2804 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -99,8 +99,9 @@ PKG_CHECK_MODULES(SENDTO, - dnl nautilus-sendto plugin - AC_ARG_ENABLE(nautilus-sendto, - AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@], -- [build nautilus-sendto plugin]), , -- enable_nst=yes) -+ [build nautilus-sendto plugin]), -+ [enable_nst=$enableval], -+ [enable_nst=auto]) - - if test "x$enable_nst" != "xno"; then - PKG_CHECK_MODULES(NST, --- -cgit v0.8.3.1 diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch deleted file mode 100644 index 0602c95a10b3..000000000000 --- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f03a29b558a834cb26e9abbdc0cb94a14c57cb8f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 18 Mar 2011 13:03:01 +0000 -Subject: wizard: Add PIN quirk for Magic Trackpad - ---- -diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml -index 8a73d65..b3e9f8d 100644 ---- a/wizard/pin-code-database.xml -+++ b/wizard/pin-code-database.xml -@@ -61,6 +61,10 @@ - - - -+ -+ -+ - - - --- -cgit v0.9.0.2 diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch deleted file mode 100644 index 85f34cf35b72..000000000000 --- a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 479d1535579184f437fe3cf73f24c4e17d933ecc Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 18 Mar 2011 14:16:00 +0000 -Subject: wizard: Update DTD for latest addition - ---- -diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml -index b3e9f8d..3b4479e 100644 ---- a/wizard/pin-code-database.xml -+++ b/wizard/pin-code-database.xml -@@ -38,7 +38,7 @@ - - -- -+ - - - --- -cgit v0.9.0.2 diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild deleted file mode 100644 index 4afe9e5f4bd0..000000000000 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild,v 1.8 2012/12/11 21:59:34 ssuominen Exp $ - -EAPI="4" -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit eutils gnome2 multilib user autotools udev - -DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME" -HOMEPAGE="http://live.gnome.org/GnomeBluetooth" -SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2" - -LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" -SLOT="2" -KEYWORDS="amd64 ppc x86" -IUSE="doc +introspection nautilus test" - -COMMON_DEPEND=">=dev-libs/glib-2.26.1-r1:2 - >=x11-libs/gtk+-2.19.1:2 - >=x11-libs/libnotify-0.4.3 - >=gnome-base/gconf-2.6:2 - >=dev-libs/dbus-glib-0.74 - dev-libs/libunique:1 - nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )" -RDEPEND="${COMMON_DEPEND} - >=net-wireless/bluez-4.34 - app-mobilephone/obexd - virtual/udev - introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" -DEPEND="${COMMON_DEPEND} - !!net-wireless/bluez-gnome - app-text/docbook-xml-dtd:4.1.2 - app-text/gnome-doc-utils - app-text/scrollkeeper - dev-libs/libxml2:2 - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext - x11-libs/libX11 - x11-libs/libXi - x11-proto/xproto - doc? ( >=dev-util/gtk-doc-1.9 ) - gnome-base/gnome-common - dev-util/gtk-doc-am" -# eautoreconf needs: -# gnome-base/gnome-common -# dev-util/gtk-doc-am - -# Tests are not ready to pass with docs enabled, upstream bug #573392 -REQUIRED_USE="test? ( !doc )" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable introspection) - $(use_enable nautilus nautilus-sendto) - --disable-moblin - --disable-desktop-update - --disable-icon-update - --disable-schemas-compile" - DOCS="AUTHORS README NEWS ChangeLog" - - enewgroup plugdev -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - - # Fix build with gobject-introspection 0.9, bug #344227 - epatch "${FILESDIR}"/${P}-introspection-build.patch - - # Fix nautilus-sendto automagic support, upstream bug #639130 - epatch "${FILESDIR}"/${P}-nsd-automagic.patch - - # Add PIN quirk for Magic Trackpad - epatch "${FILESDIR}"/${P}-pin-quirk.patch - - # wizard: Update DTD for latest addition - epatch "${FILESDIR}"/${P}-update-dtd.patch - - # wizard: Fix typo in PIN quirks - epatch "${FILESDIR}"/${P}-fix-typo.patch - - cp "${WORKDIR}"/introspection.m4 . || die - intltoolize --force --copy --automake || die "intltoolize failed" - AT_M4DIR="." eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - udev_dorules "${FILESDIR}"/80-rfkill.rules -} - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libgnome-bluetooth.so.7 -} - -pkg_postinst() { - gnome2_pkg_postinst - preserve_old_lib_notify /usr/$(get_libdir)/libgnome-bluetooth.so.7 - - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to control bluetooth transmitter." -} diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml index 65b59ddf7dce..da6fd63d0085 100644 --- a/net-wireless/gnome-bluetooth/metadata.xml +++ b/net-wireless/gnome-bluetooth/metadata.xml @@ -2,8 +2,4 @@ gnome - - Build the gnome-extra/nautilus-sendto - plugin - -- 2.26.2